Reviewed by Hyatt.
authoradele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 May 2007 23:15:37 +0000 (23:15 +0000)
committeradele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 May 2007 23:15:37 +0000 (23:15 +0000)
        Update RenderMenuList PopupClient methods to consider style of inner block.

        * rendering/RenderMenuList.cpp:
        (WebCore::RenderMenuList::itemStyle):
        (WebCore::RenderMenuList::clientStyle):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21544 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/rendering/RenderMenuList.cpp

index 31d3a3df15512de0aa2034f1bf9c2bb74d6af6e9..2a21fc333b97cfb39f131aea753e105f31c90029 100644 (file)
@@ -1,3 +1,13 @@
+2007-05-17  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Hyatt.
+
+        Update RenderMenuList PopupClient methods to consider style of inner block.
+
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::itemStyle):
+        (WebCore::RenderMenuList::clientStyle):
+
 2007-05-17  Maciej Stachowiak  <mjs@apple.com>
 
         Not reviewed, emergency test fix.
index 27a5d19ac631cd0efd1dc7e8d64819aa3f2a1819..b783aaf304820e466e6e3c073c5a07d9db5d509c 100644 (file)
@@ -293,12 +293,12 @@ RenderStyle* RenderMenuList::itemStyle(unsigned listIndex) const
     HTMLSelectElement* select = static_cast<HTMLSelectElement*>(node());
     HTMLElement* element = select->listItems()[listIndex];
     
-    return element->renderStyle() ? element->renderStyle() : style();
+    return element->renderStyle() ? element->renderStyle() : clientStyle();
 }
 
 RenderStyle* RenderMenuList::clientStyle() const
 {
-    return style();
+    return m_innerBlock ? m_innerBlock->style() : style();
 }
 
 Document* RenderMenuList::clientDocument() const