<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190989] releases/WebKitGTK/webkit-2.10</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190989">190989</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-13 08:10:43 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190987">r190987</a> - [GTK] Fix build for ENABLE_TOUCH_EVENTS=OFF
https://bugs.webkit.org/show_bug.cgi?id=150085
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
* 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):
Tools:
* WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2SharedgtkNativeWebTouchEventGtkcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/NativeWebTouchEventGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2SharedgtkWebEventFactorycpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2SharedgtkWebEventFactoryh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkPageClientImplcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkPageClientImplh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210ToolsChangeLog">releases/WebKitGTK/webkit-2.10/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210ToolsWebKitTestRunnergtkEventSenderProxyGtkcpp">releases/WebKitGTK/webkit-2.10/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (190988 => 190989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-13 Sergio Villar Senin <svillar@igalia.com>
+
+ [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):
+
</ins><span class="cx"> 2015-10-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid useless copying of Key::HashType in loops in NetworkCache::Storage::synchronize()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2SharedgtkNativeWebTouchEventGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/NativeWebTouchEventGtk.cpp (190988 => 190989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NativeWebTouchEvent.h"
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+
</ins><span class="cx"> #include "WebEventFactory.h"
</span><span class="cx"> #include <gdk/gdk.h>
</span><span class="cx">
</span><span class="lines">@@ -44,3 +46,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(TOUCH_EVENTS)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2SharedgtkWebEventFactorycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.cpp (190988 => 190989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -196,6 +196,7 @@
</span><span class="cx"> gdk_event_get_time(event));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> WebTouchEvent WebEventFactory::createWebTouchEvent(const GdkEvent* event, Vector<WebPlatformTouchPoint>&& touchPoints)
</span><span class="cx"> {
</span><span class="cx"> #ifndef GTK_API_VERSION_2
</span><span class="lines">@@ -219,5 +220,6 @@
</span><span class="cx"> return WebTouchEvent();
</span><span class="cx"> #endif // GTK_API_VERSION_2
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2SharedgtkWebEventFactoryh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/gtk/WebEventFactory.h (190988 => 190989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,7 +39,9 @@
</span><span class="cx"> static WebMouseEvent createWebMouseEvent(const GdkEvent*, int);
</span><span class="cx"> static WebWheelEvent createWebWheelEvent(const GdkEvent*);
</span><span class="cx"> static WebKeyboardEvent createWebKeyboardEvent(const GdkEvent*, const WebCore::CompositionResults&, Vector<String>&& commands);
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> static WebTouchEvent createWebTouchEvent(const GdkEvent*, Vector<WebPlatformTouchPoint>&&);
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (190988 => 190989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -337,6 +337,7 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(FULLSCREEN_API)
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> void PageClientImpl::doneWithTouchEvent(const NativeWebTouchEvent& event, bool wasEventHandled)
</span><span class="cx"> {
</span><span class="cx"> if (wasEventHandled)
</span><span class="lines">@@ -392,6 +393,7 @@
</span><span class="cx">
</span><span class="cx"> gtk_widget_event(m_viewWidget, pointerEvent.get());
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(TOUCH_EVENTS)
</ins><span class="cx">
</span><span class="cx"> void PageClientImpl::didFinishLoadingDataForCustomContentProvider(const String&, const IPC::DataReference&)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (190988 => 190989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -131,7 +131,9 @@
</span><span class="cx"> virtual void didFinishLoadForMainFrame() override;
</span><span class="cx"> virtual void didSameDocumentNavigationForMainFrame(SameDocumentNavigationType) override;
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> virtual void didChangeBackgroundColor() override;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (190988 => 190989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -778,6 +778,7 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> static void appendTouchEvent(Vector<WebPlatformTouchPoint>& touchPoints, const GdkEvent* event, WebPlatformTouchPoint::TouchPointState state)
</span><span class="cx"> {
</span><span class="cx"> gdouble x, y;
</span><span class="lines">@@ -868,6 +869,7 @@
</span><span class="cx">
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(TOUCH_EVENTS)
</ins><span class="cx">
</span><span class="cx"> #if HAVE(GTK_GESTURES)
</span><span class="cx"> GestureController& webkitWebViewBaseGestureController(WebKitWebViewBase* webViewBase)
</span><span class="lines">@@ -1020,7 +1022,9 @@
</span><span class="cx"> widgetClass->button_release_event = webkitWebViewBaseButtonReleaseEvent;
</span><span class="cx"> widgetClass->scroll_event = webkitWebViewBaseScrollEvent;
</span><span class="cx"> widgetClass->motion_notify_event = webkitWebViewBaseMotionNotifyEvent;
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> widgetClass->touch_event = webkitWebViewBaseTouchEvent;
</span><ins>+#endif
</ins><span class="cx"> widgetClass->query_tooltip = webkitWebViewBaseQueryTooltip;
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> widgetClass->drag_end = webkitWebViewBaseDragEnd;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Tools/ChangeLog (190988 => 190989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-10-13 Sergio Villar Senin <svillar@igalia.com>
+
+ [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:
+
</ins><span class="cx"> 2015-10-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Websites with invalid auth header keep loading forever
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210ToolsWebKitTestRunnergtkEventSenderProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp (190988 => 190989)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -484,6 +484,7 @@
</span><span class="cx"> return touchEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
</ins><span class="cx"> void EventSenderProxy::addTouchPoint(int x, int y)
</span><span class="cx"> {
</span><span class="cx"> // Touch ID is array index plus one, so 0 is skipped.
</span><span class="lines">@@ -574,6 +575,6 @@
</span><span class="cx"> m_updatedTouchEvents.add(GPOINTER_TO_INT(event->touch.sequence));
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(TOUCH_EVENTS)
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace WTR
</span></span></pre>
</div>
</div>
</body>
</html>