Remove FramelessScrollView.

Source/web/PopupListBox.h

 /*
  * Copyright (c) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef PopupListBox_h
 #define PopupListBox_h
 
 #include "core/dom/Element.h"
-#include "platform/scroll/FramelessScrollView.h"
+#include "platform/scroll/ScrollView.h"
 #include "platform/text/TextDirection.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class Font;
 class GraphicsContext;
 class IntRect;
 class PlatformKeyboardEvent;
 class PlatformMouseEvent;
 class PlatformGestureEvent;
 class PlatformTouchEvent;
 class PlatformWheelEvent;
+class PopupContainer;
 class PopupMenuClient;
 typedef unsigned long long TimeStamp;
 
 class PopupContent {
 public:
     virtual void layout() = 0;
     virtual void setMaxHeight(int) = 0;
     virtual void setMaxWidthAndLayout(int) = 0;
     virtual int popupContentHeight() const = 0;
     virtual ~PopupContent() { };
@@ skipping 16 matching lines @@
     }
     String label;
     Type type;
     int yOffset; // y offset of this item, relative to the top of the popup.
     TextDirection textDirection;
     bool hasTextDirectionOverride;
     bool enabled;
     bool displayNone;
 };
 
-// This class uses WebCore code to paint and handle events for a drop-down list
-// box ("combobox" on Windows).
-class PopupListBox FINAL : public FramelessScrollView, public PopupContent {
+// This class manages the scrollable content inside a <select> popup.
+class PopupListBox FINAL : public ScrollView, public PopupContent {
 public:
-    static PassRefPtr<PopupListBox> create(PopupMenuClient* client, bool deviceSupportsTouch)
+    static PassRefPtr<PopupListBox> create(PopupMenuClient* client, bool deviceSupportsTouch, PopupContainer* container)
     {
-        return adoptRef(new PopupListBox(client, deviceSupportsTouch));
+        return adoptRef(new PopupListBox(client, deviceSupportsTouch, container));
     }
 
-    // FramelessScrollView
-    virtual void paint(GraphicsContext*, const IntRect&) OVERRIDE;
-    virtual bool handleMouseDownEvent(const PlatformMouseEvent&) OVERRIDE;
-    virtual bool handleMouseMoveEvent(const PlatformMouseEvent&) OVERRIDE;
-    virtual bool handleMouseReleaseEvent(const PlatformMouseEvent&) OVERRIDE;
-    virtual bool handleWheelEvent(const PlatformWheelEvent&) OVERRIDE;
-    virtual bool handleKeyEvent(const PlatformKeyboardEvent&) OVERRIDE;
-    virtual bool handleTouchEvent(const PlatformTouchEvent&) OVERRIDE;
-    virtual bool handleGestureEvent(const PlatformGestureEvent&) OVERRIDE;
+    // Widget
+    virtual void invalidateRect(const IntRect&) OVERRIDE;
+
+    // ScrollableArea
+    virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) OVERRIDE;
+    virtual bool isActive() const OVERRIDE;
+    virtual bool scrollbarsCanBeActive() const OVERRIDE;
+    virtual IntRect scrollableAreaBoundingBox() const OVERRIDE;
 
     // ScrollView
+    virtual void paint(GraphicsContext*, const IntRect&) OVERRIDE;
     virtual HostWindow* hostWindow() const OVERRIDE;
     virtual bool shouldPlaceVerticalScrollbarOnLeft() const OVERRIDE;
+    virtual IntRect windowClipRect(IncludeScrollbarsInRect = ExcludeScrollbars) const OVERRIDE;
 
     // PopupListBox methods
 
+    virtual bool handleMouseDownEvent(const PlatformMouseEvent&);
+    virtual bool handleMouseMoveEvent(const PlatformMouseEvent&);
+    virtual bool handleMouseReleaseEvent(const PlatformMouseEvent&);
+    virtual bool handleWheelEvent(const PlatformWheelEvent&);
+    virtual bool handleKeyEvent(const PlatformKeyboardEvent&);
+    virtual bool handleTouchEvent(const PlatformTouchEvent&);
+    virtual bool handleGestureEvent(const PlatformGestureEvent&);
+
     // Closes the popup
     void abandon();
 
     // Updates our internal list to match the client.
     void updateFromElement();
 
     // Frees any allocated resources used in a particular popup session.
     void clear();
 
     // Sets the index of the option that is displayed in the <select> widget in the page
@@ skipping 14 matching lines @@
 
     void setBaseWidth(int width) { m_baseWidth = std::min(m_maxWindowWidth, width); }
 
     // Computes the size of widget and children.
     virtual void layout() OVERRIDE;
 
     // Returns whether the popup wants to process events for the passed key.
     bool isInterestedInEventForKey(int keyCode);
 
     // Gets the height of a row.
-    int getRowHeight(int index);
+    int getRowHeight(int index) const;
 
     int getRowBaseWidth(int index);
 
     virtual void setMaxHeight(int maxHeight) OVERRIDE { m_maxHeight = maxHeight; }
 
     void setMaxWidth(int maxWidth) { m_maxWindowWidth = maxWidth; }
 
     virtual void setMaxWidthAndLayout(int) OVERRIDE;
 
     void disconnectClient() { m_popupClient = 0; }
 
     const Vector<PopupItem*>& items() const { return m_items; }
 
     virtual int popupContentHeight() const OVERRIDE;
 
     static const int defaultMaxHeight;
 
+protected:
+    // ScrollView
+    virtual void paintContents(GraphicsContext*, const IntRect&) OVERRIDE { }
+    virtual void scrollbarExistenceDidChange() OVERRIDE { }
+
 private:
     friend class PopupContainer;
     friend class RefCounted<PopupListBox>;
 
-    PopupListBox(PopupMenuClient*, bool deviceSupportsTouch);
-
-    virtual ~PopupListBox()
-    {
-        clear();
-    }
+    PopupListBox(PopupMenuClient*, bool deviceSupportsTouch, PopupContainer*);
+    virtual ~PopupListBox();
 
     // Hides the popup. Other classes should not call this. Use abandon instead.
     void hidePopup();
 
     // Returns true if the selection can be changed to index.
     // Disabled items, or labels cannot be selected.
     bool isSelectableItem(int index);
 
     // Select an index in the list, scrolling if necessary.
     void selectIndex(int index);
@@ skipping 22 matching lines @@
     // Paint an individual row
     void paintRow(GraphicsContext*, const IntRect&, int rowIndex);
 
     // Test if the given point is within the bounds of the popup window.
     bool isPointInBounds(const IntPoint&);
 
     // Called when the user presses a text key. Does a prefix-search of the items.
     void typeAheadFind(const PlatformKeyboardEvent&);
 
     // Returns the font to use for the given row
-    Font getRowFont(int index);
+    Font getRowFont(int index) const;
 
     // Moves the selection down/up one item, taking care of looping back to the
     // first/last element if m_loopSelectionNavigation is true.
     void selectPreviousRow();
     void selectNextRow();
 
     // If the device is a touch screen we increase the height of menu items
     // to make it easier to unambiguously touch them.
     bool m_deviceSupportsTouch;
 
@@ skipping 43 matching lines @@
     UChar m_repeatingChar;
 
     // The last time the user hit a key. Used for typeAheadFind.
     TimeStamp m_lastCharTime;
 
     // If width exeeds screen width, we have to clip it.
     int m_maxWindowWidth;
 
     // To forward last mouse release event.
     RefPtrWillBePersistent<Element> m_focusedElement;
+
+    PopupContainer* m_container;
 };
 
 } // namespace blink
 
 #endif