Remove FramelessScrollView.

Source/web/PopupContainer.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.
@@ skipping 16 matching lines @@
  * 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 PopupContainer_h
 #define PopupContainer_h
 
 #include "platform/PopupMenuStyle.h"
 #include "platform/geometry/FloatQuad.h"
-#include "platform/scroll/FramelessScrollView.h"
 #include "web/PopupListBox.h"
 
 namespace blink {
 
 class ChromeClient;
 class FrameView;
+class PopupContainerClient;
 class PopupMenuClient;
 struct WebPopupMenuInfo;
 
-class PopupContainer FINAL : public FramelessScrollView {
+// This class wraps a PopupListBox. It positions the popup, paints the border
+// around it, and forwards input events.
+// FIXME(skobes): This class can probably be combined with PopupListBox.
+class PopupContainer FINAL : public Widget {
 public:
     static PassRefPtr<PopupContainer> create(PopupMenuClient*, bool deviceSupportsTouch);
 
     // Whether a key event should be sent to this popup.
     bool isInterestedInEventForKey(int keyCode);
 
-    // FramelessScrollView
+    // Widget
     virtual void paint(GraphicsContext*, const IntRect&) OVERRIDE;
     virtual void hide() 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;
+    virtual HostWindow* hostWindow() const OVERRIDE;
+    virtual void invalidateRect(const IntRect&) OVERRIDE;
 
     // PopupContainer methods
 
+    bool handleMouseDownEvent(const PlatformMouseEvent&);
+    bool handleMouseMoveEvent(const PlatformMouseEvent&);
+    bool handleMouseReleaseEvent(const PlatformMouseEvent&);
+    bool handleWheelEvent(const PlatformWheelEvent&);
+    bool handleKeyEvent(const PlatformKeyboardEvent&);
+    bool handleTouchEvent(const PlatformTouchEvent&);
+    bool handleGestureEvent(const PlatformGestureEvent&);
+
+    PopupContainerClient* client() const { return m_client; }
+    void setClient(PopupContainerClient* client) { m_client = client; }
+
     // Show the popup
     void showPopup(FrameView*);
 
     // Show the popup in the specified rect for the specified frame.
     // Note: this code was somehow arbitrarily factored-out of the Popup class
     // so WebViewImpl can create a PopupContainer. This method is used for
     // displaying auto complete popup menus on Mac Chromium, and for all
     // popups on other platforms.
     void showInRect(const FloatQuad& controlPosition, const IntSize& controlSize, FrameView*, int index);
 
@@ skipping 25 matching lines @@
 
     // The style of the menu being used.
     PopupMenuStyle menuStyle() const;
 
     // While hovering popup menu window, we want to show tool tip message.
     String getSelectedItemToolTip();
 
     // This is public for testing.
     static IntRect layoutAndCalculateWidgetRectInternal(IntRect widgetRectInScreen, int targetControlHeight, const FloatRect& windowRect, const FloatRect& screen, bool isRTL, const int rtlOffset, const int verticalOffset, const IntSize& transformOffset, PopupContent*, bool& needToResizeView);
 
+    void disconnectClient() { m_listBox->disconnectClient(); }
+
+    void updateFromElement() { m_listBox->updateFromElement(); }
+
 private:
     friend class WTF::RefCounted<PopupContainer>;
 
     PopupContainer(PopupMenuClient*, bool deviceSupportsTouch);
     virtual ~PopupContainer();
 
     // Paint the border.
     void paintBorder(GraphicsContext*, const IntRect&);
 
     // Layout and calculate popup widget size and location and returns it as IntRect.
@@ skipping 20 matching lines @@
     //       m_controlPosition (p1)
     // RTL : If the popup is positioned down it will align with the bottom right
     //       of m_controlPosition (p3)
     //       If the popup is positioned up it will align with the top right of
     //       m_controlPosition (p2)
     FloatQuad m_controlPosition;
     IntSize m_controlSize;
 
     // Whether the popup is currently open.
     bool m_popupOpen;
+
+    PopupContainerClient* m_client;
 };
 
 } // namespace blink
 
 #endif