Changeset 150530 in webkit

Timestamp:

May 22, 2013, 12:06:13 PM (13 years ago)

Author:

Simon Fraser

Message:

Fix issues with focus rings on search fields
​https://bugs.webkit.org/show_bug.cgi?id=116591

Source/WebCore:

Reviewed by Darin Adler.

On a future OS, the rect returned by _focusRingVisibleRect should
be in the coordinate system of the that NSView, not the base
coordinate system, so fix the code that sets and reads the global
focusRingClipRect variable accordingly.

• platform/graphics/mac/WebLayer.mm:

(drawLayerContents):

• platform/mac/ThemeMac.mm:

(-[WebCoreFlippedView _focusRingVisibleRect]):

Source/WebKit/mac:

Reviewed by Darin Adler.

In WebKit1, focus rings didn't render correctly on some OSes until
some other control drew a focus ring, which changes internal AppKit state
on the focused view. Fix by overriding an internal AppKit method to always
disable AppKit's "automatic" focus ring drawing.

• WebView/WebHTMLView.mm:

(-[WebHTMLView _automaticFocusRingDisabled]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/mac/WebLayer.mm (modified) (1 diff)
• WebCore/platform/mac/ThemeMac.mm (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix issues with focus rings on search fields
+        https://bugs.webkit.org/show_bug.cgi?id=116591
+
+        Reviewed by Darin Adler.
+        
+        On a future OS, the rect returned by _focusRingVisibleRect should
+        be in the coordinate system of the that NSView, not the base
+        coordinate system, so fix the code that sets and reads the global
+        focusRingClipRect variable accordingly.
+
+        * platform/graphics/mac/WebLayer.mm:
+        (drawLayerContents):
+        * platform/mac/ThemeMac.mm:
+        (-[WebCoreFlippedView _focusRingVisibleRect]):
+
 2013-05-22  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm

@@ -80 +80 @@
     FloatRect clipBounds = CGContextGetClipBoundingBox(context);
 
+    FloatRect focusRingClipRect = clipBounds;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
     // Set the focus ring clip rect which needs to be in base coordinates.
     AffineTransform transform = CGContextGetCTM(context);
-    ThemeMac::setFocusRingClipRect(transform.mapRect(clipBounds));
+    focusRingClipRect = transform.mapRect(clipBounds);
+#endif
+    ThemeMac::setFocusRingClipRect(focusRingClipRect);
 
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070

trunk/Source/WebCore/platform/mac/ThemeMac.mm

@@ -67 +67 @@
 
     NSRect rect = focusRingClipRect;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
     rect.origin.y = [self bounds].size.height - NSMaxY(rect);
+#endif
 
     return rect;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-05-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix issues with focus rings on search fields
+        https://bugs.webkit.org/show_bug.cgi?id=116591
+
+        Reviewed by Darin Adler.
+        
+        In WebKit1, focus rings didn't render correctly on some OSes until
+        some other control drew a focus ring, which changes internal AppKit state
+        on the focused view. Fix by overriding an internal AppKit method to always
+        disable AppKit's "automatic" focus ring drawing.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _automaticFocusRingDisabled]):
+
 2013-05-20  David Kilzer  <ddkilzer@apple.com>
 

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

@@ -4948 +4948 @@
 }
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+- (BOOL)_automaticFocusRingDisabled
+{
+    // The default state for _automaticFocusRingDisabled is NO, which prevents focus rings
+    // from being painted for search fields. Calling NSSetFocusRingStyle has the side effect
+    // of changing this to YES, so just return YES all the time. <rdar://problem/13780122>,
+    return YES;
+}
+#endif
 
 - (void)_updateControlTints