Attachment 343659 Details for Bug 126907 – Patch

[patch] Patch

bug-126907-20180626203047.patch (text/plain), 25.87 KB, created by Carlos Bentzen on 2018-06-26 16:30:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Bentzen

Created: 2018-06-26 16:30:49 PDT

Size: 25.87 KB

patch

obsolete

>Subversion Revision: 233146
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2243d681c2a44c1c2ac0bd0b5d8f699183a582cc..832ec418db24abec9bf23928e7934a4843413bb4 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2018-06-18  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
>+
>+        [GTK] Hardcoded text color in input fields
>+        https://bugs.webkit.org/show_bug.cgi?id=126907
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests. Some test expectations updated and ManualTests/gtk/theme.html already covers the change.
>+
>+        * platform/gtk/RenderThemeGadget.cpp: Use base style context instead of nullptr for new RenderThemeGadgets.
>+        (WebCore::baseStyleContext):
>+        (WebCore::RenderThemeGadget::RenderThemeGadget):
>+        * rendering/RenderTheme.cpp:
>+        (WebCore::RenderTheme::adjustStyle): Only call adjustTextFieldStyle if it needs a spinbutton.
>+        * rendering/RenderThemeGtk.cpp:
>+        (WebCore::styleColor):
>+        (WebCore::RenderThemeGtk::adjustTextFieldStyle const): Style with the GTK colors to fix rendering issues in dark themes.
>+        (WebCore::RenderThemeGtk::adjustTextAreaStyle const): Ditto.
>+        (WebCore::RenderThemeGtk::adjustSearchFieldStyle const): Ditto.
>+        (WebCore::RenderThemeGtk::systemColor const): s/ACTIVE/NORMAL/ to fix color issue in HighContrast theme (white text on white background).
>+        * rendering/RenderThemeGtk.h:
>+
> 2018-06-25  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Adjust static position with containing block's content box top/left
>diff --git a/Source/WebCore/platform/gtk/RenderThemeGadget.cpp b/Source/WebCore/platform/gtk/RenderThemeGadget.cpp
>index 6a2903b87513b60e0f082921f3fcc36fab784b08..be08d31e2a7081c4db83d650e07de31f1279cae6 100644
>--- a/Source/WebCore/platform/gtk/RenderThemeGadget.cpp
>+++ b/Source/WebCore/platform/gtk/RenderThemeGadget.cpp
>@@ -26,6 +26,8 @@
> #include "config.h"
> #include "RenderThemeGadget.h"
> 
>+#include <mutex>
>+
> #if GTK_CHECK_VERSION(3, 20, 0)
> 
> #include "FloatRect.h"
>@@ -72,6 +74,25 @@ static void appendElementToPath(GtkWidgetPath* path, const RenderThemeGadget::In
>         gtk_widget_path_iter_add_class(path, -1, className);
> }
> 
>+
>+static GtkStyleContext* baseStyleContext()
>+{
>+    static NeverDestroyed<GtkStyleContext> baseContext(*gtk_style_context_new());
>+    static std::once_flag onceFlag;
>+
>+    std::call_once(onceFlag, []() {
>+        GRefPtr<GtkWidgetPath> path = adoptGRef(gtk_widget_path_new());
>+        gtk_widget_path_append_type(path.get(), GTK_TYPE_WINDOW);
>+        gtk_widget_path_iter_set_object_name(path.get(), -1, "window");
>+        gtk_widget_path_iter_add_class(path.get(), -1, GTK_STYLE_CLASS_BACKGROUND);
>+
>+        gtk_style_context_set_path(&baseContext.get(), path.get());
>+        gtk_style_context_set_parent(&baseContext.get(), nullptr);
>+    });
>+
>+    return &baseContext.get();
>+}
>+
> RenderThemeGadget::RenderThemeGadget(const RenderThemeGadget::Info& info, RenderThemeGadget* parent, const Vector<RenderThemeGadget::Info> siblings, unsigned position)
> {
>     GRefPtr<GtkWidgetPath> path = parent ? adoptGRef(gtk_widget_path_copy(gtk_style_context_get_path(parent->context()))) : adoptGRef(gtk_widget_path_new());
>@@ -82,7 +103,7 @@ RenderThemeGadget::RenderThemeGadget(const RenderThemeGadget::Info& info, Render
>         gtk_widget_path_append_with_siblings(path.get(), siblingsPath.get(), position);
>     } else
>         appendElementToPath(path.get(), info);
>-    m_context = createStyleContext(path.get(), parent ? parent->context() : nullptr);
>+    m_context = createStyleContext(path.get(), parent ? parent->context() : baseStyleContext());
> }
> 
> RenderThemeGadget::~RenderThemeGadget() = default;
>diff --git a/Source/WebCore/rendering/RenderTheme.cpp b/Source/WebCore/rendering/RenderTheme.cpp
>index 0988abbb593a30f76b124766a183d936e07582c1..db7882cb141cbea114cbe240810d0f469c40aa5b 100644
>--- a/Source/WebCore/rendering/RenderTheme.cpp
>+++ b/Source/WebCore/rendering/RenderTheme.cpp
>@@ -94,7 +94,8 @@ void RenderTheme::adjustStyle(StyleResolver& styleResolver, RenderStyle& style,
>             part = MenulistButtonPart;
>             break;
>         case TextFieldPart:
>-            adjustTextFieldStyle(styleResolver, style, element);
>+            if (is<HTMLInputElement>(element) && shouldHaveSpinButton(downcast<HTMLInputElement>(*element)))
>+                adjustTextFieldStyle(styleResolver, style, element);
>             FALLTHROUGH;
>         default:
>             style.setAppearance(NoControlPart);
>diff --git a/Source/WebCore/rendering/RenderThemeGtk.cpp b/Source/WebCore/rendering/RenderThemeGtk.cpp
>index 8e8fe10f58eb72cdf455b4a949fd5a28fffc5d80..48c52b095365e88ea9c70919f904d93e46079edb 100644
>--- a/Source/WebCore/rendering/RenderThemeGtk.cpp
>+++ b/Source/WebCore/rendering/RenderThemeGtk.cpp
>@@ -493,6 +493,49 @@ void RenderThemeGtk::adjustRepaintRect(const RenderObject& renderObject, FloatRe
> }
> #endif // GTK_CHECK_VERSION(3, 20, 0)
> 
>+enum StyleColorType { StyleColorBackground, StyleColorForeground };
>+
>+#if GTK_CHECK_VERSION(3, 20, 0)
>+static Color styleColor(RenderThemePart themePart, GtkStateFlags state, StyleColorType colorType)
>+{
>+    RenderThemeGadget* gadget = nullptr;
>+    switch (themePart) {
>+    default:
>+        ASSERT_NOT_REACHED();
>+        FALLTHROUGH;
>+    case Entry:
>+        gadget = &static_cast<RenderThemeEntry&>(RenderThemeWidget::getOrCreate(RenderThemeWidget::Type::Entry)).entry();
>+        break;
>+    case EntrySelection:
>+        gadget = static_cast<RenderThemeEntry&>(RenderThemeWidget::getOrCreate(RenderThemeWidget::Type::SelectedEntry)).selection();
>+        break;
>+    case ListBox:
>+        gadget = &static_cast<RenderThemeListView&>(RenderThemeWidget::getOrCreate(RenderThemeWidget::Type::ListView)).treeview();
>+        break;
>+    case Button:
>+        gadget = &static_cast<RenderThemeButton&>(RenderThemeWidget::getOrCreate(RenderThemeWidget::Type::Button)).button();
>+        break;
>+    }
>+
>+    ASSERT(gadget);
>+    gadget->setState(state);
>+    return colorType == StyleColorBackground ? gadget->backgroundColor() : gadget->color();
>+}
>+#else
>+static Color styleColor(RenderThemePart themePart, GtkStateFlags state, StyleColorType colorType)
>+{
>+    GRefPtr<GtkStyleContext> context = createStyleContext(themePart);
>+    gtk_style_context_set_state(context.get(), state);
>+
>+    GdkRGBA gdkRGBAColor;
>+    if (colorType == StyleColorBackground)
>+        gtk_style_context_get_background_color(context.get(), state, &gdkRGBAColor);
>+    else
>+        gtk_style_context_get_color(context.get(), state, &gdkRGBAColor);
>+    return gdkRGBAColor;
>+}
>+#endif // GTK_CHECK_VERSION(3, 20, 0)
>+
> void RenderThemeGtk::adjustButtonStyle(StyleResolver&, RenderStyle& style, const Element*) const
> {
>     // Some layout tests check explicitly that buttons ignore line-height.
>@@ -951,10 +994,15 @@ static IntSize spinButtonSize()
>     return IntSize(upPreferredSize.width() + downPreferredSize.width(), std::max(upPreferredSize.height(), downPreferredSize.height()));
> }
> 
>-
> void RenderThemeGtk::adjustTextFieldStyle(StyleResolver&, RenderStyle& style, const Element* element) const
> {
>-    if (!is<HTMLInputElement>(element) || !shouldHaveSpinButton(downcast<HTMLInputElement>(*element)))
>+    if (!is<HTMLInputElement>(element))
>+        return;
>+
>+    if (element && downcast<HTMLInputElement>(*element).isValid())
>+        style.setColor(styleColor(Entry, element->isDisabledFormControl() ? GTK_STATE_FLAG_INSENSITIVE : GTK_STATE_FLAG_NORMAL, StyleColorForeground));
>+
>+    if (!shouldHaveSpinButton(downcast<HTMLInputElement>(*element)))
>         return;
> 
>     style.setMinHeight(Length(spinButtonSize().height(), Fixed));
>@@ -968,6 +1016,12 @@ void RenderThemeGtk::adjustTextFieldStyle(StyleResolver&, RenderStyle& style, co
>     style.setMinWidth(Length(minimumWidth, Fixed));
> }
> 
>+void RenderThemeGtk::adjustTextAreaStyle(StyleResolver&, RenderStyle& style, const Element* element) const
>+{
>+    if (element)
>+        style.setColor(styleColor(Entry, element->isDisabledFormControl() ? GTK_STATE_FLAG_INSENSITIVE : GTK_STATE_FLAG_NORMAL, StyleColorForeground));
>+}
>+
> bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& paintInfo, const FloatRect& rect)
> {
>     if (is<HTMLInputElement>(renderObject.node()) && shouldHaveSpinButton(downcast<HTMLInputElement>(*renderObject.node()))) {
>@@ -1209,8 +1263,11 @@ bool RenderThemeGtk::paintSearchFieldCancelButton(const RenderBox& renderObject,
> }
> #endif // GTK_CHECK_VERSION(3, 20, 0)
> 
>-void RenderThemeGtk::adjustSearchFieldStyle(StyleResolver&, RenderStyle& style, const Element*) const
>+void RenderThemeGtk::adjustSearchFieldStyle(StyleResolver&, RenderStyle& style, const Element* element) const
> {
>+    if (element)
>+        style.setColor(styleColor(Entry, element->isDisabledFormControl() ? GTK_STATE_FLAG_INSENSITIVE : GTK_STATE_FLAG_NORMAL, StyleColorForeground));
>+
>     // We cannot give a proper rendering when border radius is active, unfortunately.
>     style.resetBorderRadius();
>     style.setLineHeight(RenderStyle::initialLineHeight());
>@@ -1682,49 +1739,6 @@ Seconds RenderThemeGtk::caretBlinkInterval() const
>     return 500_us * time;
> }
> 
>-enum StyleColorType { StyleColorBackground, StyleColorForeground };
>-
>-#if GTK_CHECK_VERSION(3, 20, 0)
>-static Color styleColor(RenderThemePart themePart, GtkStateFlags state, StyleColorType colorType)
>-{
>-    RenderThemeGadget* gadget = nullptr;
>-    switch (themePart) {
>-    default:
>-        ASSERT_NOT_REACHED();
>-        FALLTHROUGH;
>-    case Entry:
>-        gadget = &static_cast<RenderThemeEntry&>(RenderThemeWidget::getOrCreate(RenderThemeWidget::Type::Entry)).entry();
>-        break;
>-    case EntrySelection:
>-        gadget = static_cast<RenderThemeEntry&>(RenderThemeWidget::getOrCreate(RenderThemeWidget::Type::SelectedEntry)).selection();
>-        break;
>-    case ListBox:
>-        gadget = &static_cast<RenderThemeListView&>(RenderThemeWidget::getOrCreate(RenderThemeWidget::Type::ListView)).treeview();
>-        break;
>-    case Button:
>-        gadget = &static_cast<RenderThemeButton&>(RenderThemeWidget::getOrCreate(RenderThemeWidget::Type::Button)).button();
>-        break;
>-    }
>-
>-    ASSERT(gadget);
>-    gadget->setState(state);
>-    return colorType == StyleColorBackground ? gadget->backgroundColor() : gadget->color();
>-}
>-#else
>-static Color styleColor(RenderThemePart themePart, GtkStateFlags state, StyleColorType colorType)
>-{
>-    GRefPtr<GtkStyleContext> context = createStyleContext(themePart);
>-    gtk_style_context_set_state(context.get(), state);
>-
>-    GdkRGBA gdkRGBAColor;
>-    if (colorType == StyleColorBackground)
>-        gtk_style_context_get_background_color(context.get(), state, &gdkRGBAColor);
>-    else
>-        gtk_style_context_get_color(context.get(), state, &gdkRGBAColor);
>-    return gdkRGBAColor;
>-}
>-#endif // GTK_CHECK_VERSION(3, 20, 0)
>-
> Color RenderThemeGtk::platformActiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const
> {
>     return styleColor(EntrySelection, static_cast<GtkStateFlags>(GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED), StyleColorBackground);
>@@ -1769,7 +1783,7 @@ Color RenderThemeGtk::systemColor(CSSValueID cssValueId, OptionSet<StyleColor::O
> {
>     switch (cssValueId) {
>     case CSSValueButtontext:
>-        return styleColor(Button, GTK_STATE_FLAG_ACTIVE, StyleColorForeground);
>+        return styleColor(Button, GTK_STATE_FLAG_NORMAL, StyleColorForeground);
>     case CSSValueCaptiontext:
>         return styleColor(Entry, GTK_STATE_FLAG_ACTIVE, StyleColorForeground);
>     default:
>diff --git a/Source/WebCore/rendering/RenderThemeGtk.h b/Source/WebCore/rendering/RenderThemeGtk.h
>index 097f9418430893eddc14f653714c6acc5529b83c..a915131c2347d968e0cf159e8c033bf7fc0f1115 100644
>--- a/Source/WebCore/rendering/RenderThemeGtk.h
>+++ b/Source/WebCore/rendering/RenderThemeGtk.h
>@@ -118,6 +118,8 @@ private:
> 
>     void adjustTextFieldStyle(StyleResolver&, RenderStyle&, const Element*) const override;
>     bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
>+
>+    void adjustTextAreaStyle(StyleResolver&, RenderStyle&, const Element*) const override;
>     bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
> 
>     LengthBox popupInternalPaddingBox(const RenderStyle&) const override;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 9d67f5c3f7366efc2084b74d4f421086966c220a..b6fc37b2f2f2aee622b3b0009ff784d00e3b4f86 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-06-18  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
>+
>+        [GTK] Hardcoded text color in input fields
>+        https://bugs.webkit.org/show_bug.cgi?id=126907
>+
>+        Update test expectations after start using theme colors for disabled inputs.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/gtk/TestExpectations:
>+        * platform/gtk/fast/forms/basic-inputs-expected.txt:
>+        * platform/gtk/fast/forms/basic-textareas-expected.txt:
>+        * platform/gtk/fast/forms/basic-textareas-quirks-expected.txt:
>+        * platform/gtk/fast/forms/input-appearance-disabled-expected.txt:
>+        * platform/gtk/fast/forms/input-disabled-color-expected.txt:
>+        * platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt:
>+        * platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt:
>+
> 2018-06-25  Antoine Quint  <graouts@apple.com>
> 
>         [Web Animations] Make imported/mozilla/css-animations/test_animation-pausing.html pass reliably
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index 9ab3e668658bae305c6ee80e40f157df4d68dcf4..35f7a027f1e5147f7208dbd38de62d546364e4e2 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -1174,6 +1174,11 @@ webkit.org/b/186219 fast/forms/password-placeholder-text-security.html [ ImageOn
> webkit.org/b/186219 fast/forms/placeholder-with-positioned-element.html [ ImageOnlyFailure ]
> webkit.org/b/186219 fast/forms/textarea-placeholder-wrapping.html [ ImageOnlyFailure ]
> 
>+# We check if the color different than the default to style or not input elements with GTK, but
>+# but this test explicitly sets the color to the default. As a result, we override the style that
>+# is expected during the test. We do so to fix rendering issues with dark themes.
>+webkit.org/b/126907 fast/selectors/read-only-read-write-input-basics.html
>+
> # This seems to be testing Apple-specific behavior?
> css3/color-filters/color-filter-ignore-semantic.html [ ImageOnlyFailure ]
> 
>diff --git a/LayoutTests/platform/gtk/fast/forms/basic-inputs-expected.txt b/LayoutTests/platform/gtk/fast/forms/basic-inputs-expected.txt
>index 02b9c1542f38495abe8a543b9e1fd3da7e6ceba0..54dd0c321d25fbbe151cfcf8758a47f10188249d 100644
>--- a/LayoutTests/platform/gtk/fast/forms/basic-inputs-expected.txt
>+++ b/LayoutTests/platform/gtk/fast/forms/basic-inputs-expected.txt
>@@ -38,7 +38,7 @@ layer at (0,0) size 800x600
>         RenderTextControl {INPUT} at (10,3) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
>         RenderText {#text} at (203,6) size 27x17
>           text run at (203,6) width 27: "text "
>-        RenderTextControl {INPUT} at (232,3) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
>+        RenderTextControl {INPUT} at (232,3) size 191x24 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (2px inset #8B8E8F)]
>         RenderText {#text} at (425,6) size 19x17
>           text run at (425,6) width 12: "b "
>           text run at (437,6) width 7: "a"
>@@ -47,7 +47,7 @@ layer at (0,0) size 800x600
>             RenderBlock {DIV} at (0,0) size 185x18
>         RenderText {#text} at (196,34) size 60x17
>           text run at (196,34) width 60: "password"
>-        RenderTextControl {INPUT} at (3,59) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
>+        RenderTextControl {INPUT} at (3,59) size 191x24 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (2px inset #8B8E8F)]
>           RenderFlexibleBox {DIV} at (3,3) size 185x18
>             RenderBlock {DIV} at (0,0) size 185x18
>         RenderText {#text} at (196,62) size 8x17
>@@ -75,7 +75,7 @@ layer at (31,330) size 185x18 scrollWidth 214
>     RenderText {#text} at (0,0) size 213x17
>       text run at (0,0) width 213: "foobarbazfoobarbazfoobarbaz"
> layer at (253,330) size 185x18
>-  RenderBlock {DIV} at (3,3) size 185x18 [color=#545454]
>+  RenderBlock {DIV} at (3,3) size 185x18 [color=#DDE2E4]
>     RenderText {#text} at (0,0) size 22x17
>       text run at (0,0) width 22: "foo"
> layer at (24,358) size 185x18
>@@ -83,6 +83,6 @@ layer at (24,358) size 185x18
>     RenderText {#text} at (0,0) size 18x17
>       text run at (0,0) width 18: "\x{2022}\x{2022}\x{2022}"
> layer at (24,386) size 185x18
>-  RenderBlock {DIV} at (0,0) size 185x18 [color=#545454]
>+  RenderBlock {DIV} at (0,0) size 185x18 [color=#DDE2E4]
>     RenderText {#text} at (0,0) size 18x17
>       text run at (0,0) width 18: "\x{2022}\x{2022}\x{2022}"
>diff --git a/LayoutTests/platform/gtk/fast/forms/basic-textareas-expected.txt b/LayoutTests/platform/gtk/fast/forms/basic-textareas-expected.txt
>index 3a620323e00a3ca3487126e4e7d77eea2b71e73b..fcfc6aade2526c75bb80de65515070ca801d6f31 100644
>--- a/LayoutTests/platform/gtk/fast/forms/basic-textareas-expected.txt
>+++ b/LayoutTests/platform/gtk/fast/forms/basic-textareas-expected.txt
>@@ -218,8 +218,8 @@ layer at (0,0) size 785x1996
>               RenderText {#text} at (0,0) size 132x17
>                 text run at (0,0) width 132: "Lorem ipsum dolor"
>         layer at (210,77) size 201x42 clip at (211,78) size 184x40 scrollHeight 76
>-          RenderTextControl {TEXTAREA} at (3,18) size 201x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
>-            RenderBlock {DIV} at (3,3) size 180x72 [color=#545454]
>+          RenderTextControl {TEXTAREA} at (3,18) size 201x42 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (1px solid #8B8E8F)]
>+            RenderBlock {DIV} at (3,3) size 180x72 [color=#DDE2E4]
>               RenderText {#text} at (0,0) size 171x71
>                 text run at (0,0) width 136: "Lorem ipsum  dolor"
>                 text run at (136,0) width 4: " "
>@@ -894,8 +894,8 @@ layer at (0,0) size 785x1996
>               RenderText {#text} at (0,0) size 132x17
>                 text run at (0,0) width 132: "Lorem ipsum dolor"
>         layer at (210,77) size 201x42 clip at (211,78) size 184x40 scrollHeight 76
>-          RenderTextControl {TEXTAREA} at (3,18) size 201x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
>-            RenderBlock {DIV} at (3,3) size 180x72 [color=#545454]
>+          RenderTextControl {TEXTAREA} at (3,18) size 201x42 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (1px solid #8B8E8F)]
>+            RenderBlock {DIV} at (3,3) size 180x72 [color=#DDE2E4]
>               RenderText {#text} at (0,0) size 171x71
>                 text run at (0,0) width 136: "Lorem ipsum  dolor"
>                 text run at (136,0) width 4: " "
>diff --git a/LayoutTests/platform/gtk/fast/forms/basic-textareas-quirks-expected.txt b/LayoutTests/platform/gtk/fast/forms/basic-textareas-quirks-expected.txt
>index 32b10581414d22fa2d6ca436f798212a2a5d8b63..fd75397f71c43742c0f09a4f6561033c14f40fcf 100644
>--- a/LayoutTests/platform/gtk/fast/forms/basic-textareas-quirks-expected.txt
>+++ b/LayoutTests/platform/gtk/fast/forms/basic-textareas-quirks-expected.txt
>@@ -241,8 +241,8 @@ layer at (26,91) size 201x42 clip at (27,92) size 184x40 scrollHeight 76
>         text run at (0,54) width 169: "abcdefghijklmnopqrstuv"
>         text run at (169,54) width 4: " "
> layer at (26,156) size 201x42 clip at (27,157) size 184x40 scrollHeight 76
>-  RenderTextControl {TEXTAREA} at (17,3) size 201x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
>-    RenderBlock {DIV} at (3,3) size 180x72 [color=#545454]
>+  RenderTextControl {TEXTAREA} at (17,3) size 201x42 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (1px solid #8B8E8F)]
>+    RenderBlock {DIV} at (3,3) size 180x72 [color=#DDE2E4]
>       RenderText {#text} at (0,0) size 173x71
>         text run at (0,0) width 132: "Lorem ipsum dolor"
>         text run at (132,0) width 4: " "
>diff --git a/LayoutTests/platform/gtk/fast/forms/input-appearance-disabled-expected.txt b/LayoutTests/platform/gtk/fast/forms/input-appearance-disabled-expected.txt
>index 8fbbde66e0bd5fec3365f7991d790df3496730c7..38633c8347b4888cf161bc5f80f4a2b1f46baabb 100644
>--- a/LayoutTests/platform/gtk/fast/forms/input-appearance-disabled-expected.txt
>+++ b/LayoutTests/platform/gtk/fast/forms/input-appearance-disabled-expected.txt
>@@ -6,9 +6,9 @@ layer at (0,0) size 800x600
>       RenderText {#text} at (0,0) size 397x17
>         text run at (0,0) width 397: "This tests that text can not be inserted into a disabled text field. "
>       RenderBR {BR} at (397,14) size 0x0
>-      RenderTextControl {INPUT} at (2,20) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
>+      RenderTextControl {INPUT} at (2,20) size 191x24 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (2px inset #8B8E8F)]
>       RenderText {#text} at (0,0) size 0x0
> layer at (13,31) size 185x18
>-  RenderBlock {DIV} at (3,3) size 185x18 [color=#545454]
>+  RenderBlock {DIV} at (3,3) size 185x18 [color=#DDE2E4]
>     RenderText {#text} at (0,0) size 89x17
>       text run at (0,0) width 89: "Test Passed"
>diff --git a/LayoutTests/platform/gtk/fast/forms/input-disabled-color-expected.txt b/LayoutTests/platform/gtk/fast/forms/input-disabled-color-expected.txt
>index fcd55ab53dae8381a697a1129f8c9fee1f992e46..2ee761c7d7e10cdf1672666f073c4061fdb7909a 100644
>--- a/LayoutTests/platform/gtk/fast/forms/input-disabled-color-expected.txt
>+++ b/LayoutTests/platform/gtk/fast/forms/input-disabled-color-expected.txt
>@@ -6,7 +6,7 @@ layer at (0,0) size 800x600
>       RenderText {#text} at (0,0) size 509x17
>         text run at (0,0) width 509: "This tests that the text color changes appropriately when the text field is disabled."
>       RenderBR {BR} at (509,14) size 0x0
>-      RenderTextControl {INPUT} at (2,20) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
>+      RenderTextControl {INPUT} at (2,20) size 191x24 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (2px inset #8B8E8F)]
>       RenderText {#text} at (195,23) size 4x17
>         text run at (195,23) width 4: " "
>       RenderTextControl {INPUT} at (201,20) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
>@@ -72,7 +72,7 @@ layer at (0,0) size 800x600
>       RenderTextControl {INPUT} at (201,356) size 191x24 [color=#FF0000] [border: (2px inset #FF0000)]
>       RenderBR {BR} at (394,373) size 0x0
> layer at (13,31) size 185x18 scrollWidth 462
>-  RenderBlock {DIV} at (3,3) size 185x18 [color=#545454]
>+  RenderBlock {DIV} at (3,3) size 185x18 [color=#DDE2E4]
>     RenderText {#text} at (0,0) size 462x17
>       text run at (0,0) width 462: "The text in this disabled field should displayed as dimmed or grey"
> layer at (212,31) size 185x18 scrollWidth 202
>diff --git a/LayoutTests/platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt b/LayoutTests/platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt
>index 37e3910dac2231e291646442b0cb5f1a77483459..eb7a5bdda0df26c20e6144f1b9c83b9391d07954 100644
>--- a/LayoutTests/platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt
>+++ b/LayoutTests/platform/gtk/fast/forms/placeholder-pseudo-style-expected.txt
>@@ -21,7 +21,7 @@ layer at (0,0) size 800x600
>           RenderBlock {DIV} at (0,0) size 185x18
>       RenderText {#text} at (624,23) size 4x17
>         text run at (624,23) width 4: " "
>-      RenderTextControl {INPUT} at (2,48) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
>+      RenderTextControl {INPUT} at (2,48) size 191x24 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (2px inset #8B8E8F)]
>       RenderText {#text} at (195,51) size 4x17
>         text run at (195,51) width 4: " "
>       RenderTextControl {INPUT} at (201,48) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
>@@ -52,7 +52,7 @@ layer at (13,59) size 185x18
>     RenderText {#text} at (0,0) size 90x17
>       text run at (0,0) width 90: "disabled text"
> layer at (13,59) size 185x18
>-  RenderBlock {DIV} at (3,3) size 185x18 [color=#545454]
>+  RenderBlock {DIV} at (3,3) size 185x18 [color=#DDE2E4]
> layer at (212,59) size 185x18
>   RenderBlock {DIV} at (3,3) size 185x18 [color=#A9A9A9]
>     RenderText {#text} at (0,0) size 48x17
>diff --git a/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt b/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt
>index b4dc923737de96d45db50814e2d62e91cb5a2485..9a1a7c2facff67402991b5fbf2f039dffaba2d32 100644
>--- a/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt
>+++ b/LayoutTests/platform/gtk/fast/forms/textarea-placeholder-pseudo-style-expected.txt
>@@ -20,8 +20,8 @@ layer at (10,28) size 201x42 clip at (11,29) size 199x40
>       RenderText {#text} at (0,0) size 25x17
>         text run at (0,0) width 25: "text"
> layer at (219,28) size 201x42 clip at (220,29) size 199x40
>-  RenderTextControl {TEXTAREA} at (211,20) size 201x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
>-    RenderBlock {DIV} at (3,3) size 195x18 [color=#545454]
>+  RenderTextControl {TEXTAREA} at (211,20) size 201x42 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (1px solid #8B8E8F)]
>+    RenderBlock {DIV} at (3,3) size 195x18 [color=#DDE2E4]
>     RenderBlock {DIV} at (3,3) size 195x18 [color=#640000]
>       RenderText {#text} at (0,0) size 90x17
>         text run at (0,0) width 90: "disabled text"
>@@ -32,8 +32,8 @@ layer at (428,28) size 201x42 clip at (429,29) size 199x40
>       RenderText {#text} at (0,0) size 48x17
>         text run at (0,0) width 48: "default"
> layer at (10,78) size 201x42 clip at (11,79) size 199x40
>-  RenderTextControl {TEXTAREA} at (2,70) size 201x42 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
>-    RenderBlock {DIV} at (3,3) size 195x18 [color=#545454]
>+  RenderTextControl {TEXTAREA} at (2,70) size 201x42 [color=#8B8E8F] [bgcolor=#FFFFFF] [border: (1px solid #8B8E8F)]
>+    RenderBlock {DIV} at (3,3) size 195x18 [color=#DDE2E4]
>     RenderBlock {DIV} at (3,3) size 195x18 [color=#A9A9A9]
>       RenderText {#text} at (0,0) size 113x17
>         text run at (0,0) width 113: "default disabled"

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 126907: 302499 | 340464 | 340489 | 340924 | 341088 | 341463 | 341468 | 341565 | 343018 | 343026 | 343033 | 343657 | 343659 | 343695 | 368142 | 368149 | 368150