Changeset 246228 in webkit

Timestamp:

Jun 7, 2019 6:33:38 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

Disable focus rings on WKContentView for PLATFORM(IOSMAC)
​https://bugs.webkit.org/show_bug.cgi?id=198685

Reviewed by Simon Fraser.

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/ios/WKContentView.mm:

(-[WKContentView _commonInitializationWithProcessPool:configuration:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (2 diffs)
• UIProcess/ios/WKContentView.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-07  Tim Horton  <timothy_horton@apple.com>
+
+        Disable focus rings on WKContentView for PLATFORM(IOSMAC)
+        https://bugs.webkit.org/show_bug.cgi?id=198685
+
+        Reviewed by Simon Fraser.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView _commonInitializationWithProcessPool:configuration:]):
+
 2019-06-07  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -515 +515 @@
 };
 
+#if PLATFORM(IOSMAC)
+typedef NS_ENUM(NSUInteger, UIFocusRingType) {
+    UIFocusRingTypeNone = 1,
+};
+#endif
+
 @interface UIView ()
 + (BOOL)_isInAnimationBlock;
@@ -529 +535 @@
 - (void)_removeAllAnimations:(BOOL)includeSubviews;
 - (UIColor *)_inheritedInteractionTintColor;
+#if PLATFORM(IOSMAC)
+@property (nonatomic, getter=_focusRingType, setter=_setFocusRingType:) UIFocusRingType focusRingType;
+#endif
 @end
 

trunk/Source/WebKit/UIProcess/ios/WKContentView.mm

@@ -177 +177 @@
     self.layer.hitTestsAsOpaque = YES;
 
+#if PLATFORM(IOSMAC)
+    [self _setFocusRingType:UIFocusRingTypeNone];
+#endif
+
 #if HAVE(VISIBILITY_PROPAGATION_VIEW)
     [self _setupVisibilityPropagationView];