Changeset 232913 in webkit

Timestamp:

Jun 17, 2018 8:47:39 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Correct behavior for dark themes
​https://bugs.webkit.org/show_bug.cgi?id=186219

Source/WebCore:

Patch by Carlos Eduardo Ramalho <​cadubentzen@gmail.com> on 2018-06-17
Reviewed by Michael Catanzaro.

Override RenderThemeGtk::isControlStyled() to not style
text inputs if color is set different than default.

No new tests. Manual theme test and existing layout tests already cover it.

• rendering/RenderThemeGtk.cpp:

(WebCore::RenderThemeGtk::isControlStyled const):

• rendering/RenderThemeGtk.h:

LayoutTests:

Update expectations in reftests expected to fail due to not
styling text inputs with GTK when color is different than default color.

Patch by Carlos Eduardo Ramalho <​cadubentzen@gmail.com> on 2018-06-17
Reviewed by Michael Catanzaro.

• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeGtk.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeGtk.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-06-17  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
+
+        [GTK] Correct behavior for dark themes
+        https://bugs.webkit.org/show_bug.cgi?id=186219
+
+        Update expectations in reftests expected to fail due to not
+        styling text inputs with GTK when color is different than default color.
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/gtk/TestExpectations:
+
 2018-06-16  Brendan McLoughlin  <brendan@bocoup.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1168 +1168 @@
 webkit.org/b/181659 fast/canvas/webgl/simulated-vertexAttrib0-invalid-indicies.html [ Skip ]
 
+# When text input colors are set we do not style with GTK, so these reftests will fail
+webkit.org/b/186219 fast/forms/input-placeholder-text-indent.html [ ImageOnlyFailure ]
+webkit.org/b/186219 fast/forms/password-placeholder-text-security.html [ ImageOnlyFailure ]
+webkit.org/b/186219 fast/forms/placeholder-with-positioned-element.html [ ImageOnlyFailure ]
+webkit.org/b/186219 fast/forms/textarea-placeholder-wrapping.html [ ImageOnlyFailure ]
+
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Expected failures.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-06-17  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
+
+        [GTK] Correct behavior for dark themes
+        https://bugs.webkit.org/show_bug.cgi?id=186219
+
+        Reviewed by Michael Catanzaro.
+
+        Override RenderThemeGtk::isControlStyled() to not style
+        text inputs if color is set different than default.
+
+        No new tests. Manual theme test and existing layout tests already cover it.
+
+        * rendering/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::isControlStyled const):
+        * rendering/RenderThemeGtk.h:
+
 2018-06-12  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeGtk.cpp

@@ -925 +925 @@
 }
 
+bool RenderThemeGtk::isControlStyled(const RenderStyle& style, const BorderData& border, const FillLayer& background, const Color& backgroundColor) const
+{
+    // To avoid rendering issues with dark themes, if text input elements have color styling, we don't style them with GTK.
+    if ((style.appearance() == TextFieldPart || style.appearance() == TextAreaPart || style.appearance() == SearchFieldPart) && style.color() != RenderStyle::initialColor())
+        return true;
+
+    return RenderTheme::isControlStyled(style, border, background, backgroundColor);
+}
+
 #if GTK_CHECK_VERSION(3, 20, 0)
 

trunk/Source/WebCore/rendering/RenderThemeGtk.h

@@ -169 +169 @@
 #endif
 
+    bool isControlStyled(const RenderStyle&, const BorderData&, const FillLayer&, const Color&) const override;
+
     Seconds animationRepeatIntervalForProgressBar(RenderProgress&) const override;
     Seconds animationDurationForProgressBar(RenderProgress&) const override;