<!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>[167547] 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/167547">167547</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-19 14:11:06 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] WebView adjusts the cursor even when another window is in front
https://bugs.webkit.org/show_bug.cgi?id=131898
rdar://problem/14619911
Reviewed by Dan Bernstein.
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::setCursor): Added a check that the window is under the cursor
and do nothing if it's not.
Source/WebKit2:
* UIProcess/API/mac/WKView.mm:
(-[WKView _setCursor:]): Deleted. Moved the code all into PageClientImpl, since none of it
interacts with anything special about a WKView.
* UIProcess/API/mac/WKViewInternal.h: Deleted the _setCursor: method.
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::setCursor): Added a check that the window is under the cursor
and do nothing if it's not.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewInternalh">trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h</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="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (167546 => 167547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-19 20:41:16 UTC (rev 167546)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-19 21:11:06 UTC (rev 167547)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-19 Darin Adler <darin@apple.com>
+
+ [Mac] WebView adjusts the cursor even when another window is in front
+ https://bugs.webkit.org/show_bug.cgi?id=131898
+ rdar://problem/14619911
+
+ Reviewed by Dan Bernstein.
+
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::setCursor): Added a check that the window is under the cursor
+ and do nothing if it's not.
+
</ins><span class="cx"> 2014-04-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r167527.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (167546 => 167547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-04-19 20:41:16 UTC (rev 167546)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-04-19 21:11:06 UTC (rev 167547)
</span><span class="lines">@@ -761,14 +761,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> void WebChromeClient::setCursor(const WebCore::Cursor& cursor)
</span><span class="cx"> {
</span><ins>+ // FIXME: Would be nice to share this code with WebKit2's PageClientImpl.
+
</ins><span class="cx"> if ([NSApp _cursorRectCursor])
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!m_webView)
+ return;
+
+ NSWindow *window = [m_webView window];
+ if (!window)
+ return;
+
+ if ([window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0])
+ return;
+
</ins><span class="cx"> NSCursor *platformCursor = cursor.platformCursor();
</span><span class="cx"> if ([NSCursor currentCursor] == platformCursor)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> [platformCursor set];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -776,6 +790,7 @@
</span><span class="cx"> {
</span><span class="cx"> [NSCursor setHiddenUntilMouseMoves:hiddenUntilMouseMoves];
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> KeyboardUIMode WebChromeClient::keyboardUIMode()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167546 => 167547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-19 20:41:16 UTC (rev 167546)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-19 21:11:06 UTC (rev 167547)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-19 Darin Adler <darin@apple.com>
+
+ [Mac] WebView adjusts the cursor even when another window is in front
+ https://bugs.webkit.org/show_bug.cgi?id=131898
+ rdar://problem/14619911
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setCursor:]): Deleted. Moved the code all into PageClientImpl, since none of it
+ interacts with anything special about a WKView.
+
+ * UIProcess/API/mac/WKViewInternal.h: Deleted the _setCursor: method.
+
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::setCursor): Added a check that the window is under the cursor
+ and do nothing if it's not.
+
</ins><span class="cx"> 2014-04-19 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Use XPC services in the iOS Simulator, but not in Mountain Lion
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (167546 => 167547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-04-19 20:41:16 UTC (rev 167546)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-04-19 21:11:06 UTC (rev 167547)
</span><span class="lines">@@ -2775,13 +2775,6 @@
</span><span class="cx"> [self _updateWindowAndViewFrames];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setCursor:(NSCursor *)cursor
-{
- if ([NSCursor currentCursor] == cursor)
- return;
- [cursor set];
-}
-
</del><span class="cx"> - (void)_setUserInterfaceItemState:(NSString *)commandName enabled:(BOOL)isEnabled state:(int)newState
</span><span class="cx"> {
</span><span class="cx"> ValidationVector items = _data->_validationMap.take(commandName);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (167546 => 167547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-04-19 20:41:16 UTC (rev 167546)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-04-19 21:11:06 UTC (rev 167547)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> - (void)_didRelaunchProcess;
</span><span class="cx"> - (void)_preferencesDidChange;
</span><span class="cx"> - (void)_toolTipChangedFrom:(NSString *)oldToolTip to:(NSString *)newToolTip;
</span><del>-- (void)_setCursor:(NSCursor *)cursor;
</del><span class="cx"> - (void)_setUserInterfaceItemState:(NSString *)commandName enabled:(BOOL)isEnabled state:(int)newState;
</span><span class="cx"> - (void)_doneWithKeyEvent:(NSEvent *)event eventWasHandled:(BOOL)eventWasHandled;
</span><span class="cx"> - (bool)_executeSavedCommandBySelector:(SEL)selector;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (167546 => 167547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-04-19 20:41:16 UTC (rev 167546)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2014-04-19 21:11:06 UTC (rev 167547)
</span><span class="lines">@@ -315,8 +315,26 @@
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::setCursor(const WebCore::Cursor& cursor)
</span><span class="cx"> {
</span><del>- if (![NSApp _cursorRectCursor])
- [m_wkView _setCursor:cursor.platformCursor()];
</del><ins>+ // FIXME: Would be nice to share this code with WebKit1's WebChromeClient.
+
+ if ([NSApp _cursorRectCursor])
+ return;
+
+ if (!m_wkView)
+ return;
+
+ NSWindow *window = [m_wkView window];
+ if (!window)
+ return;
+
+ if ([window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0])
+ return;
+
+ NSCursor *platformCursor = cursor.platformCursor();
+ if ([NSCursor currentCursor] == platformCursor)
+ return;
+
+ [platformCursor set];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::setCursorHiddenUntilMouseMoves(bool hiddenUntilMouseMoves)
</span></span></pre>
</div>
</div>
</body>
</html>