Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (190988 => 190989)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 15:09:31 UTC (rev 190988)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 15:10:43 UTC (rev 190989)
@@ -1,3 +1,18 @@
+2015-10-13 Sergio Villar Senin <[email protected]>
+
+ [GTK] Fix build for ENABLE_TOUCH_EVENTS=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=150085
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Shared/gtk/NativeWebTouchEventGtk.cpp:
+ * Shared/gtk/WebEventFactory.cpp:
+ * Shared/gtk/WebEventFactory.h:
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkit_web_view_base_class_init):
+
2015-10-13 Chris Dumez <[email protected]>
Avoid useless copying of Key::HashType in loops in NetworkCache::Storage::synchronize()
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/NativeWebTouchEventGtk.cpp (190988 => 190989)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/NativeWebTouchEventGtk.cpp 2015-10-13 15:09:31 UTC (rev 190988)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/NativeWebTouchEventGtk.cpp 2015-10-13 15:10:43 UTC (rev 190989)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NativeWebTouchEvent.h"
+#if ENABLE(TOUCH_EVENTS)
+
#include "WebEventFactory.h"
#include <gdk/gdk.h>
@@ -44,3 +46,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(TOUCH_EVENTS)
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.cpp (190988 => 190989)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.cpp 2015-10-13 15:09:31 UTC (rev 190988)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.cpp 2015-10-13 15:10:43 UTC (rev 190989)
@@ -196,6 +196,7 @@
gdk_event_get_time(event));
}
+#if ENABLE(TOUCH_EVENTS)
WebTouchEvent WebEventFactory::createWebTouchEvent(const GdkEvent* event, Vector<WebPlatformTouchPoint>&& touchPoints)
{
#ifndef GTK_API_VERSION_2
@@ -219,5 +220,6 @@
return WebTouchEvent();
#endif // GTK_API_VERSION_2
}
+#endif
} // namespace WebKit
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.h (190988 => 190989)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.h 2015-10-13 15:09:31 UTC (rev 190988)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.h 2015-10-13 15:10:43 UTC (rev 190989)
@@ -39,7 +39,9 @@
static WebMouseEvent createWebMouseEvent(const GdkEvent*, int);
static WebWheelEvent createWebWheelEvent(const GdkEvent*);
static WebKeyboardEvent createWebKeyboardEvent(const GdkEvent*, const WebCore::CompositionResults&, Vector<String>&& commands);
+#if ENABLE(TOUCH_EVENTS)
static WebTouchEvent createWebTouchEvent(const GdkEvent*, Vector<WebPlatformTouchPoint>&&);
+#endif
};
} // namespace WebKit
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (190988 => 190989)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-10-13 15:09:31 UTC (rev 190988)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-10-13 15:10:43 UTC (rev 190989)
@@ -337,6 +337,7 @@
#endif // ENABLE(FULLSCREEN_API)
+#if ENABLE(TOUCH_EVENTS)
void PageClientImpl::doneWithTouchEvent(const NativeWebTouchEvent& event, bool wasEventHandled)
{
if (wasEventHandled)
@@ -392,6 +393,7 @@
gtk_widget_event(m_viewWidget, pointerEvent.get());
}
+#endif // ENABLE(TOUCH_EVENTS)
void PageClientImpl::didFinishLoadingDataForCustomContentProvider(const String&, const IPC::DataReference&)
{
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (190988 => 190989)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-10-13 15:09:31 UTC (rev 190988)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-10-13 15:10:43 UTC (rev 190989)
@@ -131,7 +131,9 @@
virtual void didFinishLoadForMainFrame() override;
virtual void didSameDocumentNavigationForMainFrame(SameDocumentNavigationType) override;
+#if ENABLE(TOUCH_EVENTS)
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
+#endif
virtual void didChangeBackgroundColor() override;
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (190988 => 190989)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-10-13 15:09:31 UTC (rev 190988)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-10-13 15:10:43 UTC (rev 190989)
@@ -778,6 +778,7 @@
return TRUE;
}
+#if ENABLE(TOUCH_EVENTS)
static void appendTouchEvent(Vector<WebPlatformTouchPoint>& touchPoints, const GdkEvent* event, WebPlatformTouchPoint::TouchPointState state)
{
gdouble x, y;
@@ -868,6 +869,7 @@
return TRUE;
}
+#endif // ENABLE(TOUCH_EVENTS)
#if HAVE(GTK_GESTURES)
GestureController& webkitWebViewBaseGestureController(WebKitWebViewBase* webViewBase)
@@ -1020,7 +1022,9 @@
widgetClass->button_release_event = webkitWebViewBaseButtonReleaseEvent;
widgetClass->scroll_event = webkitWebViewBaseScrollEvent;
widgetClass->motion_notify_event = webkitWebViewBaseMotionNotifyEvent;
+#if ENABLE(TOUCH_EVENTS)
widgetClass->touch_event = webkitWebViewBaseTouchEvent;
+#endif
widgetClass->query_tooltip = webkitWebViewBaseQueryTooltip;
#if ENABLE(DRAG_SUPPORT)
widgetClass->drag_end = webkitWebViewBaseDragEnd;
Modified: releases/WebKitGTK/webkit-2.10/Tools/ChangeLog (190988 => 190989)
--- releases/WebKitGTK/webkit-2.10/Tools/ChangeLog 2015-10-13 15:09:31 UTC (rev 190988)
+++ releases/WebKitGTK/webkit-2.10/Tools/ChangeLog 2015-10-13 15:10:43 UTC (rev 190989)
@@ -1,3 +1,12 @@
+2015-10-13 Sergio Villar Senin <[email protected]>
+
+ [GTK] Fix build for ENABLE_TOUCH_EVENTS=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=150085
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
+
2015-10-01 Carlos Garcia Campos <[email protected]>
[GTK] Websites with invalid auth header keep loading forever
Modified: releases/WebKitGTK/webkit-2.10/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp (190988 => 190989)
--- releases/WebKitGTK/webkit-2.10/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2015-10-13 15:09:31 UTC (rev 190988)
+++ releases/WebKitGTK/webkit-2.10/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2015-10-13 15:10:43 UTC (rev 190989)
@@ -484,6 +484,7 @@
return touchEvent;
}
+#if ENABLE(TOUCH_EVENTS)
void EventSenderProxy::addTouchPoint(int x, int y)
{
// Touch ID is array index plus one, so 0 is skipped.
@@ -574,6 +575,6 @@
m_updatedTouchEvents.add(GPOINTER_TO_INT(event->touch.sequence));
}
}
+#endif // ENABLE(TOUCH_EVENTS)
-
} // namespace WTR
