Changeset 246905 in webkit

Timestamp:

Jun 27, 2019 2:11:13 PM (5 years ago)

Author:

timothy@apple.com

Message:

Move WebKitLegacy off of a couple AppKit ivars.
​https://bugs.webkit.org/show_bug.cgi?id=199279
rdar://problem/34983438

Reviewed by Tim Horton.

Source/WebKitLegacy/mac:

• WebView/WebHTMLView.mm:

(-[NSView _setSubviewsIvar:]): Added. Implement on older systems.
(-[NSView _subviewsIvar]): Added. Ditto.
(needsCursorRectsSupportAtPoint): Use _borderView property.
(-[WebHTMLView _setAsideSubviews]): Use _subviewsIvar property.
(-[NSWindow _web_borderView]): Deleted.

Source/WTF:

• wtf/Platform.h: Added HAVE_SUBVIEWS_IVAR_SPI.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebHTMLView.mm (modified) (5 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-06-27  Timothy Hatcher  <timothy@apple.com>
+
+        Move WebKitLegacy off of a couple AppKit ivars.
+        https://bugs.webkit.org/show_bug.cgi?id=199279
+        rdar://problem/34983438
+
+        Reviewed by Tim Horton.
+
+        * wtf/Platform.h: Added HAVE_SUBVIEWS_IVAR_SPI.
+
 2019-06-27  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1600 +1600 @@
 #define USE_INTEL_METAL_WORKAROUND 1
 #endif
+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
+#define HAVE_SUBVIEWS_IVAR_SPI 1
+#endif

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2019-06-27  Timothy Hatcher  <timothy@apple.com>
+
+        Move WebKitLegacy off of a couple AppKit ivars.
+        https://bugs.webkit.org/show_bug.cgi?id=199279
+        rdar://problem/34983438
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebHTMLView.mm:
+        (-[NSView _setSubviewsIvar:]): Added. Implement on older systems.
+        (-[NSView _subviewsIvar]): Added. Ditto.
+        (needsCursorRectsSupportAtPoint): Use _borderView property.
+        (-[WebHTMLView _setAsideSubviews]): Use _subviewsIvar property.
+        (-[NSWindow _web_borderView]): Deleted.
+
 2019-06-27  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm

@@ -214 +214 @@
 
 @interface NSWindow ()
+@property (readonly) __kindof NSView *_borderView;
+
 - (id)_newFirstResponderAfterResigning;
 @end
 
-@interface NSWindow (WebBorderViewAccess)
-- (NSView *)_web_borderView;
+@interface NSView (SubviewsIvar)
+@property (nullable, assign, setter=_setSubviewsIvar:) NSMutableArray<__kindof NSView *> *_subviewsIvar;
 @end
+
+#if !HAVE(SUBVIEWS_IVAR_SPI)
+@implementation NSView (SubviewsIvar)
+
+- (void)_setSubviewsIvar:(NSMutableArray<__kindof NSView *> *)subviews {
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+    _subviews = subviews;
+    ALLOW_DEPRECATED_DECLARATIONS_END
+}
+
+- (NSMutableArray<__kindof NSView *> *)_subviewsIvar {
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+    return (NSMutableArray *)_subviews;
+    ALLOW_DEPRECATED_DECLARATIONS_END
+}
+
+@end
+#endif
 
 using WebEvent = NSEvent;
@@ -627 +647 @@
 @end
 
-@implementation NSWindow (WebBorderViewAccess)
-
-- (NSView *)_web_borderView
-{
-    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    return _borderView;
-    ALLOW_DEPRECATED_DECLARATIONS_END
-}
-
-@end
-
 @interface WebResponderChainSink : NSResponder {
     NSResponder* _lastResponderInChain;
@@ -686 +695 @@
 {
     forceNSViewHitTest = YES;
-    NSView* view = [[window _web_borderView] hitTest:point];
+    NSView* view = [window._borderView hitTest:point];
     forceNSViewHitTest = NO;
 
@@ -1545 +1554 @@
     ASSERT(!_private->subviewsSetAside);
     ASSERT(_private->savedSubviews == nil);
-    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    _private->savedSubviews = _subviews;
-    ALLOW_DEPRECATED_DECLARATIONS_END
+    _private->savedSubviews = self._subviewsIvar;
     // We need to keep the layer-hosting view in the subviews, otherwise the layers flash.
     if (_private->layerHostingView) {
-        NSArray* newSubviews = [[NSArray alloc] initWithObjects:_private->layerHostingView, nil];
-        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-        _subviews = newSubviews;
+        NSMutableArray* newSubviews = [[NSMutableArray alloc] initWithObjects:_private->layerHostingView, nil];
+        self._subviewsIvar = newSubviews;
     } else
-        _subviews = nil;
-    ALLOW_DEPRECATED_DECLARATIONS_END
+        self._subviewsIvar = nil;
     _private->subviewsSetAside = YES;
 #endif
@@ -1565 +1570 @@
     ASSERT(_private->subviewsSetAside);
     if (_private->layerHostingView) {
-        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-        [_subviews release];
-        _subviews = _private->savedSubviews;
+        [self._subviewsIvar release];
+        self._subviewsIvar = _private->savedSubviews;
     } else {
-        ASSERT(_subviews == nil);
-        _subviews = _private->savedSubviews;
-        ALLOW_DEPRECATED_DECLARATIONS_END
+        ASSERT(self._subviewsIvar == nil);
+        self._subviewsIvar = _private->savedSubviews;
     }
     _private->savedSubviews = nil;