Code drop from //branches/cupcake/...@124589

1 files changed, 12 insertions, 6 deletions

diff --git a/WebCore/rendering/RenderMenuList.h b/WebCore/rendering/RenderMenuList.h
index c0c4047..f31ef32 100644
--- a/WebCore/rendering/RenderMenuList.h
+++ b/WebCore/rendering/RenderMenuList.h
@@ -41,6 +41,8 @@ class RenderMenuList : public RenderFlexibleBox, private PopupMenuClient {
 public:
     RenderMenuList(HTMLSelectElement*);
     ~RenderMenuList();
+    
+    HTMLSelectElement* selectElement();
 
     virtual bool isMenuList() const { return true; }
 
@@ -49,7 +51,6 @@ public:
     virtual bool createsAnonymousWrapper() const { return true; }
     virtual bool canHaveChildren() const { return false; }
 
-    virtual void setStyle(RenderStyle*);
     virtual void updateFromElement();
 
     virtual bool hasControlClip() const { return true; }
@@ -66,15 +67,16 @@ public:
     void setOptionsChanged(bool changed) { m_optionsChanged = changed; }
 
     String text() const;
-    
+
+protected:
+    virtual void styleDidChange(RenderStyle::Diff, const RenderStyle* oldStyle);
+
 private:
     // PopupMenuClient methods
     virtual String itemText(unsigned listIndex) const;
     virtual bool itemIsEnabled(unsigned listIndex) const;
-    virtual Color itemBackgroundColor(unsigned listIndex) const;
-    virtual RenderStyle* itemStyle(unsigned listIndex) const;
-    virtual RenderStyle* clientStyle() const;
-    virtual Document* clientDocument() const;
+    virtual PopupMenuStyle itemStyle(unsigned listIndex) const;
+    virtual PopupMenuStyle menuStyle() const;
     virtual int clientInsetLeft() const;
     virtual int clientInsetRight() const;
     virtual int clientPaddingLeft() const;
@@ -89,9 +91,13 @@ private:
     virtual bool shouldPopOver() const { return !POPUP_MENU_PULLS_DOWN; }
     virtual void valueChanged(unsigned listIndex, bool fireOnChange = true);
     virtual FontSelector* fontSelector() const;
+    virtual HostWindow* hostWindow() const;
+    virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize);
 
     virtual bool hasLineIfEmpty() const { return true; }
 
+    Color itemBackgroundColor(unsigned listIndex) const;
+
     void createInnerBlock();
     void adjustInnerStyle();
     void setText(const String&);