Diff
Modified: trunk/Source/WebCore/ChangeLog (156344 => 156345)
--- trunk/Source/WebCore/ChangeLog 2013-09-24 18:42:05 UTC (rev 156344)
+++ trunk/Source/WebCore/ChangeLog 2013-09-24 18:58:12 UTC (rev 156345)
@@ -1,3 +1,15 @@
+2013-09-24 Lorenzo Tilve <lti...@igalia.com>
+
+ [GTK] Fix compilation problems when setting ENABLE_DRAG_SUPPORT = FALSE
+ https://bugs.webkit.org/show_bug.cgi?id=121782
+
+ Reviewed by Martin Robinson.
+
+ Disabled drag functions.
+
+ * page/gtk/EventHandlerGtk.cpp:
+ * platform/gtk/PasteboardGtk.cpp:
+
2013-09-24 Samuel White <samuel_wh...@apple.com>
AX: Replace AXObjectCache postNotification method boolean arguments with enum values.
Modified: trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp (156344 => 156345)
--- trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp 2013-09-24 18:42:05 UTC (rev 156344)
+++ trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp 2013-09-24 18:58:12 UTC (rev 156345)
@@ -42,7 +42,9 @@
namespace WebCore {
+#if ENABLE(DRAG_SUPPORT)
const double EventHandler::TextDragDelay = 0.0;
+#endif
bool EventHandler::tabsToAllFormControls(KeyboardEvent* event) const
{
@@ -94,10 +96,12 @@
return toFrameView(widget)->frame().eventHandler().handleWheelEvent(event);
}
+#if ENABLE(DRAG_SUPPORT)
PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
{
return Clipboard::createForDragAndDrop();
}
+#endif
bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
{
Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (156344 => 156345)
--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2013-09-24 18:42:05 UTC (rev 156344)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2013-09-24 18:58:12 UTC (rev 156345)
@@ -78,6 +78,7 @@
return create(DataObjectGtk::create());
}
+#if ENABLE(DRAG_SUPPORT)
PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop()
{
return create(DataObjectGtk::create());
@@ -87,6 +88,7 @@
{
return create(dragData.platformData());
}
+#endif
Pasteboard::Pasteboard(PassRefPtr<DataObjectGtk> dataObject)
: m_dataObject(dataObject)
@@ -294,9 +296,11 @@
return m_gtkClipboard && PasteboardHelper::defaultPasteboardHelper()->clipboardContentSupportsSmartReplace(m_gtkClipboard);
}
+#if ENABLE(DRAG_SUPPORT)
void Pasteboard::setDragImage(DragImageRef, const IntPoint& hotSpot)
{
}
+#endif
PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefPtr<Range> context,
bool allowPlainText, bool& chosePlainText)
Modified: trunk/Source/WebKit/gtk/ChangeLog (156344 => 156345)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-09-24 18:42:05 UTC (rev 156344)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-09-24 18:58:12 UTC (rev 156345)
@@ -1,3 +1,15 @@
+2013-09-24 Lorenzo Tilve <lti...@igalia.com>
+
+ [GTK] Fix compilation problems when setting ENABLE_DRAG_SUPPORT = FALSE
+ https://bugs.webkit.org/show_bug.cgi?id=121782
+
+ Reviewed by Martin Robinson.
+
+ Disabled drag functions.
+
+ * WebCoreSupport/DragClientGtk.cpp:
+ * WebCoreSupport/DragClientGtk.h:
+
2013-09-24 Zan Dobersek <zdober...@igalia.com>
[GTK] Fix accelerated compositing disabling under Wayland displays
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp (156344 => 156345)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp 2013-09-24 18:42:05 UTC (rev 156344)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp 2013-09-24 18:58:12 UTC (rev 156345)
@@ -19,6 +19,8 @@
#include "config.h"
#include "DragClientGtk.h"
+#if ENABLE(DRAG_SUPPORT)
+
#include "Clipboard.h"
#include "ClipboardUtilitiesGtk.h"
#include "DataObjectGtk.h"
@@ -100,3 +102,5 @@
delete this;
}
}
+
+#endif // ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h (156344 => 156345)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h 2013-09-24 18:42:05 UTC (rev 156344)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.h 2013-09-24 18:58:12 UTC (rev 156345)
@@ -27,6 +27,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if ENABLE(DRAG_SUPPORT)
+
#ifndef DragClientGtk_h
#define DragClientGtk_h
@@ -61,3 +63,5 @@
}
#endif
+
+#endif // ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit2/ChangeLog (156344 => 156345)
--- trunk/Source/WebKit2/ChangeLog 2013-09-24 18:42:05 UTC (rev 156344)
+++ trunk/Source/WebKit2/ChangeLog 2013-09-24 18:58:12 UTC (rev 156345)
@@ -1,3 +1,16 @@
+2013-09-24 Lorenzo Tilve <lti...@igalia.com>
+
+ [GTK] Fix compilation problems when setting ENABLE_DRAG_SUPPORT = FALSE
+ https://bugs.webkit.org/show_bug.cgi?id=121782
+
+ Reviewed by Martin Robinson.
+
+ Disabled drag functions.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkit_web_view_base_class_init):
+ * WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp:
+
2013-09-24 Anders Carlsson <ander...@apple.com>
Begin adopting std::tuple for IPC decoding
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (156344 => 156345)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-09-24 18:42:05 UTC (rev 156344)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-09-24 18:58:12 UTC (rev 156345)
@@ -692,6 +692,7 @@
return TRUE;
}
+#if ENABLE(DRAG_SUPPORT)
static void webkitWebViewBaseDragDataGet(GtkWidget* widget, GdkDragContext* context, GtkSelectionData* selectionData, guint info, guint time)
{
WEBKIT_WEB_VIEW_BASE(widget)->priv->dragAndDropHelper.handleGetDragData(context, selectionData, info);
@@ -726,6 +727,7 @@
DragOperation operation = webViewBase->priv->pageProxy->dragSession().operation;
gdk_drag_status(context, dragOperationToSingleGdkDragAction(operation), time);
}
+#endif // ENABLE(DRAG_SUPPORT)
static AtkObject* webkitWebViewBaseGetAccessible(GtkWidget* widget)
{
@@ -755,6 +757,7 @@
return priv->accessible.get();
}
+#if ENABLE(DRAG_SUPPORT)
static gboolean webkitWebViewBaseDragMotion(GtkWidget* widget, GdkDragContext* context, gint x, gint y, guint time)
{
WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
@@ -802,6 +805,7 @@
gtk_drag_finish(context, TRUE, FALSE, time);
return TRUE;
}
+#endif // ENABLE(DRAG_SUPPORT)
static void webkitWebViewBaseParentSet(GtkWidget* widget, GtkWidget* oldParent)
{
@@ -850,12 +854,14 @@
widgetClass->scroll_event = webkitWebViewBaseScrollEvent;
widgetClass->motion_notify_event = webkitWebViewBaseMotionNotifyEvent;
widgetClass->query_tooltip = webkitWebViewBaseQueryTooltip;
+#if ENABLE(DRAG_SUPPORT)
widgetClass->drag_end = webkitWebViewBaseDragEnd;
widgetClass->drag_data_get = webkitWebViewBaseDragDataGet;
widgetClass->drag_motion = webkitWebViewBaseDragMotion;
widgetClass->drag_leave = webkitWebViewBaseDragLeave;
widgetClass->drag_drop = webkitWebViewBaseDragDrop;
widgetClass->drag_data_received = webkitWebViewBaseDragDataReceived;
+#endif // ENABLE(DRAG_SUPPORT)
widgetClass->get_accessible = webkitWebViewBaseGetAccessible;
widgetClass->parent_set = webkitWebViewBaseParentSet;
widgetClass->destroy = webkitWebViewBaseDestroy;
@@ -941,6 +947,7 @@
webViewBase->priv->tooltipArea = tooltipArea;
}
+#if ENABLE(DRAG_SUPPORT)
void webkitWebViewBaseStartDrag(WebKitWebViewBase* webViewBase, const DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
{
WebKitWebViewBasePrivate* priv = webViewBase->priv;
@@ -967,6 +974,7 @@
} else
gtk_drag_set_icon_default(context);
}
+#endif // ENABLE(DRAG_SUPPORT)
void webkitWebViewBaseForwardNextKeyEvent(WebKitWebViewBase* webkitWebViewBase)
{
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp (156344 => 156345)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2013-09-24 18:42:05 UTC (rev 156344)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp 2013-09-24 18:58:12 UTC (rev 156345)
@@ -26,6 +26,8 @@
#include "config.h"
#include "WebDragClient.h"
+#if ENABLE(DRAG_SUPPORT)
+
#include "ArgumentCodersGtk.h"
#include "ShareableBitmap.h"
#include "WebPage.h"
@@ -69,3 +71,5 @@
}
}; // namespace WebKit.
+
+#endif // ENABLE(DRAG_SUPPORT)
