Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7

1 files changed, 32 insertions, 0 deletions

diff --git a/WebCore/platform/gtk/ClipboardUtilitiesGtk.h b/WebCore/platform/gtk/ClipboardUtilitiesGtk.h
new file mode 100644
index 0000000..bdb2aec
--- /dev/null
+++ b/WebCore/platform/gtk/ClipboardUtilitiesGtk.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2010, Igalia S.L.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ClipboardUtilitiesGtk_h
+#define ClipboardUtilitiesGtk_h
+
+#include "DragActions.h"
+#include <gdk/gdk.h>
+
+namespace WebCore {
+
+GdkDragAction dragOperationToGdkDragActions(DragOperation);
+DragOperation gdkDragActionToDragOperation(GdkDragAction);
+
+}
+
+#endif // ClipboardUtilitiesGtk_h