Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: Source/WebCore/css/StyleResolver.cpp

Issue 10453112: Merge 118772 - REGRESSION(r109729): The optgroup element's "disabled" attribute has no effect to re… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/css/SelectorChecker.cpp ('k') | Source/WebCore/html/HTMLOptGroupElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/css/StyleResolver.cpp
===================================================================
--- Source/WebCore/css/StyleResolver.cpp (revision 119185)
+++ Source/WebCore/css/StyleResolver.cpp (working copy)
@@ -1373,6 +1373,9 @@
if (element->hasTagName(optionTag))
return false;
+ if (element->hasTagName(optgroupTag) && m_element->disabled() != element->disabled())
+ return false;
+
bool isControl = element->isFormControlElement();
if (isControl != m_element->isFormControlElement())
« no previous file with comments | « Source/WebCore/css/SelectorChecker.cpp ('k') | Source/WebCore/html/HTMLOptGroupElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698