Reviewed by Kevin Decker.
authoradele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Mar 2007 06:18:08 +0000 (06:18 +0000)
committeradele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Mar 2007 06:18:08 +0000 (06:18 +0000)
        Fix for <rdar://problem/4926179> Text in menulist control should never update if menu is open

        * rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::updateFromElement):
          Only setTextFromOption if the menu isn't visible.

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

WebCore/ChangeLog
WebCore/rendering/RenderMenuList.cpp

index 2108b86..4170a45 100644 (file)
@@ -1,3 +1,12 @@
+2007-03-15  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Kevin Decker.
+
+        Fix for <rdar://problem/4926179> Text in menulist control should never update if menu is open
+
+        * rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::updateFromElement):
+          Only setTextFromOption if the menu isn't visible.
+
 2007-03-15  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Oliver
index c0d6712..103a94c 100644 (file)
@@ -140,10 +140,10 @@ void RenderMenuList::updateFromElement()
         m_optionsChanged = false;
     }
 
-    setTextFromOption(static_cast<HTMLSelectElement*>(node())->selectedIndex());
-
     if (m_popupIsVisible)
         m_popup->updateFromElement();
+    else
+        setTextFromOption(static_cast<HTMLSelectElement*>(node())->selectedIndex());
 }
 
 void RenderMenuList::setTextFromOption(int optionIndex)