Changeset 237262 in webkit

Timestamp:

Oct 18, 2018 1:02:49 PM (6 years ago)

Author:

Wenson Hsieh

Message:

[GTK] fast/css/pseudo-visited-background-color-on-input.html is failing since r237425
​https://bugs.webkit.org/show_bug.cgi?id=190712

Reviewed by Tim Horton.

Ensure that color inputs are enabled by default on GTK, and that color inputs have a -webkit-appearance of
color-well by default. Fixes fast/css/pseudo-visited-background-color-on-input.html on GTK.

• page/RuntimeEnabledFeatures.cpp:

(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):

• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::colorInputStyleSheet const):

• rendering/RenderTheme.h:

(WebCore::RenderTheme::platformUsesColorWellAppearance const):
(WebCore::RenderTheme::platformColorInputStyleSheet const): Deleted.

Replace this with a platform hook that determines whether we want to use -webkit-appearance: color-well; by
default for inputs of type color. For now, only iOS overrides this to return false; in the future, we should
support -webkit-appearance: color-well; on iOS, and remove this platform hook entirely.

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

(WebCore::RenderThemeMac::platformColorInputStyleSheet const): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/RuntimeEnabledFeatures.cpp (modified) (1 diff)
• rendering/RenderTheme.cpp (modified) (1 diff)
• rendering/RenderTheme.h (modified) (1 diff)
• rendering/RenderThemeIOS.h (modified) (1 diff)
• rendering/RenderThemeMac.h (modified) (1 diff)
• rendering/RenderThemeMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-18  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [GTK] fast/css/pseudo-visited-background-color-on-input.html is failing since r237425
+        https://bugs.webkit.org/show_bug.cgi?id=190712
+
+        Reviewed by Tim Horton.
+
+        Ensure that color inputs are enabled by default on GTK, and that color inputs have a `-webkit-appearance` of
+        `color-well` by default. Fixes fast/css/pseudo-visited-background-color-on-input.html on GTK.
+
+        * page/RuntimeEnabledFeatures.cpp:
+        (WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::colorInputStyleSheet const):
+        * rendering/RenderTheme.h:
+        (WebCore::RenderTheme::platformUsesColorWellAppearance const):
+        (WebCore::RenderTheme::platformColorInputStyleSheet const): Deleted.
+
+        Replace this with a platform hook that determines whether we want to use `-webkit-appearance: color-well;` by
+        default for inputs of type color. For now, only iOS overrides this to return false; in the future, we should
+        support `-webkit-appearance: color-well;` on iOS, and remove this platform hook entirely.
+
+        * rendering/RenderThemeIOS.h:
+        * rendering/RenderThemeMac.h:
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::platformColorInputStyleSheet const): Deleted.
+
 2018-10-18  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/page/RuntimeEnabledFeatures.cpp

@@ -47 +47 @@
     m_isWebSocketEnabled = false;
 #endif
+#if PLATFORM(GTK) && ENABLE(INPUT_TYPE_COLOR)
+    m_isInputTypeColorEnabled = true;
+#endif
 }
 

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -1040 +1040 @@
 {
     ASSERT(RuntimeEnabledFeatures::sharedFeatures().inputTypeColorEnabled());
-    return makeString(platformColorInputStyleSheet(), " input[type=\"color\"] { width: 44px; height: 23px; outline: none; }"_s);
+    auto colorWellAppearanceStyle = emptyString();
+    if (platformUsesColorWellAppearance())
+        colorWellAppearanceStyle = "-webkit-appearance: color-well; "_s;
+    return makeString("input[type=\"color\"] { "_s, WTFMove(colorWellAppearanceStyle), "width: 44px; height: 23px; outline: none; }"_s);
 }
 

trunk/Source/WebCore/rendering/RenderTheme.h

@@ -351 +351 @@
 
 #if ENABLE(INPUT_TYPE_COLOR)
-    virtual String platformColorInputStyleSheet() const { return { }; }
+    virtual bool platformUsesColorWellAppearance() const { return true; }
 #endif
 

trunk/Source/WebCore/rendering/RenderThemeIOS.h

@@ -146 +146 @@
 #endif
 
+#if ENABLE(INPUT_TYPE_COLOR)
+    bool platformUsesColorWellAppearance() const final
+    {
+        // FIXME: Support -webkit-appearance: color-well; for drawing color inputs on iOS.
+        return false;
+    }
+#endif
+
     const Color& shadowColor() const;
     FloatRect addRoundedBorderClip(const RenderObject& box, GraphicsContext&, const IntRect&);

trunk/Source/WebCore/rendering/RenderThemeMac.h

@@ -120 +120 @@
 #endif
 
-#if ENABLE(INPUT_TYPE_COLOR)
-    String platformColorInputStyleSheet() const final;
-#endif
-
     bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) final;
     void adjustTextFieldStyle(StyleResolver&, RenderStyle&, const Element*) const final;

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -339 +339 @@
 
     RenderTheme::purgeCaches();
-}
-
-String RenderThemeMac::platformColorInputStyleSheet() const
-{
-    return "input[type=\"color\"] { -webkit-appearance: color-well; }"_s;
 }