Changeset 102320 in webkit

Timestamp:

Dec 7, 2011 11:53:01 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

CSS color gets adjusted for disabled input elements
​https://bugs.webkit.org/show_bug.cgi?id=54643

Patch by Yosifumi Inoue <​yosin@chromium.org> on 2011-12-07
Reviewed by Kent Tamura.

Source/WebCore:

No new tests. covered by existing tests. Need rebasing some existing tests for Chromimum.

Remove automatic color adjustment for disabled text control for Chromimum.

• css/themeChromium.css: Add CSS entries for default style for disabled input and textarea elements.
• WebCore/rendering/RenderTextControl.cpp:

(disabledTextColor): Removed for PLATFORM(CHROMIUM)
(RenderTextControl::adjustInnerTextStyle): Don't call disabledTextColor for Chromium.

LayoutTests:

• platform/chromium/test_expectations.txt: Add files need to be updated.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/themeChromium.css (modified) (1 diff)
• Source/WebCore/rendering/RenderTextControl.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-07  Yosifumi Inoue  <yosin@chromium.org>
+
+        CSS color gets adjusted for disabled input elements
+        https://bugs.webkit.org/show_bug.cgi?id=54643
+
+        Reviewed by Kent Tamura.
+
+        * platform/chromium/test_expectations.txt: Add files need to be updated.
+
 2011-12-07  Dmitry Lomov  <dslomov@google.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3789 +3789 @@
 BUGWK73838 LEOPARD DEBUG : animations/animation-add-events-in-handler.html = CRASH
 
+// Need rebase - Removing auto gray for disabled text inputs.
+BUGWK54643 : fast/forms/basic-inputs.html = FAIL
+BUGWK54643 : fast/forms/basic-textareas-quirks.html = FAIL
+BUGWK54643 : fast/forms/basic-textareas.html = FAIL
+BUGWK54643 : fast/forms/file/file-input-disabled.html = FAIL
+BUGWK54643 : fast/forms/input-appearance-disabled.html = FAIL
+BUGWK54643 : fast/forms/input-disabled-color.html = FAIL
+BUGWK54643 : fast/forms/number/input-appearance-spinbutton-disabled-readonly.html = FAIL
+BUGWK54643 : fast/forms/placeholder-pseudo-style.html = FAIL
+BUGWK54643 : fast/forms/textarea-placeholder-pseudo-style.html = FAIL
+
 // Need rebaseline on Linux and Win GPU
 BUGWK73905 GPU LINUX : media/video-layer-crash.html = IMAGE+TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-07  Yosifumi Inoue  <yosin@chromium.org>
+
+        CSS color gets adjusted for disabled input elements
+        https://bugs.webkit.org/show_bug.cgi?id=54643
+
+        Reviewed by Kent Tamura.
+
+        No new tests. covered by existing tests. Need rebasing some existing tests for Chromimum.
+
+        Remove automatic color adjustment for disabled text control for Chromimum.
+
+        * css/themeChromium.css: Add CSS entries for default style for disabled input and textarea elements.
+        * WebCore/rendering/RenderTextControl.cpp:
+        (disabledTextColor): Removed for PLATFORM(CHROMIUM)
+        (RenderTextControl::adjustInnerTextStyle): Don't call disabledTextColor for Chromium.
+
 2011-12-07  Dmitry Lomov  <dslomov@google.com>
 

trunk/Source/WebCore/css/themeChromium.css

@@ -71 +71 @@
     color: #444;
 }
+
+input:disabled, isindex:disabled, textarea:disabled {
+    color: #545454; /* Color::light() for #000000. See RenderTextControl.cpp:disabledTextColor */
+}
+

trunk/Source/WebCore/rendering/RenderTextControl.cpp

@@ -35 +35 @@
 namespace WebCore {
 
+#if !PLATFORM(CHROMIUM)
 // Value chosen by observation.  This can be tweaked.
 static const int minColorContrastValue = 1300;
@@ -58 +59 @@
     return disabledColor;
 }
+#endif
 
 RenderTextControl::RenderTextControl(Node* node)
@@ -120 +122 @@
 
     bool disabled = updateUserModifyProperty(node(), textBlockStyle);
-    if (disabled)
+    if (disabled) {
+#if PLATFORM(CHROMIUM)
+        textBlockStyle->setColor(textBlockStyle->visitedDependentColor(CSSPropertyColor));
+#else
         textBlockStyle->setColor(disabledTextColor(textBlockStyle->visitedDependentColor(CSSPropertyColor), startStyle->visitedDependentColor(CSSPropertyBackgroundColor)));
+#endif
+    }
 }