<!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>[182087] trunk/Source/WebKit2</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/182087">182087</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-27 15:56:15 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Safari clears selection when its window gets activated via mouse down
https://bugs.webkit.org/show_bug.cgi?id=143157
Reviewed by Anders Carlsson.
The bug was caused by PlatformMouseEvent created in WebKit2 not having its event number
even though we were correctly calling setActivationEventNumber in WebPage::acceptsFirstMouse.
Fixed the bug by storing [NSEvent eventNumber] in WebMouseEvent on Mac in WebKit2 as done in WebKit1.
* Shared/WebEvent.h:
(WebKit::WebMouseEvent::eventNumber):
* Shared/WebEventConversion.cpp:
(WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
* Shared/WebMouseEvent.cpp:
(WebKit::WebMouseEvent::WebMouseEvent):
(WebKit::WebMouseEvent::encode):
(WebKit::WebMouseEvent::decode):
* Shared/mac/WebEventFactory.mm:
(WebKit::WebEventFactory::createWebMouseEvent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebEventh">trunk/Source/WebKit2/Shared/WebEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebEventConversioncpp">trunk/Source/WebKit2/Shared/WebEventConversion.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebMouseEventcpp">trunk/Source/WebKit2/Shared/WebMouseEvent.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebEventFactorymm">trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182086 => 182087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-27 22:07:47 UTC (rev 182086)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-27 22:56:15 UTC (rev 182087)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-03-27 Ryosuke Niwa <rniwa@webkit.org>
+
+ Safari clears selection when its window gets activated via mouse down
+ https://bugs.webkit.org/show_bug.cgi?id=143157
+
+ Reviewed by Anders Carlsson.
+
+ The bug was caused by PlatformMouseEvent created in WebKit2 not having its event number
+ even though we were correctly calling setActivationEventNumber in WebPage::acceptsFirstMouse.
+
+ Fixed the bug by storing [NSEvent eventNumber] in WebMouseEvent on Mac in WebKit2 as done in WebKit1.
+
+ * Shared/WebEvent.h:
+ (WebKit::WebMouseEvent::eventNumber):
+ * Shared/WebEventConversion.cpp:
+ (WebKit::WebKit2PlatformMouseEvent::WebKit2PlatformMouseEvent):
+ * Shared/WebMouseEvent.cpp:
+ (WebKit::WebMouseEvent::WebMouseEvent):
+ (WebKit::WebMouseEvent::encode):
+ (WebKit::WebMouseEvent::decode):
+ * Shared/mac/WebEventFactory.mm:
+ (WebKit::WebEventFactory::createWebMouseEvent):
+
</ins><span class="cx"> 2015-03-27 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Only do the Connection::setShouldCloseConnectionOnMachExceptions() hack where necessary
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebEvent.h (182086 => 182087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebEvent.h 2015-03-27 22:07:47 UTC (rev 182086)
+++ trunk/Source/WebKit2/Shared/WebEvent.h 2015-03-27 22:56:15 UTC (rev 182087)
</span><span class="lines">@@ -123,7 +123,11 @@
</span><span class="cx">
</span><span class="cx"> WebMouseEvent();
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp, int eventNumber = -1);
+#else
</ins><span class="cx"> WebMouseEvent(Type, Button, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> Button button() const { return static_cast<Button>(m_button); }
</span><span class="cx"> const WebCore::IntPoint& position() const { return m_position; }
</span><span class="lines">@@ -132,6 +136,9 @@
</span><span class="cx"> float deltaY() const { return m_deltaY; }
</span><span class="cx"> float deltaZ() const { return m_deltaZ; }
</span><span class="cx"> int32_t clickCount() const { return m_clickCount; }
</span><ins>+#if PLATFORM(MAC)
+ int32_t eventNumber() const { return m_eventNumber; }
+#endif
</ins><span class="cx">
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, WebMouseEvent&);
</span><span class="lines">@@ -146,6 +153,9 @@
</span><span class="cx"> float m_deltaY;
</span><span class="cx"> float m_deltaZ;
</span><span class="cx"> int32_t m_clickCount;
</span><ins>+#if PLATFORM(MAC)
+ int32_t m_eventNumber;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // FIXME: Move this class to its own header file.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebEventConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebEventConversion.cpp (182086 => 182087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2015-03-27 22:07:47 UTC (rev 182086)
+++ trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2015-03-27 22:56:15 UTC (rev 182087)
</span><span class="lines">@@ -82,6 +82,9 @@
</span><span class="cx"> m_position = webEvent.position();
</span><span class="cx"> m_globalPosition = webEvent.globalPosition();
</span><span class="cx"> m_clickCount = webEvent.clickCount();
</span><ins>+#if PLATFORM(MAC)
+ m_eventNumber = webEvent.eventNumber();
+#endif
</ins><span class="cx">
</span><span class="cx"> m_modifierFlags = 0;
</span><span class="cx"> if (webEvent.shiftKey())
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebMouseEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebMouseEvent.cpp (182086 => 182087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebMouseEvent.cpp 2015-03-27 22:07:47 UTC (rev 182086)
+++ trunk/Source/WebKit2/Shared/WebMouseEvent.cpp 2015-03-27 22:56:15 UTC (rev 182087)
</span><span class="lines">@@ -40,10 +40,17 @@
</span><span class="cx"> , m_deltaY(0)
</span><span class="cx"> , m_deltaZ(0)
</span><span class="cx"> , m_clickCount(0)
</span><ins>+#if PLATFORM(MAC)
+ , m_eventNumber(-1)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+WebMouseEvent::WebMouseEvent(Type type, Button button, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp, int eventNumber)
+#else
</ins><span class="cx"> WebMouseEvent::WebMouseEvent(Type type, Button button, const IntPoint& position, const IntPoint& globalPosition, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp)
</span><ins>+#endif
</ins><span class="cx"> : WebEvent(type, modifiers, timestamp)
</span><span class="cx"> , m_button(button)
</span><span class="cx"> , m_position(position)
</span><span class="lines">@@ -52,6 +59,9 @@
</span><span class="cx"> , m_deltaY(deltaY)
</span><span class="cx"> , m_deltaZ(deltaZ)
</span><span class="cx"> , m_clickCount(clickCount)
</span><ins>+#if PLATFORM(MAC)
+ , m_eventNumber(eventNumber)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMouseEventType(type));
</span><span class="cx"> }
</span><span class="lines">@@ -67,6 +77,9 @@
</span><span class="cx"> encoder << m_deltaY;
</span><span class="cx"> encoder << m_deltaZ;
</span><span class="cx"> encoder << m_clickCount;
</span><ins>+#if PLATFORM(MAC)
+ encoder << m_eventNumber;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebMouseEvent::decode(IPC::ArgumentDecoder& decoder, WebMouseEvent& result)
</span><span class="lines">@@ -88,6 +101,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.m_clickCount))
</span><span class="cx"> return false;
</span><ins>+#if PLATFORM(MAC)
+ if (!decoder.decode(result.m_eventNumber))
+ return false;
+#endif
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebEventFactorymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm (182086 => 182087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2015-03-27 22:07:47 UTC (rev 182086)
+++ trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2015-03-27 22:56:15 UTC (rev 182087)
</span><span class="lines">@@ -351,8 +351,9 @@
</span><span class="cx"> int clickCount = clickCountForEvent(event);
</span><span class="cx"> WebEvent::Modifiers modifiers = modifiersForEvent(event);
</span><span class="cx"> double timestamp = eventTimeStampSince1970(event);
</span><ins>+ int eventNumber = [event eventNumber];
</ins><span class="cx">
</span><del>- return WebMouseEvent(type, button, IntPoint(position), IntPoint(globalPosition), deltaX, deltaY, deltaZ, clickCount, modifiers, timestamp);
</del><ins>+ return WebMouseEvent(type, button, IntPoint(position), IntPoint(globalPosition), deltaX, deltaY, deltaZ, clickCount, modifiers, timestamp, eventNumber);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebWheelEvent WebEventFactory::createWebWheelEvent(NSEvent *event, NSView *windowView)
</span></span></pre>
</div>
</div>
</body>
</html>