Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-10-22 10:06:17 UTC (rev 175035)
@@ -1,3 +1,15 @@
+2014-10-05 Lorenzo Tilve <[email protected]>
+
+ [GTK] Fix build when DRAG_SUPPORT is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=137361
+
+ Reviewed by Carlos Garcia Campos.
+
+ Flag out unbuildable code without DRAG_SUPPORT.
+
+ * platform/gtk/GtkDragAndDropHelper.cpp:
+ * platform/gtk/GtkDragAndDropHelper.h:
+
2014-10-21 Carlos Garcia Campos <[email protected]>
[GTK] Several labels are white instead of black
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp 2014-10-22 10:06:17 UTC (rev 175035)
@@ -19,6 +19,8 @@
#include "config.h"
#include "GtkDragAndDropHelper.h"
+#if ENABLE(DRAG_SUPPORT)
+
#include "ClipboardUtilitiesGtk.h"
#include "DragData.h"
#include "GtkUtilities.h"
@@ -180,3 +182,5 @@
}
} // namespace WebCore
+
+#endif // ENABLE(DRAG_SUPPORT)
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkDragAndDropHelper.h (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkDragAndDropHelper.h 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkDragAndDropHelper.h 2014-10-22 10:06:17 UTC (rev 175035)
@@ -19,6 +19,8 @@
#ifndef GtkDragAndDropHelper_h
#define GtkDragAndDropHelper_h
+#if ENABLE(DRAG_SUPPORT)
+
#include "DataObjectGtk.h"
#include <wtf/FastMalloc.h>
#include <wtf/Noncopyable.h>
@@ -56,4 +58,6 @@
}
+#endif // ENABLE(DRAG_SUPPORT)
+
#endif // DataObjectGtk_h
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-10-22 10:06:17 UTC (rev 175035)
@@ -1,3 +1,20 @@
+2014-10-05 Lorenzo Tilve <[email protected]>
+
+ [GTK] Fix build when DRAG_SUPPORT is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=137361
+
+ Reviewed by Carlos Garcia Campos.
+
+ Flag out unbuildable code without DRAG_SUPPORT.
+
+ * Shared/gtk/ArgumentCodersGtk.cpp:
+ * Shared/gtk/ArgumentCodersGtk.h:
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseConstructed):
+ * UIProcess/PageClient.h:
+
2014-10-18 Michael Catanzaro <[email protected]>
[GTK] Improve documentation of webkit_web_view_get_tls_info()
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2014-10-22 10:06:17 UTC (rev 175035)
@@ -187,6 +187,7 @@
return true;
}
+#if ENABLE(DRAG_SUPPORT)
void ArgumentCoder<DragData>::encode(ArgumentEncoder& encoder, const DragData& dragData)
{
encoder << dragData.clientPosition();
@@ -233,6 +234,7 @@
return true;
}
+#endif // ENABLE(DRAG_SUPPORT)
static void encodeGKeyFile(ArgumentEncoder& encoder, GKeyFile* keyFile)
{
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2014-10-22 10:06:17 UTC (rev 175035)
@@ -39,10 +39,12 @@
namespace IPC {
+#if ENABLE(DRAG_SUPPORT)
template<> struct ArgumentCoder<WebCore::DragData> {
static void encode(ArgumentEncoder&, const WebCore::DragData&);
static bool decode(ArgumentDecoder&, WebCore::DragData&);
};
+#endif
void encode(ArgumentEncoder&, GtkPrintSettings*);
bool decode(ArgumentDecoder&, GRefPtr<GtkPrintSettings>&);
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-10-22 10:06:17 UTC (rev 175035)
@@ -269,10 +269,12 @@
webkitWebViewBaseUpdateTextInputState(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
}
+#if ENABLE(DRAG_SUPPORT)
void PageClientImpl::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
{
webkitWebViewBaseStartDrag(WEBKIT_WEB_VIEW_BASE(m_viewWidget), dragData, dragImage);
}
+#endif
void PageClientImpl::handleDownloadRequest(DownloadProxy* download)
{
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2014-10-22 10:06:17 UTC (rev 175035)
@@ -95,7 +95,9 @@
virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate) override;
virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, const AtomicString&, Vector<WTF::String>&) override;
virtual void updateTextInputState() override;
+#if ENABLE(DRAG_SUPPORT)
virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) override;
+#endif
#if USE(ACCELERATED_COMPOSITING)
virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) override;
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-10-22 10:06:17 UTC (rev 175035)
@@ -94,7 +94,9 @@
GtkClickCounter clickCounter;
CString tooltipText;
IntRect tooltipArea;
+#if ENABLE(DRAG_SUPPORT)
GtkDragAndDropHelper dragAndDropHelper;
+#endif
DragIcon dragIcon;
#if !GTK_CHECK_VERSION(3, 13, 4)
IntSize resizerSize;
@@ -416,7 +418,9 @@
WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(object)->priv;
priv->pageClient = PageClientImpl::create(viewWidget);
+#if ENABLE(DRAG_SUPPORT)
priv->dragAndDropHelper.setWidget(viewWidget);
+#endif
#if USE(TEXTURE_MAPPER_GL) && defined(GDK_WINDOWING_X11)
GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/PageClient.h (175034 => 175035)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/PageClient.h 2014-10-22 10:01:59 UTC (rev 175034)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/PageClient.h 2014-10-22 10:06:17 UTC (rev 175035)
@@ -150,7 +150,7 @@
virtual void didChangeContentSize(const WebCore::IntSize&) = 0;
#endif
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) = 0;
#endif
