Changeset 19698 in webkit

Timestamp:

Feb 18, 2007 4:26:32 PM (17 years ago)

Author:

aroben

Message:

Reviewed by Hyatt.

A little preparation for <rdar://problem/5006872>.

• platform/PopupMenu.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/PopupMenu.h (modified) (7 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-18  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Hyatt.
+
+        A little preparation for <rdar://problem/5006872>.
+
+        * platform/PopupMenu.h:
+
 2007-02-18  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/platform/PopupMenu.h

@@ -36 +36 @@
 #endif
 #elif PLATFORM(WIN)
+#include "ScrollBar.h"
+#include <wtf/RefPtr.h>
 typedef struct HWND__* HWND;
 typedef struct HDC__* HDC;
@@ -48 +50 @@
 
 class FrameView;
+class PlatformScrollbar;
 
-class PopupMenu : public Shared<PopupMenu> {
+class PopupMenu : public Shared<PopupMenu>
+#if PLATFORM(WIN)
+                , private ScrollbarClient
+#endif
+{
 public:
     static PassRefPtr<PopupMenu> create(PopupMenuClient* client) { return new PopupMenu(client); }
@@ -64 +71 @@
 
 #if PLATFORM(WIN)
+    PlatformScrollbar* scrollBar() const { return m_scrollBar.get(); }
+
     bool up(unsigned lines = 1);
     bool down(unsigned lines = 1);
@@ -71 +80 @@
     IntRect clientRect() const;
 
-    int listIndexAtPoint(const IntPoint& point) { return (point.y() + m_scrollOffset) / m_itemHeight; }
+    int visibleItems() const;
+
+    int listIndexAtPoint(const IntPoint&) const;
 
     bool setFocusedIndex(int index, bool hotTracking = false, bool fireOnChange = false);
@@ -88 +99 @@
     int scrollOffset() const { return m_scrollOffset; }
 
-    bool scrollTo(int);
     bool scrollToRevealSelection();
 
@@ -98 +108 @@
 protected:
     PopupMenu(PopupMenuClient* client);
+
+#if PLATFORM(WIN)
+    // ScrollBarClient
+    virtual void valueChanged(Scrollbar*);
+    virtual IntRect windowClipRect() const;
+#endif
     
 private:
@@ -116 +132 @@
     void invalidateItem(int index);
 
+    RefPtr<PlatformScrollbar> m_scrollBar;
     HWND m_popup;
     HDC m_DC;