<!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>[167700] 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/167700">167700</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-22 23:11:22 -0700 (Tue, 22 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cursor doesn't change back to pointer when leaving the Safari window
https://bugs.webkit.org/show_bug.cgi?id=132038
Reviewed by Alexey Proskuryakov.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/147739">r147739</a> incorrectly added an early exit in EventHandler::selectCursor when hit test result didn't have
any node associated with it. Since we will hit this code when the cursor is outside of the WebView,
we still need to take the CURSOR_AUTO path as did the code before <a href="http://trac.webkit.org/projects/webkit/changeset/147739">r147739</a>.
No new test is added since this behavior can't be tested in DRT or WTR.
* page/EventHandler.cpp:
(WebCore::EventHandler::selectCursor):
Source/WebKit/mac:
Since the cursor type is now updated asynchronously after <a href="http://trac.webkit.org/projects/webkit/changeset/147739">r147739</a>,
[window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0]
evalutes to false depending on how fast cursor is moving.
Instead, check whether the NSWindow of the WebView is the key window or not since
key window appears to control the cursor style in Cocoa as far as I've tested:
https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::setCursor):
Source/WebKit2:
Since the cursor type is now updated asynchronously after <a href="http://trac.webkit.org/projects/webkit/changeset/147739">r147739</a>,
[window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0]
evalutes to false depending on how fast cursor is moving.
Instead, check whether the NSWindow of the WebView is the key window or not since
key window appears to control the cursor style in Cocoa as far as I've tested:
https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::setCursor):</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="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167699 => 167700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-23 05:59:34 UTC (rev 167699)
+++ trunk/Source/WebCore/ChangeLog 2014-04-23 06:11:22 UTC (rev 167700)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ Cursor doesn't change back to pointer when leaving the Safari window
+ https://bugs.webkit.org/show_bug.cgi?id=132038
+
+ Reviewed by Alexey Proskuryakov.
+
+ r147739 incorrectly added an early exit in EventHandler::selectCursor when hit test result didn't have
+ any node associated with it. Since we will hit this code when the cursor is outside of the WebView,
+ we still need to take the CURSOR_AUTO path as did the code before r147739.
+
+ No new test is added since this behavior can't be tested in DRT or WTR.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::selectCursor):
+
</ins><span class="cx"> 2014-04-22 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not paint border image when the border rect is empty.
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (167699 => 167700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-04-23 05:59:34 UTC (rev 167699)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-04-23 06:11:22 UTC (rev 167700)
</span><span class="lines">@@ -1311,10 +1311,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Node* node = result.targetNode();
</span><del>- if (!node)
- return NoCursorChange;
-
- auto renderer = node->renderer();
</del><ins>+ auto renderer = node ? node->renderer() : 0;
</ins><span class="cx"> RenderStyle* style = renderer ? &renderer->style() : nullptr;
</span><span class="cx"> bool horizontalText = !style || style->isHorizontalWritingMode();
</span><span class="cx"> const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCursor();
</span><span class="lines">@@ -1386,7 +1383,7 @@
</span><span class="cx">
</span><span class="cx"> switch (style ? style->cursor() : CURSOR_AUTO) {
</span><span class="cx"> case CURSOR_AUTO: {
</span><del>- bool editable = node->hasEditableStyle();
</del><ins>+ bool editable = node && node->hasEditableStyle();
</ins><span class="cx">
</span><span class="cx"> if (useHandCursor(node, result.isOverLink(), shiftKey))
</span><span class="cx"> return handCursor();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (167699 => 167700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-23 05:59:34 UTC (rev 167699)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-23 06:11:22 UTC (rev 167700)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ Cursor doesn't change back to pointer when leaving the Safari window
+ https://bugs.webkit.org/show_bug.cgi?id=132038
+
+ Reviewed by Alexey Proskuryakov.
+
+ Since the cursor type is now updated asynchronously after r147739,
+ [window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0]
+ evalutes to false depending on how fast cursor is moving.
+
+ Instead, check whether the NSWindow of the WebView is the key window or not since
+ key window appears to control the cursor style in Cocoa as far as I've tested:
+ https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
+
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::setCursor):
+
</ins><span class="cx"> 2014-04-22 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r167674.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (167699 => 167700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-04-23 05:59:34 UTC (rev 167699)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-04-23 06:11:22 UTC (rev 167700)
</span><span class="lines">@@ -773,12 +773,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSWindow *window = [m_webView window];
</span><del>- if (!window)
</del><ins>+ if (!window || ![window isKeyWindow])
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if ([window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0])
- return;
-
</del><span class="cx"> NSCursor *platformCursor = cursor.platformCursor();
</span><span class="cx"> if ([NSCursor currentCursor] == platformCursor)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167699 => 167700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-23 05:59:34 UTC (rev 167699)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-23 06:11:22 UTC (rev 167700)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ Cursor doesn't change back to pointer when leaving the Safari window
+ https://bugs.webkit.org/show_bug.cgi?id=132038
+
+ Reviewed by Alexey Proskuryakov.
+
+ Since the cursor type is now updated asynchronously after r147739,
+ [window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0]
+ evalutes to false depending on how fast cursor is moving.
+
+ Instead, check whether the NSWindow of the WebView is the key window or not since
+ key window appears to control the cursor style in Cocoa as far as I've tested:
+ https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
+
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::setCursor):
+
</ins><span class="cx"> 2014-04-22 Yongjun Zhang <yongjun_zhang@apple.com>
</span><span class="cx">
</span><span class="cx"> Add SPI to expose provisional URL from Frame.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (167699 => 167700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-04-23 05:59:34 UTC (rev 167699)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-04-23 06:11:22 UTC (rev 167700)
</span><span class="lines">@@ -324,12 +324,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSWindow *window = [m_wkView window];
</span><del>- if (!window)
</del><ins>+ if (!window || ![window isKeyWindow])
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if ([window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0])
- return;
-
</del><span class="cx"> NSCursor *platformCursor = cursor.platformCursor();
</span><span class="cx"> if ([NSCursor currentCursor] == platformCursor)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>