<!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>[187852] releases/WebKitGTK/webkit-2.8</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/187852">187852</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-04 05:52:48 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187114">r187114</a> - Make PluginProxy::handleMouseEvent() asynchronous.
https://bugs.webkit.org/show_bug.cgi?id=146142
Patch by Sungmann Cho <sungmann.cho@navercorp.com> on 2015-07-21
Reviewed by Anders Carlsson.
PluginProxy::handleMouseEvent() forwards the generated mouse event to PluginControllerProxy
using a synchronous message, but the recipient always reply immediately with the same value("true")
even before handling the received message. So I think PluginProxy::handleMouseEvent() is perfectly
OK to process its messages asynchronously.
Source/WebKit2:
* PluginProcess/PluginControllerProxy.cpp:
(WebKit::PluginControllerProxy::handleMouseEvent):
* PluginProcess/PluginControllerProxy.h:
* PluginProcess/PluginControllerProxy.messages.in:
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::handleMouseEvent):
LayoutTests:
platform/mac-wk2/plugins/mouse-events-expected.txt was introduced by webkit.org/b/116665 to avoid
flakey tests, but from now on we can share the common expectations.
* platform/mac-wk2/plugins/mouse-events-expected.txt: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2PluginProcessPluginControllerProxycpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2PluginProcessPluginControllerProxyh">releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2PluginProcessPluginControllerProxymessagesin">releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2WebProcessPluginsPluginProxycpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsplatformmacwk2pluginsmouseeventsexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/platform/mac-wk2/plugins/mouse-events-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (187851 => 187852)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-08-04 12:49:37 UTC (rev 187851)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-08-04 12:52:48 UTC (rev 187852)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-21 Sungmann Cho <sungmann.cho@navercorp.com>
+
+ Make PluginProxy::handleMouseEvent() asynchronous.
+ https://bugs.webkit.org/show_bug.cgi?id=146142
+
+ Reviewed by Anders Carlsson.
+
+ PluginProxy::handleMouseEvent() forwards the generated mouse event to PluginControllerProxy
+ using a synchronous message, but the recipient always reply immediately with the same value("true")
+ even before handling the received message. So I think PluginProxy::handleMouseEvent() is perfectly
+ OK to process its messages asynchronously.
+
+ platform/mac-wk2/plugins/mouse-events-expected.txt was introduced by webkit.org/b/116665 to avoid
+ flakey tests, but from now on we can share the common expectations.
+
+ * platform/mac-wk2/plugins/mouse-events-expected.txt: Removed.
+
</ins><span class="cx"> 2015-07-19 Jordan Harband <ljharb@gmail.com>
</span><span class="cx">
</span><span class="cx"> new Date(NaN).toJSON() must return null instead of throwing a TypeError
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsplatformmacwk2pluginsmouseeventsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.8/LayoutTests/platform/mac-wk2/plugins/mouse-events-expected.txt (187851 => 187852)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/platform/mac-wk2/plugins/mouse-events-expected.txt 2015-08-04 12:49:37 UTC (rev 187851)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/platform/mac-wk2/plugins/mouse-events-expected.txt 2015-08-04 12:52:48 UTC (rev 187852)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-
-Test for bug 11517: Flash clicks/interactivity not working properly.
-
-PLUGIN: mouseDown at (12, 12)
-PLUGIN: mouseUp at (12, 12)
-PLUGIN: mouseDown at (22, 22)
-PLUGIN: mouseUp at (32, 22)
-PLUGIN: getFocusEvent
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (187851 => 187852)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-08-04 12:49:37 UTC (rev 187851)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-08-04 12:52:48 UTC (rev 187852)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-07-21 Sungmann Cho <sungmann.cho@navercorp.com>
+
+ Make PluginProxy::handleMouseEvent() asynchronous.
+ https://bugs.webkit.org/show_bug.cgi?id=146142
+
+ Reviewed by Anders Carlsson.
+
+ PluginProxy::handleMouseEvent() forwards the generated mouse event to PluginControllerProxy
+ using a synchronous message, but the recipient always reply immediately with the same value("true")
+ even before handling the received message. So I think PluginProxy::handleMouseEvent() is perfectly
+ OK to process its messages asynchronously.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::handleMouseEvent):
+ * PluginProcess/PluginControllerProxy.h:
+ * PluginProcess/PluginControllerProxy.messages.in:
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::handleMouseEvent):
+
</ins><span class="cx"> 2015-07-20 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r174287): Flash of black when opening a new web view or navigating to a new page
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2PluginProcessPluginControllerProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (187851 => 187852)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2015-08-04 12:49:37 UTC (rev 187851)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2015-08-04 12:52:48 UTC (rev 187852)
</span><span class="lines">@@ -527,17 +527,9 @@
</span><span class="cx">
</span><span class="cx"> m_plugin->manualStreamDidFail(wasCancelled);
</span><span class="cx"> }
</span><del>-
-void PluginControllerProxy::handleMouseEvent(const WebMouseEvent& mouseEvent, PassRefPtr<Messages::PluginControllerProxy::HandleMouseEvent::DelayedReply> reply)
-{
- // Always let the web process think that we've handled this mouse event, even before passing it along to the plug-in.
- // This is a workaround for
- // <rdar://problem/9299901> UI process thinks the page is unresponsive when a plug-in is showing a context menu.
- // The web process sends a synchronous HandleMouseEvent message and the plug-in process spawns a nested
- // run loop when showing the context menu, so eventually the unresponsiveness timer kicks in in the UI process.
- // FIXME: We should come up with a better way to do this.
- reply->send(true);
</del><span class="cx">
</span><ins>+void PluginControllerProxy::handleMouseEvent(const WebMouseEvent& mouseEvent)
+{
</ins><span class="cx"> m_plugin->handleMouseEvent(mouseEvent);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.h (187851 => 187852)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2015-08-04 12:49:37 UTC (rev 187851)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2015-08-04 12:52:48 UTC (rev 187852)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> void manualStreamDidReceiveData(const IPC::DataReference& data);
</span><span class="cx"> void manualStreamDidFinishLoading();
</span><span class="cx"> void manualStreamDidFail(bool wasCancelled);
</span><del>- void handleMouseEvent(const WebMouseEvent&, PassRefPtr<Messages::PluginControllerProxy::HandleMouseEvent::DelayedReply>);
</del><ins>+ void handleMouseEvent(const WebMouseEvent&);
</ins><span class="cx"> void handleWheelEvent(const WebWheelEvent&, bool& handled);
</span><span class="cx"> void handleMouseEnterEvent(const WebMouseEvent&, bool& handled);
</span><span class="cx"> void handleMouseLeaveEvent(const WebMouseEvent&, bool& handled);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2PluginProcessPluginControllerProxymessagesin"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in (187851 => 187852)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in 2015-08-04 12:49:37 UTC (rev 187851)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in 2015-08-04 12:52:48 UTC (rev 187852)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> ManualStreamDidFail(bool wasCancelled)
</span><span class="cx">
</span><span class="cx"> # Sent when a mouse event (that isn't a mouse enter/leave event or a wheel event) should be processed.
</span><del>- HandleMouseEvent(WebKit::WebMouseEvent mouseEvent) -> (bool handled) Delayed
</del><ins>+ HandleMouseEvent(WebKit::WebMouseEvent mouseEvent)
</ins><span class="cx">
</span><span class="cx"> # Sent when a mouse wheel event should be processed.
</span><span class="cx"> HandleWheelEvent(WebKit::WebWheelEvent wheelEvent) -> (bool handled)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2WebProcessPluginsPluginProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (187851 => 187852)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2015-08-04 12:49:37 UTC (rev 187851)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2015-08-04 12:52:48 UTC (rev 187852)
</span><span class="lines">@@ -367,11 +367,8 @@
</span><span class="cx"> if (m_waitingOnAsynchronousInitialization)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- bool handled = false;
- if (!m_connection->connection()->sendSync(Messages::PluginControllerProxy::HandleMouseEvent(mouseEvent), Messages::PluginControllerProxy::HandleMouseEvent::Reply(handled), m_pluginInstanceID))
- return false;
-
- return handled;
</del><ins>+ m_connection->connection()->send(Messages::PluginControllerProxy::HandleMouseEvent(mouseEvent), m_pluginInstanceID);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PluginProxy::handleWheelEvent(const WebWheelEvent& wheelEvent)
</span></span></pre>
</div>
</div>
</body>
</html>