Changeset 270611 in webkit

Timestamp:

Dec 9, 2020, 5:12:19 PM (6 years ago)

Author:

Wenson Hsieh

Message:

[GPU Process] Allow form controls to be painted when iOS form control refresh is enabled
​https://bugs.webkit.org/show_bug.cgi?id=219718

Reviewed by Tim Horton.

Ensures that form controls show up when using the GPU process, when the iOS form control refresh setting is
enabled. All form controls post-refresh are implemented in such a way that they're compatible with graphics
contexts in the web process that are not backed by platform graphics context objects. See below for more
details.

This was added as a temporary workaround to avoid crashing when enabling GPU process in r199037.

• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::paint):

• rendering/RenderTheme.h:

Makes RenderTheme::canPaint true by default on the base RenderTheme class, so that all platforms don't need
to individually override it and return true. Additionally plumbs a WebCore::Settings object through this
method, so that we can consult it on iOS.

(WebCore::RenderTheme::canPaint const):

• rendering/RenderThemeAdwaita.h:
• rendering/RenderThemeCocoa.h:
• rendering/RenderThemeCocoa.mm:

(WebCore::RenderThemeCocoa::canPaint const): Deleted.

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

(WebCore::RenderThemeIOS::canPaint const):

When iOS form control refresh is enabled, return true; otherwise, return true only if there is a platform
CGContextRef.

• rendering/RenderThemeMac.h:
• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::canPaint const):

Preserve existing behavior by returning true here if (and only if) there is a platform CGContextRef.

• rendering/RenderThemePlayStation.h:
• rendering/RenderThemeWin.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTheme.cpp (modified) (1 diff)
• rendering/RenderTheme.h (modified) (2 diffs)
• rendering/RenderThemeAdwaita.h (modified) (1 diff)
• rendering/RenderThemeCocoa.h (modified) (1 diff)
• rendering/RenderThemeCocoa.mm (modified) (1 diff)
• rendering/RenderThemeIOS.h (modified) (1 diff)
• rendering/RenderThemeIOS.mm (modified) (1 diff)
• rendering/RenderThemeMac.h (modified) (1 diff)
• rendering/RenderThemeMac.mm (modified) (1 diff)
• rendering/RenderThemePlayStation.h (modified) (1 diff)
• rendering/RenderThemeWin.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-09  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [GPU Process] Allow form controls to be painted when iOS form control refresh is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=219718
+
+        Reviewed by Tim Horton.
+
+        Ensures that form controls show up when using the GPU process, when the iOS form control refresh setting is
+        enabled. All form controls post-refresh are implemented in such a way that they're compatible with graphics
+        contexts in the web process that are not backed by platform graphics context objects. See below for more
+        details.
+
+        This was added as a temporary workaround to avoid crashing when enabling GPU process in r199037.
+
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::paint):
+        * rendering/RenderTheme.h:
+
+        Makes `RenderTheme::canPaint` true by default on the base `RenderTheme` class, so that all platforms don't need
+        to individually override it and return true. Additionally plumbs a `WebCore::Settings` object through this
+        method, so that we can consult it on iOS.
+
+        (WebCore::RenderTheme::canPaint const):
+        * rendering/RenderThemeAdwaita.h:
+        * rendering/RenderThemeCocoa.h:
+        * rendering/RenderThemeCocoa.mm:
+        (WebCore::RenderThemeCocoa::canPaint const): Deleted.
+        * rendering/RenderThemeIOS.h:
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::canPaint const):
+
+        When iOS form control refresh is enabled, return true; otherwise, return true only if there is a platform
+        `CGContextRef`.
+
+        * rendering/RenderThemeMac.h:
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::canPaint const):
+
+        Preserve existing behavior by returning true here if (and only if) there is a platform `CGContextRef`.
+
+        * rendering/RenderThemePlayStation.h:
+        * rendering/RenderThemeWin.h:
+
 2020-12-09  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -292 +292 @@
         return false;
 
-    if (UNLIKELY(!canPaint(paintInfo)))
+    if (UNLIKELY(!canPaint(paintInfo, box.settings())))
         return false;
 

trunk/Source/WebCore/rendering/RenderTheme.h

@@ -47 +47 @@
 class RenderProgress;
 class RenderStyle;
+class Settings;
 
 class RenderTheme {
@@ -264 +265 @@
 
 protected:
-    virtual bool canPaint(const PaintInfo&) const = 0;
+    virtual bool canPaint(const PaintInfo&, const Settings&) const { return true; }
     virtual FontCascadeDescription& cachedSystemFontDescription(CSSValueID systemFontID) const;
     virtual void updateCachedSystemFontDescription(CSSValueID systemFontID, FontCascadeDescription&) const = 0;

trunk/Source/WebCore/rendering/RenderThemeAdwaita.h

@@ -35 +35 @@
 
 private:
-    bool canPaint(const PaintInfo&) const final { return true; }
-
     String extraDefaultStyleSheet() final;
 #if ENABLE(VIDEO)

trunk/Source/WebCore/rendering/RenderThemeCocoa.h

@@ -40 +40 @@
 
 private:
-    bool canPaint(const PaintInfo&) const final;
     bool shouldHaveCapsLockIndicator(const HTMLInputElement&) const final;
 

trunk/Source/WebCore/rendering/RenderThemeCocoa.mm

@@ -54 +54 @@
 {
     return static_cast<RenderThemeCocoa&>(RenderTheme::singleton());
-}
-
-bool RenderThemeCocoa::canPaint(const PaintInfo& paintInfo) const
-{
-    return paintInfo.context().hasPlatformContext();
 }
 

trunk/Source/WebCore/rendering/RenderThemeIOS.h

@@ -69 +69 @@
 
 private:
+    bool canPaint(const PaintInfo&, const Settings&) const final;
+
     LengthBox popupInternalPaddingBox(const RenderStyle&) const override;
 

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -376 +376 @@
 }
 
+bool RenderThemeIOS::canPaint(const PaintInfo& paintInfo, const Settings& settings) const
+{
+#if ENABLE(IOS_FORM_CONTROL_REFRESH)
+    if (settings.iOSFormControlRefreshEnabled())
+        return true;
+#else
+    UNUSED_PARAM(settings);
+#endif
+    return paintInfo.context().hasPlatformContext();
+}
+
 void RenderThemeIOS::paintCheckboxDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
 {

trunk/Source/WebCore/rendering/RenderThemeMac.h

@@ -103 +103 @@
     RenderThemeMac();
 
+    bool canPaint(const PaintInfo&, const Settings&) const final;
+
 #if ENABLE(VIDEO)
     // Media controls

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -279 +279 @@
     static NeverDestroyed<RenderThemeMac> theme;
     return theme;
+}
+
+bool RenderThemeMac::canPaint(const PaintInfo& paintInfo, const Settings&) const
+{
+    return paintInfo.context().hasPlatformContext();
 }
 

trunk/Source/WebCore/rendering/RenderThemePlayStation.h

@@ -35 +35 @@
 
 private:
-    bool canPaint(const PaintInfo&) const final { return true; }
-
     void updateCachedSystemFontDescription(CSSValueID systemFontID, FontCascadeDescription&) const final;
 };

trunk/Source/WebCore/rendering/RenderThemeWin.h

@@ -140 +140 @@
     virtual ~RenderThemeWin();
 
-    bool canPaint(const PaintInfo&) const final { return true; }
-
     // System fonts.
     void updateCachedSystemFontDescription(CSSValueID, FontCascadeDescription&) const override;