<!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>[196256] trunk/Source</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/196256">196256</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-08 10:28:39 -0800 (Mon, 08 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/196253">r196253</a>.
https://bugs.webkit.org/show_bug.cgi?id=153990
Caused several crashes in GTK+ bots (Requested by KaL on
#webkit).
Reverted changeset:
"[GTK] WebKitWebView should send crossing events to the
WebProcess"
https://bugs.webkit.org/show_bug.cgi?id=153740
http://trac.webkit.org/changeset/196253</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkWebEventFactorycpp">trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196255 => 196256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-08 18:23:08 UTC (rev 196255)
+++ trunk/Source/WebCore/ChangeLog 2016-02-08 18:28:39 UTC (rev 196256)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r196253.
+ https://bugs.webkit.org/show_bug.cgi?id=153990
+
+ Caused several crashes in GTK+ bots (Requested by KaL on
+ #webkit).
+
+ Reverted changeset:
+
+ "[GTK] WebKitWebView should send crossing events to the
+ WebProcess"
+ https://bugs.webkit.org/show_bug.cgi?id=153740
+ http://trac.webkit.org/changeset/196253
+
</ins><span class="cx"> 2016-02-08 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAVPlayerController should implement currentTimeWithinEndTimes.
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (196255 => 196256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2016-02-08 18:23:08 UTC (rev 196255)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-02-08 18:28:39 UTC (rev 196256)
</span><span class="lines">@@ -1882,10 +1882,8 @@
</span><span class="cx"> if (!m_mousePressed && scrollbar)
</span><span class="cx"> scrollbar->mouseMoved(platformMouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
</span><span class="cx"> #endif
</span><del>- if (onlyUpdateScrollbars) {
- updateMouseEventTargetNode(mouseEvent.targetNode(), platformMouseEvent, true);
</del><ins>+ if (onlyUpdateScrollbars)
</ins><span class="cx"> return true;
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool swallowEvent = false;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196255 => 196256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-08 18:23:08 UTC (rev 196255)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-08 18:28:39 UTC (rev 196256)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r196253.
+ https://bugs.webkit.org/show_bug.cgi?id=153990
+
+ Caused several crashes in GTK+ bots (Requested by KaL on
+ #webkit).
+
+ Reverted changeset:
+
+ "[GTK] WebKitWebView should send crossing events to the
+ WebProcess"
+ https://bugs.webkit.org/show_bug.cgi?id=153740
+ http://trac.webkit.org/changeset/196253
+
</ins><span class="cx"> 2016-02-08 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] WebKitWebView should send crossing events to the WebProcess
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkWebEventFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp (196255 => 196256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp 2016-02-08 18:23:08 UTC (rev 196255)
+++ trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp 2016-02-08 18:28:39 UTC (rev 196256)
</span><span class="lines">@@ -72,20 +72,15 @@
</span><span class="cx"> unsigned button = 0;
</span><span class="cx">
</span><span class="cx"> switch (event->type) {
</span><del>- case GDK_ENTER_NOTIFY:
- case GDK_LEAVE_NOTIFY:
- case GDK_MOTION_NOTIFY: {
</del><ins>+ case GDK_MOTION_NOTIFY:
</ins><span class="cx"> button = WebMouseEvent::NoButton;
</span><del>- GdkModifierType state;
- gdk_event_get_state(event, &state);
- if (state & GDK_BUTTON1_MASK)
</del><ins>+ if (event->motion.state & GDK_BUTTON1_MASK)
</ins><span class="cx"> button = WebMouseEvent::LeftButton;
</span><del>- else if (state & GDK_BUTTON2_MASK)
</del><ins>+ else if (event->motion.state & GDK_BUTTON2_MASK)
</ins><span class="cx"> button = WebMouseEvent::MiddleButton;
</span><del>- else if (state & GDK_BUTTON3_MASK)
</del><ins>+ else if (event->motion.state & GDK_BUTTON3_MASK)
</ins><span class="cx"> button = WebMouseEvent::RightButton;
</span><span class="cx"> break;
</span><del>- }
</del><span class="cx"> case GDK_BUTTON_PRESS:
</span><span class="cx"> case GDK_2BUTTON_PRESS:
</span><span class="cx"> case GDK_3BUTTON_PRESS:
</span><span class="lines">@@ -113,8 +108,6 @@
</span><span class="cx"> WebEvent::Type type = static_cast<WebEvent::Type>(0);
</span><span class="cx"> switch (event->type) {
</span><span class="cx"> case GDK_MOTION_NOTIFY:
</span><del>- case GDK_ENTER_NOTIFY:
- case GDK_LEAVE_NOTIFY:
</del><span class="cx"> type = WebEvent::MouseMove;
</span><span class="cx"> break;
</span><span class="cx"> case GDK_BUTTON_PRESS:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (196255 => 196256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-02-08 18:23:08 UTC (rev 196255)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-02-08 18:28:39 UTC (rev 196256)
</span><span class="lines">@@ -358,8 +358,6 @@
</span><span class="cx"> | GDK_SCROLL_MASK
</span><span class="cx"> | GDK_SMOOTH_SCROLL_MASK
</span><span class="cx"> | GDK_POINTER_MOTION_MASK
</span><del>- | GDK_ENTER_NOTIFY_MASK
- | GDK_LEAVE_NOTIFY_MASK
</del><span class="cx"> | GDK_KEY_PRESS_MASK
</span><span class="cx"> | GDK_KEY_RELEASE_MASK
</span><span class="cx"> | GDK_BUTTON_MOTION_MASK
</span><span class="lines">@@ -836,47 +834,6 @@
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static gboolean webkitWebViewBaseCrossingNotifyEvent(GtkWidget* widget, GdkEventCrossing* crosssingEvent)
-{
- WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
- WebKitWebViewBasePrivate* priv = webViewBase->priv;
-
- if (priv->authenticationDialog)
- return FALSE;
-
- // In the case of crossing events, it's very important the actual coordinates the WebProcess receives, because once the mouse leaves
- // the web view, the WebProcess won't receive more events until the mouse enters again in the web view. So, if the coordinates of the leave
- // event are not accurate, the WebProcess might not know the mouse left the view. This can happen because of double to integer conversion,
- // if the coordinates of the leave event are for example (25.2, -0.9), the WebProcess will receive (25, 0) and any hit test will succeed
- // because those coordinates are inside the web view.
- GtkAllocation allocation;
- gtk_widget_get_allocation(widget, &allocation);
- double width = allocation.width;
- double height = allocation.height;
- double x = crosssingEvent->x;
- double y = crosssingEvent->y;
- if (x < 0 && x > -1)
- x = -1;
- else if (x >= width && x < width + 1)
- x = width + 1;
- if (y < 0 && y > -1)
- y = -1;
- else if (y >= height && y < height + 1)
- y = height + 1;
-
- GdkEvent* event = reinterpret_cast<GdkEvent*>(crosssingEvent);
- GUniquePtr<GdkEvent> copiedEvent;
- if (x != crosssingEvent->x || y != crosssingEvent->y) {
- copiedEvent.reset(gdk_event_copy(event));
- copiedEvent->crossing.x = x;
- copiedEvent->crossing.y = y;
- }
-
- priv->pageProxy->handleMouseEvent(NativeWebMouseEvent(copiedEvent ? copiedEvent.get() : event, 0 /* currentClickCount */));
-
- return FALSE;
-}
-
</del><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> static void appendTouchEvent(Vector<WebPlatformTouchPoint>& touchPoints, const GdkEvent* event, WebPlatformTouchPoint::TouchPointState state)
</span><span class="cx"> {
</span><span class="lines">@@ -1121,8 +1078,6 @@
</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><del>- widgetClass->enter_notify_event = webkitWebViewBaseCrossingNotifyEvent;
- widgetClass->leave_notify_event = webkitWebViewBaseCrossingNotifyEvent;
</del><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> widgetClass->touch_event = webkitWebViewBaseTouchEvent;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>