Attachment 357071 Details for Bug 192602 – Patch

[patch] Patch

bug-192602-20181211125545.patch (text/plain), 4.76 KB, created by Tim Horton on 2018-12-11 12:55:46 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-12-11 12:55:46 PST

Size: 4.76 KB

patch

obsolete

>Subversion Revision: 239079
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 27c8bb120af0c68517a1b0c4fc9ade0ec7a806a0..91b87e66ece9c8fcdf7faf7e68de8b735f7bab54 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-11  Tim Horton  <timothy_horton@apple.com>
>+
>+        WebCore shouldn't have a Objective-C class named NSCursor
>+        https://bugs.webkit.org/show_bug.cgi?id=192602
>+        <rdar://problem/46615532>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/ios/wak/WAKAppKitStubs.h:
>+        * platform/ios/wak/WAKAppKitStubs.m:
>+        (+[NSCursor setHiddenUntilMouseMoves:]): Deleted.
>+        Get rid of the class.
>+        Also remove a comment that seems to have detached from wherever it's supposed to be.
>+
> 2018-12-11  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: overlay bounds rulers don't match element when page is scrolled
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index f9a8e5437cfe81fcc64dd3c2a53214741740243a..09ede4b5d35a81d7c8627a27e2074f76d1d76ee3 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-12-11  Tim Horton  <timothy_horton@apple.com>
>+
>+        WebCore shouldn't have a Objective-C class named NSCursor
>+        https://bugs.webkit.org/show_bug.cgi?id=192602
>+        <rdar://problem/46615532>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebView/WebFrameView.mm:
>+        (-[WebFrameView keyDown:keyDown:]):
>+        * WebView/WebHTMLView.mm:
>+        (-[WebHTMLView keyDown:]):
>+        (-[WebHTMLView performKeyEquivalent:]):
>+        Only use NSCursor on macOS.
>+
> 2018-12-10  Don Olmstead  <don.olmstead@sony.com>
> 
>         Move ENABLE_RESOURCE_LOAD_STATISTICS to FeatureDefines.xcconfig
>diff --git a/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h b/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h
>index 41048d7e96aa72b20384d7e9bf350f2015d43747..24f8f39e8239781063518e144c4e76489abafefc 100644
>--- a/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h
>+++ b/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h
>@@ -23,8 +23,6 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-/* Unicodes we reserve for function keys on the keyboard,  OpenStep reserves the range 0xF700-0xF8FF for this purpose.  The availability of various keys will be system dependent. */
>-
> #ifndef WAKAppKitStubs_h
> #define WAKAppKitStubs_h
> 
>@@ -205,10 +203,6 @@ typedef enum _NSSelectionDirection {
>     NSSelectingPrevious
> } NSSelectionDirection;
> 
>-WEBCORE_EXPORT @interface NSCursor : NSObject
>-+ (void)setHiddenUntilMouseMoves:(BOOL)flag;
>-@end
>-
> #endif // TARGET_OS_IPHONE
> 
> #endif // WAKAppKitStubs_h
>diff --git a/Source/WebCore/platform/ios/wak/WAKAppKitStubs.m b/Source/WebCore/platform/ios/wak/WAKAppKitStubs.m
>index caffcc6d05ae6db1457f2d817d542f4df0cedafc..bf1193fa9fbee60a93788ea9e2eb41406cb378bf 100644
>--- a/Source/WebCore/platform/ios/wak/WAKAppKitStubs.m
>+++ b/Source/WebCore/platform/ios/wak/WAKAppKitStubs.m
>@@ -30,11 +30,4 @@
> 
> id NSApp = nil;
> 
>-@implementation NSCursor
>-+ (void)setHiddenUntilMouseMoves:(BOOL)flag
>-{
>-    UNUSED_PARAM(flag);
>-}
>-@end
>-
> #endif // PLATFORM(IOS_FAMILY)
>diff --git a/Source/WebKitLegacy/mac/WebView/WebFrameView.mm b/Source/WebKitLegacy/mac/WebView/WebFrameView.mm
>index 56266cfdffb10daa859bead251c96ee300e6146a..41c5379f715754418b165d9b9d7794062d9928f7 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebFrameView.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebFrameView.mm
>@@ -1087,8 +1087,10 @@ - (void)keyDown:(WebEvent *)event
>     if (callSuper) {
>         [super keyDown:event];
>     } else {
>-        // if we did something useful, get the cursor out of the way
>+#if PLATFORM(MAC)
>+        // If we did something useful, get the cursor out of the way.
>         [NSCursor setHiddenUntilMouseMoves:YES];
>+#endif
>     }
> }
> 
>diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>index 887d8fb9583198ba79d6103a41576569aaa3cf11..f05c7bea0179819afdeacf0b3ed2e0171ee00ae4 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>@@ -4976,8 +4976,11 @@ - (void)keyDown:(WebEvent *)event
> 
>     if (callSuper)
>         [super keyDown:event];
>-    else
>+    else {
>+#if PLATFORM(MAC)
>         [NSCursor setHiddenUntilMouseMoves:YES];
>+#endif
>+    }
> }
> 
> - (void)keyUp:(WebEvent *)event
>@@ -5281,9 +5284,11 @@ - (BOOL)performKeyEquivalent:(NSEvent *)event
>         if (Frame* frame = core([self _frame]))
>             ret = frame->eventHandler().keyEvent(event);
> 
>-    if (ret)
>+    if (ret) {
>+#if PLATFORM(MAC)
>         [NSCursor setHiddenUntilMouseMoves:YES];
>-    else
>+#endif
>+    } else
>         ret = [self _handleStyleKeyEquivalent:event] || [super performKeyEquivalent:event];
> 
>     [self release];

Actions: View | Formatted Diff | Diff

Attachments on bug 192602: 357070 | 357071