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

1 files changed, 12 insertions, 6 deletions

diff --git a/WebCore/platform/PopupMenuClient.h b/WebCore/platform/PopupMenuClient.h
index 81be90e..0718b8c 100644
--- a/WebCore/platform/PopupMenuClient.h
+++ b/WebCore/platform/PopupMenuClient.h
@@ -21,13 +21,17 @@
 #ifndef PopupMenuClient_h
 #define PopupMenuClient_h
 
+#include "PopupMenuStyle.h"
+#include "ScrollTypes.h"
+
 namespace WebCore {
 
 class Color;
-class Document;
 class FontSelector;
+class HostWindow;
+class Scrollbar;
+class ScrollbarClient;
 class String;
-class RenderStyle;
 
 class PopupMenuClient {
 public:
@@ -36,10 +40,8 @@ public:
 
     virtual String itemText(unsigned listIndex) const = 0;
     virtual bool itemIsEnabled(unsigned listIndex) const = 0;
-    virtual Color itemBackgroundColor(unsigned listIndex) const = 0;
-    virtual RenderStyle* itemStyle(unsigned listIndex) const = 0;
-    virtual RenderStyle* clientStyle() const = 0;
-    virtual Document* clientDocument() const = 0;
+    virtual PopupMenuStyle itemStyle(unsigned listIndex) const = 0;
+    virtual PopupMenuStyle menuStyle() const = 0;
     virtual int clientInsetLeft() const = 0;
     virtual int clientInsetRight() const = 0;
     virtual int clientPaddingLeft() const = 0;
@@ -53,7 +55,11 @@ public:
     virtual bool shouldPopOver() const = 0;
     virtual bool valueShouldChangeOnHotTrack() const = 0;
     virtual void setTextFromItem(unsigned listIndex) = 0;
+    
     virtual FontSelector* fontSelector() const = 0;
+    virtual HostWindow* hostWindow() const = 0;
+    
+    virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize) = 0;
 };
 
 }