Remove FramelessScrollView.

Source/web/PopupContainer.cpp

 /*
  * 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 29 matching lines @@
 #include "platform/PlatformGestureEvent.h"
 #include "platform/PlatformKeyboardEvent.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/PlatformScreen.h"
 #include "platform/PlatformTouchEvent.h"
 #include "platform/PlatformWheelEvent.h"
 #include "platform/PopupMenuClient.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsContext.h"
-#include "platform/scroll/FramelessScrollViewClient.h"
 #include "public/web/WebPopupMenuInfo.h"
 #include "public/web/WebPopupType.h"
 #include "public/web/WebViewClient.h"
+#include "web/PopupContainerClient.h"
 #include "web/WebPopupMenuImpl.h"
 #include "web/WebViewImpl.h"
 #include <limits>
 
 namespace blink {
 
 static const int borderSize = 1;
 
-static PlatformMouseEvent constructRelativeMouseEvent(const PlatformMouseEvent& e, FramelessScrollView* parent, FramelessScrollView* child)
+static PlatformMouseEvent constructRelativeMouseEvent(const PlatformMouseEvent& e, PopupContainer* parent, PopupListBox* child)
 {
     IntPoint pos = parent->convertSelfToChild(child, e.position());
 
     // FIXME: This is a horrible hack since PlatformMouseEvent has no setters for x/y.
     PlatformMouseEvent relativeEvent = e;
     IntPoint& relativePos = const_cast<IntPoint&>(relativeEvent.position());
     relativePos.setX(pos.x());
     relativePos.setY(pos.y());
     return relativeEvent;
 }
 
-static PlatformWheelEvent constructRelativeWheelEvent(const PlatformWheelEvent& e, FramelessScrollView* parent, FramelessScrollView* child)
+static PlatformWheelEvent constructRelativeWheelEvent(const PlatformWheelEvent& e, PopupContainer* parent, PopupListBox* child)
 {
     IntPoint pos = parent->convertSelfToChild(child, e.position());
 
     // FIXME: This is a horrible hack since PlatformWheelEvent has no setters for x/y.
     PlatformWheelEvent relativeEvent = e;
     IntPoint& relativePos = const_cast<IntPoint&>(relativeEvent.position());
     relativePos.setX(pos.x());
     relativePos.setY(pos.y());
     return relativeEvent;
 }
 
 // static
 PassRefPtr<PopupContainer> PopupContainer::create(PopupMenuClient* client, bool deviceSupportsTouch)
 {
     return adoptRef(new PopupContainer(client, deviceSupportsTouch));
 }
 
 PopupContainer::PopupContainer(PopupMenuClient* client, bool deviceSupportsTouch)
-    : m_listBox(PopupListBox::create(client, deviceSupportsTouch))
+    : m_listBox(PopupListBox::create(client, deviceSupportsTouch, this))
     , m_popupOpen(false)
+    , m_client(0)
 {
-    setScrollbarModes(ScrollbarAlwaysOff, ScrollbarAlwaysOff);
 }
 
 PopupContainer::~PopupContainer()
 {
-    if (m_listBox && m_listBox->parent())
-        removeChild(m_listBox.get());
+    if (m_listBox->parent())
+        m_listBox->setParent(0);
 }
 
 IntRect PopupContainer::layoutAndCalculateWidgetRectInternal(IntRect widgetRectInScreen, int targetControlHeight, const FloatRect& windowRect, const FloatRect& screen, bool isRTL, const int rtlOffset, const int verticalOffset, const IntSize& transformOffset, PopupContent* listBox, bool& needToResizeView)
 {
     ASSERT(listBox);
     if (windowRect.x() >= screen.x() && windowRect.maxX() <= screen.maxX() && (widgetRectInScreen.x() < screen.x() || widgetRectInScreen.maxX() > screen.maxX())) {
         // First, inverse the popup alignment if it does not fit the screen -
         // this might fix things (or make them better).
         IntRect inverseWidgetRectInScreen = widgetRectInScreen;
         inverseWidgetRectInScreen.setX(inverseWidgetRectInScreen.x() + (isRTL ? -rtlOffset : rtlOffset));
@@ skipping 92 matching lines @@
     widgetRectInScreen = layoutAndCalculateWidgetRectInternal(widgetRectInScreen, targetControlHeight, windowRect, screen, isRTL, rtlOffset, verticalOffset, transformOffset, m_listBox.get(), needToResizeView);
     if (needToResizeView)
         fitToListBox();
 
     return widgetRectInScreen;
 }
 
 void PopupContainer::showPopup(FrameView* view)
 {
     m_frameView = view;
-    listBox()->m_focusedElement = m_frameView->frame().document()->focusedElement();
+    m_listBox->m_focusedElement = m_frameView->frame().document()->focusedElement();
 
     IntSize transformOffset(m_controlPosition.p4().x() - m_controlPosition.p1().x(), m_controlPosition.p4().y() - m_controlPosition.p1().y() - m_controlSize.height());
     popupOpened(layoutAndCalculateWidgetRect(m_controlSize.height(), transformOffset, roundedIntPoint(m_controlPosition.p4())));
     m_popupOpen = true;
 
     if (!m_listBox->parent())
-        addChild(m_listBox.get());
+        m_listBox->setParent(this);
 
     // Enable scrollbars after the listbox is inserted into the hierarchy,
     // so it has a proper WidgetClient.
     m_listBox->setVerticalScrollbarMode(ScrollbarAuto);
 
     m_listBox->scrollToRevealSelection();
 
     invalidate();
 }
 
 void PopupContainer::hidePopup()
 {
-    listBox()->abandon();
+    m_listBox->abandon();
 }
 
 void PopupContainer::notifyPopupHidden()
 {
     if (!m_popupOpen)
         return;
     m_popupOpen = false;
     WebViewImpl::fromPage(m_frameView->frame().page())->popupClosed(this);
 }
 
@@ skipping 125 matching lines @@
 ChromeClient& PopupContainer::chromeClient()
 {
     return m_frameView->frame().page()->chrome().client();
 }
 
 void PopupContainer::showInRect(const FloatQuad& controlPosition, const IntSize& controlSize, FrameView* v, int index)
 {
     // The controlSize is the size of the select box. It's usually larger than
     // we need. Subtract border size so that usually the container will be
     // displayed exactly the same width as the select box.
-    listBox()->setBaseWidth(max(controlSize.width() - borderSize * 2, 0));
+    m_listBox->setBaseWidth(max(controlSize.width() - borderSize * 2, 0));
 
-    listBox()->updateFromElement();
+    m_listBox->updateFromElement();
 
     // We set the selected item in updateFromElement(), and disregard the
     // index passed into this function (same as Webkit's PopupMenuWin.cpp)
     // FIXME: make sure this is correct, and add an assertion.
     // ASSERT(popupWindow(popup)->listBox()->selectedIndex() == index);
 
     // Save and convert the controlPosition to main window coords. Each point is converted separately
     // to window coordinates because the control could be in a transformed webview and then each point
     // would be transformed by a different delta.
     m_controlPosition.setP1(v->contentsToWindow(IntPoint(controlPosition.p1().x(), controlPosition.p1().y())));
     m_controlPosition.setP2(v->contentsToWindow(IntPoint(controlPosition.p2().x(), controlPosition.p2().y())));
     m_controlPosition.setP3(v->contentsToWindow(IntPoint(controlPosition.p3().x(), controlPosition.p3().y())));
     m_controlPosition.setP4(v->contentsToWindow(IntPoint(controlPosition.p4().x(), controlPosition.p4().y())));
 
     m_controlSize = controlSize;
 
     // Position at (0, 0) since the frameRect().location() is relative to the
     // parent WebWidget.
     setFrameRect(IntRect(IntPoint(), controlSize));
     showPopup(v);
 }
 
 IntRect PopupContainer::refresh(const IntRect& targetControlRect)
 {
-    listBox()->setBaseWidth(max(m_controlSize.width() - borderSize * 2, 0));
-    listBox()->updateFromElement();
+    m_listBox->setBaseWidth(max(m_controlSize.width() - borderSize * 2, 0));
+    m_listBox->updateFromElement();
 
     IntPoint locationInWindow = m_frameView->contentsToWindow(targetControlRect.location());
 
     // Move it below the select widget.
     locationInWindow.move(0, targetControlRect.height());
 
     IntRect widgetRectInScreen = layoutAndCalculateWidgetRect(targetControlRect.height(), IntSize(), locationInWindow);
 
     // Reset the size (which can be set to the PopupListBox size in
     // layoutAndGetRTLOffset(), exceeding the available widget rectangle.)
@@ skipping 33 matching lines @@
 const WTF::Vector<PopupItem*>& PopupContainer:: popupData() const
 {
     return m_listBox->items();
 }
 
 String PopupContainer::getSelectedItemToolTip()
 {
     // We cannot use m_popupClient->selectedIndex() to choose tooltip message,
     // because the selectedIndex() might return final selected index, not
     // hovering selection.
-    return listBox()->m_popupClient->itemToolTip(listBox()->m_selectedIndex);
+    return m_listBox->m_popupClient->itemToolTip(m_listBox->m_selectedIndex);
 }
 
 void PopupContainer::popupOpened(const IntRect& bounds)
 {
     WebViewImpl* webView = WebViewImpl::fromPage(m_frameView->frame().page());
     if (!webView->client())
         return;
 
     WebWidget* webwidget = webView->client()->createPopupMenu(WebPopupTypeSelect);
     if (!webwidget)
@@ skipping 33 matching lines @@
         }
     }
 
     info->itemHeight = menuItemHeight();
     info->itemFontSize = menuItemFontSize();
     info->selectedIndex = selectedIndex();
     info->items.swap(outputItems);
     info->rightAligned = menuStyle().textDirection() == RTL;
 }
 
+void PopupContainer::invalidateRect(const IntRect& rect)
+{
+    if (HostWindow* h = hostWindow())
+        h->invalidateContentsAndRootView(rect);
+}
+
+HostWindow* PopupContainer::hostWindow() const
+{
+    return const_cast<PopupContainerClient*>(m_client);
+}
+
 } // namespace blink