Changeset 167788 in webkit

Timestamp:

Apr 24, 2014 6:24:27 PM (10 years ago)

Author:

rniwa@webkit.org

Message:

Unreviewed, rolling out r167700.
​https://bugs.webkit.org/show_bug.cgi?id=132142

Incorrectly reverted the change in r167547 for
webkit.org/b/131898 (Requested by rniwa on #webkit).

Reverted changeset:

"Cursor doesn't change back to pointer when leaving the Safari
window"
​https://bugs.webkit.org/show_bug.cgi?id=132038
​http://trac.webkit.org/changeset/167700

Patch by Commit Queue <​commit-queue@webkit.org> on 2014-04-24

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebChromeClient.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/PageClientImpl.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-24  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167700.
+        https://bugs.webkit.org/show_bug.cgi?id=132142
+
+        Incorrectly reverted the change in r167547 for
+        webkit.org/b/131898 (Requested by rniwa on #webkit).
+
+        Reverted changeset:
+
+        "Cursor doesn't change back to pointer when leaving the Safari
+        window"
+        https://bugs.webkit.org/show_bug.cgi?id=132038
+        http://trac.webkit.org/changeset/167700
+
 2014-04-24  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1312 +1312 @@
 
     Node* node = result.targetNode();
-    auto renderer = node ? node->renderer() : 0;
+    if (!node)
+        return NoCursorChange;
+
+    auto renderer = node->renderer();
     RenderStyle* style = renderer ? &renderer->style() : nullptr;
     bool horizontalText = !style || style->isHorizontalWritingMode();
@@ -1384 +1387 @@
     switch (style ? style->cursor() : CURSOR_AUTO) {
     case CURSOR_AUTO: {
-        bool editable = node && node->hasEditableStyle();
+        bool editable = node->hasEditableStyle();
 
         if (useHandCursor(node, result.isOverLink(), shiftKey))

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-04-24  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167700.
+        https://bugs.webkit.org/show_bug.cgi?id=132142
+
+        Incorrectly reverted the change in r167547 for
+        webkit.org/b/131898 (Requested by rniwa on #webkit).
+
+        Reverted changeset:
+
+        "Cursor doesn't change back to pointer when leaving the Safari
+        window"
+        https://bugs.webkit.org/show_bug.cgi?id=132038
+        http://trac.webkit.org/changeset/167700
+
 2014-04-24  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm

@@ -774 +774 @@
 
     NSWindow *window = [m_webView window];
-    if (!window || ![window isKeyWindow])
+    if (!window)
+        return;
+
+    if ([window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0])
         return;
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-24  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167700.
+        https://bugs.webkit.org/show_bug.cgi?id=132142
+
+        Incorrectly reverted the change in r167547 for
+        webkit.org/b/131898 (Requested by rniwa on #webkit).
+
+        Reverted changeset:
+
+        "Cursor doesn't change back to pointer when leaving the Safari
+        window"
+        https://bugs.webkit.org/show_bug.cgi?id=132038
+        http://trac.webkit.org/changeset/167700
+
 2014-04-24  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

@@ -325 +325 @@
 
     NSWindow *window = [m_wkView window];
-    if (!window || ![window isKeyWindow])
+    if (!window)
+        return;
+
+    if ([window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0])
         return;