[webkit-changes] [167788] trunk/Source

Thu, 24 Apr 2014 18:25:30 -0700

Title: [167788] trunk/Source
Revision
167788
Author
[email protected]
Date
2014-04-24 18:24:27 -0700 (Thu, 24 Apr 2014)

Log 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 <[email protected]> on 2014-04-24

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (167787 => 167788)


--- trunk/Source/WebCore/ChangeLog	2014-04-25 00:54:05 UTC (rev 167787)
+++ trunk/Source/WebCore/ChangeLog	2014-04-25 01:24:27 UTC (rev 167788)
@@ -1,3 +1,18 @@
+2014-04-24  Commit Queue  <[email protected]>
+
+        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  <[email protected]>
 
         Rename "IMAGE_CONTROLS" feature to "SERVICE_CONTROLS"

Modified: trunk/Source/WebCore/page/EventHandler.cpp (167787 => 167788)


--- trunk/Source/WebCore/page/EventHandler.cpp	2014-04-25 00:54:05 UTC (rev 167787)
+++ trunk/Source/WebCore/page/EventHandler.cpp	2014-04-25 01:24:27 UTC (rev 167788)
@@ -1311,7 +1311,10 @@
 #endif
 
     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();
     const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCursor();
@@ -1383,7 +1386,7 @@
 
     switch (style ? style->cursor() : CURSOR_AUTO) {
     case CURSOR_AUTO: {
-        bool editable = node && node->hasEditableStyle();
+        bool editable = node->hasEditableStyle();
 
         if (useHandCursor(node, result.isOverLink(), shiftKey))
             return handCursor();

Modified: trunk/Source/WebKit/mac/ChangeLog (167787 => 167788)


--- trunk/Source/WebKit/mac/ChangeLog	2014-04-25 00:54:05 UTC (rev 167787)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-04-25 01:24:27 UTC (rev 167788)
@@ -1,3 +1,18 @@
+2014-04-24  Commit Queue  <[email protected]>
+
+        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  <[email protected]>
 
         Rename "IMAGE_CONTROLS" feature to "SERVICE_CONTROLS"

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (167787 => 167788)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm	2014-04-25 00:54:05 UTC (rev 167787)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm	2014-04-25 01:24:27 UTC (rev 167788)
@@ -773,9 +773,12 @@
         return;
 
     NSWindow *window = [m_webView window];
-    if (!window || ![window isKeyWindow])
+    if (!window)
         return;
 
+    if ([window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0])
+        return;
+
     NSCursor *platformCursor = cursor.platformCursor();
     if ([NSCursor currentCursor] == platformCursor)
         return;

Modified: trunk/Source/WebKit2/ChangeLog (167787 => 167788)


--- trunk/Source/WebKit2/ChangeLog	2014-04-25 00:54:05 UTC (rev 167787)
+++ trunk/Source/WebKit2/ChangeLog	2014-04-25 01:24:27 UTC (rev 167788)
@@ -1,3 +1,18 @@
+2014-04-24  Commit Queue  <[email protected]>
+
+        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  <[email protected]>
 
         Rename "IMAGE_CONTROLS" feature to "SERVICE_CONTROLS"

Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (167787 => 167788)


--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm	2014-04-25 00:54:05 UTC (rev 167787)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm	2014-04-25 01:24:27 UTC (rev 167788)
@@ -324,9 +324,12 @@
         return;
 
     NSWindow *window = [m_wkView window];
-    if (!window || ![window isKeyWindow])
+    if (!window)
         return;
 
+    if ([window windowNumber] != [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0])
+        return;
+
     NSCursor *platformCursor = cursor.platformCursor();
     if ([NSCursor currentCursor] == platformCursor)
         return;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to