Title: [119448] branches/chromium/1132/Source/WebCore/css/SelectorChecker.cpp
Revision
119448
Author
yo...@chromium.org
Date
2012-06-04 18:10:06 -0700 (Mon, 04 Jun 2012)

Log Message

Merge 118891 - REGRESSION(r111497): The "option" element doesn't match CSS pseudo class :enabled
https://bugs.webkit.org/show_bug.cgi?id=87719

Reviewed by Kent Tamura.

Source/WebCore:

This patch added checking of "option" element for CSS pseudo class :enabled as same as
:disabled to selector checker. Before r111497, it was done by using isFormControlElement.
After that revision, HTMLOptionElement was no longer derived from HTMLFormControlElement.

Test: fast/form/select/optgroup-rendering.html

* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOneSelector): Checking element is option element as same
as PseudoDisabled in PseudoEnabled case.

LayoutTests:

* platform/chromium-linux/fast/forms/select/optgroup-rendering-expected.png: Updated. Text color of option element is bule from CSS pseudo class option:enabled.
* platform/chromium/test_expectations.txt: Update comment.


TBR=yo...@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10477022

Modified Paths

Diff

Modified: branches/chromium/1132/Source/WebCore/css/SelectorChecker.cpp (119447 => 119448)


--- branches/chromium/1132/Source/WebCore/css/SelectorChecker.cpp	2012-06-05 01:07:29 UTC (rev 119447)
+++ branches/chromium/1132/Source/WebCore/css/SelectorChecker.cpp	2012-06-05 01:10:06 UTC (rev 119448)
@@ -1043,7 +1043,7 @@
             }
             break;
         case CSSSelector::PseudoEnabled:
-            if (element && (element->isFormControlElement() ||  element->hasTagName(optgroupTag)))
+            if (element && (element->isFormControlElement() || element->hasTagName(optionTag) || element->hasTagName(optgroupTag)))
                 return element->isEnabledFormControl();
             break;
         case CSSSelector::PseudoFullPageMedia:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to