Title: [103616] trunk/Source/WebCore
Revision
103616
Author
[email protected]
Date
2011-12-23 02:20:39 -0800 (Fri, 23 Dec 2011)

Log Message

REGRESSION (r97533): Optgroup label is not disabled
https://bugs.webkit.org/show_bug.cgi?id=74869

Reviewed by Alexey Proskuryakov.

* rendering/RenderMenuList.cpp:
(WebCore::RenderMenuList::itemIsEnabled): Added back a line of code that was
accidentally deleted as part of the refactoring in r97533. This line of code
ensures that any items that are not option elements are disabled.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (103615 => 103616)


--- trunk/Source/WebCore/ChangeLog	2011-12-23 10:06:59 UTC (rev 103615)
+++ trunk/Source/WebCore/ChangeLog	2011-12-23 10:20:39 UTC (rev 103616)
@@ -1,3 +1,15 @@
+2011-12-23  Darin Adler  <[email protected]>
+
+        REGRESSION (r97533): Optgroup label is not disabled
+        https://bugs.webkit.org/show_bug.cgi?id=74869
+
+        Reviewed by Alexey Proskuryakov.
+
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::itemIsEnabled): Added back a line of code that was
+        accidentally deleted as part of the refactoring in r97533. This line of code
+        ensures that any items that are not option elements are disabled.
+
 2011-12-19  Alexander Pavlov  <[email protected]>
 
         Web Inspector: Add CSSStyleSelector instrumentation calls towards implementing a CSS selector profiler

Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (103615 => 103616)


--- trunk/Source/WebCore/rendering/RenderMenuList.cpp	2011-12-23 10:06:59 UTC (rev 103615)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp	2011-12-23 10:20:39 UTC (rev 103616)
@@ -417,6 +417,8 @@
     if (listIndex >= listItems.size())
         return false;
     HTMLElement* element = listItems[listIndex];
+    if (!element->hasTagName(optionTag))
+        return false;
 
     bool groupEnabled = true;
     if (Element* parentElement = element->parentElement()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to