Changeset 263293 in webkit

Timestamp:

Jun 19, 2020, 3:50:20 PM (6 years ago)

Author:

Chris Dumez

Message:

Avoid initializing RenderTheme singleton unnecessarily in the UIProcess
​https://bugs.webkit.org/show_bug.cgi?id=213406

Reviewed by Per Arne Vollan.

Avoid initializing RenderTheme singleton unnecessarily in the UIProcess. Instead, introduce
a static function to get the focus ring color on iOS.

Source/WebCore:

• rendering/RenderThemeIOS.h:
• rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::systemFocusRingColor):
(WebCore::RenderThemeIOS::platformFocusRingColor const):

Source/WebKit:

• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderThemeIOS.h (modified) (1 diff)
• WebCore/rendering/RenderThemeIOS.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-19  Chris Dumez  <cdumez@apple.com>
+
+        Avoid initializing RenderTheme singleton unnecessarily in the UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=213406
+
+        Reviewed by Per Arne Vollan.
+
+        Avoid initializing RenderTheme singleton unnecessarily in the UIProcess. Instead, introduce
+        a static function to get the focus ring color on iOS.
+
+        * rendering/RenderThemeIOS.h:
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::systemFocusRingColor):
+        (WebCore::RenderThemeIOS::platformFocusRingColor const):
+
 2020-06-19  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeIOS.h

@@ -65 +65 @@
 
     WEBCORE_EXPORT static void setFocusRingColor(const Color&);
+
+#if ENABLE(FULL_KEYBOARD_ACCESS)
+    WEBCORE_EXPORT static Color systemFocusRingColor();
+#endif
 
 private:

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1146 +1146 @@
 
 #if ENABLE(FULL_KEYBOARD_ACCESS)
+Color RenderThemeIOS::systemFocusRingColor()
+{
+    if (!cachedFocusRingColor().hasValue()) {
+        // FIXME: Should be using -keyboardFocusIndicatorColor. For now, work around <rdar://problem/50838886>.
+        cachedFocusRingColor() = colorFromUIColor([PAL::getUIColorClass() systemBlueColor]);
+    }
+    return *cachedFocusRingColor();
+}
+
 Color RenderThemeIOS::platformFocusRingColor(OptionSet<StyleColor::Options>) const
 {
-    if (cachedFocusRingColor().hasValue())
-        return *cachedFocusRingColor();
-
-    // FIXME: Should be using -keyboardFocusIndicatorColor. For now, work around <rdar://problem/50838886>.
-    return colorFromUIColor([PAL::getUIColorClass() systemBlueColor]);
+    return systemFocusRingColor();
 }
 #endif

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-19  Chris Dumez  <cdumez@apple.com>
+
+        Avoid initializing RenderTheme singleton unnecessarily in the UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=213406
+
+        Reviewed by Per Arne Vollan.
+
+        Avoid initializing RenderTheme singleton unnecessarily in the UIProcess. Instead, introduce
+        a static function to get the focus ring color on iOS.
+
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+
 2020-06-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -462 +462 @@
     parameters.supportsPictureInPicture = supportsPictureInPicture();
     parameters.cssValueToSystemColorMap = RenderThemeIOS::cssValueToSystemColorMap();
-    parameters.focusRingColor = RenderTheme::singleton().focusRingColor(OptionSet<StyleColor::Options>());
+#if ENABLE(FULL_KEYBOARD_ACCESS)
+    parameters.focusRingColor = RenderThemeIOS::systemFocusRingColor();
+#endif
     parameters.localizedDeviceModel = localizedDeviceModel();
 #endif