Remove FramelessScrollView.

Source/web/PopupListBox.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/PlatformScreen.h"
 #include "platform/PlatformTouchEvent.h"
 #include "platform/PlatformWheelEvent.h"
 #include "platform/PopupMenuClient.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/Font.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontSelector.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsContext.h"
-#include "platform/scroll/FramelessScrollViewClient.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "platform/text/StringTruncator.h"
 #include "platform/text/TextRun.h"
 #include "web/PopupContainer.h"
+#include "web/PopupContainerClient.h"
 #include "web/PopupMenuChromium.h"
 #include "wtf/ASCIICType.h"
 #include "wtf/CurrentTime.h"
 #include <limits>
 
 namespace blink {
 
 using namespace WTF::Unicode;
 
 const int PopupListBox::defaultMaxHeight = 500;
 static const int maxVisibleRows = 20;
 static const int minEndOfLinePadding = 2;
 static const TimeStamp typeAheadTimeoutMs = 1000;
 
-PopupListBox::PopupListBox(PopupMenuClient* client, bool deviceSupportsTouch)
+PopupListBox::PopupListBox(PopupMenuClient* client, bool deviceSupportsTouch, PopupContainer* container)
     : m_deviceSupportsTouch(deviceSupportsTouch)
     , m_originalIndex(0)
     , m_selectedIndex(0)
     , m_acceptedIndexOnAbandon(-1)
     , m_visibleRows(0)
     , m_baseWidth(0)
     , m_maxHeight(defaultMaxHeight)
     , m_popupClient(client)
     , m_repeatingChar(0)
     , m_lastCharTime(0)
     , m_maxWindowWidth(std::numeric_limits<int>::max())
+    , m_container(container)
 {
     setScrollbarModes(ScrollbarAlwaysOff, ScrollbarAlwaysOff);
 }
 
+PopupListBox::~PopupListBox()
+{
+    clear();
+
+    setHasHorizontalScrollbar(false);
+    setHasVerticalScrollbar(false);
+}
+
 bool PopupListBox::handleMouseDownEvent(const PlatformMouseEvent& event)
 {
     Scrollbar* scrollbar = scrollbarAtPoint(event.position());
     if (scrollbar) {
         m_capturingScrollbar = scrollbar;
         m_capturingScrollbar->mouseDown(event);
         return true;
     }
 
     if (!isPointInBounds(event.position()))
@@ skipping 365 matching lines @@
     if (rightAligned)
         textX += maxWidth - itemFont.width(textRun);
 
     // Draw the item text.
     int textY = rowRect.y() + itemFont.fontMetrics().ascent() + (rowRect.height() - itemFont.fontMetrics().height()) / 2;
     TextRunPaintInfo textRunPaintInfo(textRun);
     textRunPaintInfo.bounds = rowRect;
     gc->drawBidiText(itemFont, textRunPaintInfo, IntPoint(textX, textY));
 }
 
-Font PopupListBox::getRowFont(int rowIndex)
+Font PopupListBox::getRowFont(int rowIndex) const
 {
     Font itemFont = m_popupClient->itemStyle(rowIndex).font();
     if (m_popupClient->itemIsLabel(rowIndex)) {
         // Bold-ify labels (ie, an <optgroup> heading).
         FontDescription d = itemFont.fontDescription();
         d.setWeight(FontWeightBold);
         Font font(d);
         font.update(nullptr);
         return font;
     }
@@ skipping 80 matching lines @@
         m_popupClient->selectionChanged(m_selectedIndex);
     } else if (!isSelectable)
         clearSelection();
 }
 
 void PopupListBox::setOriginalIndex(int index)
 {
     m_originalIndex = m_selectedIndex = index;
 }
 
-int PopupListBox::getRowHeight(int index)
+int PopupListBox::getRowHeight(int index) const
 {
     int minimumHeight = m_deviceSupportsTouch ? optionRowHeightForTouch : minRowHeight;
 
     if (index < 0 || m_popupClient->itemStyle(index).isDisplayNone())
         return minimumHeight;
 
     // Separator row height is the same size as itself.
     if (m_popupClient->itemIsSeparator(index))
         return max(separatorHeight, minimumHeight);
 
     int fontHeight = getRowFont(index).fontMetrics().height();
     return max(fontHeight, minimumHeight);
 }
 
 IntRect PopupListBox::getRowBounds(int index)
 {
     if (index < 0)
         return IntRect(0, 0, visibleWidth(), getRowHeight(index));
 
     return IntRect(0, m_items[index]->yOffset, visibleWidth(), getRowHeight(index));
 }
 
 void PopupListBox::invalidateRow(int index)
 {
     if (index < 0)
         return;
 
-    // Invalidate in the window contents, as FramelessScrollView::invalidateRect
-    // paints in the window coordinates.
+    // Invalidate in the window contents, as invalidateRect paints in the window coordinates.
     IntRect clipRect = contentsToWindow(getRowBounds(index));
     if (shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar() && !verticalScrollbar()->isOverlayScrollbar())
         clipRect.move(verticalScrollbar()->width(), 0);
     invalidateRect(clipRect);
 }
 
 void PopupListBox::scrollToRevealRow(int index)
 {
     if (index < 0)
         return;
@@ skipping 65 matching lines @@
     // Select the new index, and ensure its visible. We do this regardless of
     // whether the selection changed to ensure keyboard events always bring the
     // selection into view.
     selectIndex(targetIndex);
     scrollToRevealSelection();
 }
 
 void PopupListBox::hidePopup()
 {
     if (parent()) {
-        PopupContainer* container = static_cast<PopupContainer*>(parent());
-        if (container->client())
-            container->client()->popupClosed(container);
-        container->notifyPopupHidden();
+        if (m_container->client())
+            m_container->client()->popupClosed(m_container);
+        m_container->notifyPopupHidden();
     }
 
     if (m_popupClient)
         m_popupClient->popupDidHide();
 }
 
 void PopupListBox::updateFromElement()
 {
     clear();
 
@@ skipping 127 matching lines @@
 bool PopupListBox::isPointInBounds(const IntPoint& point)
 {
     return numItems() && IntRect(0, 0, width(), height()).contains(point);
 }
 
 int PopupListBox::popupContentHeight() const
 {
     return height();
 }
 
+void PopupListBox::invalidateRect(const IntRect& rect)
+{
+    if (HostWindow* h = hostWindow())
+        h->invalidateContentsAndRootView(rect);
+}
+
+IntRect PopupListBox::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) const
+{
+    IntRect clipRect = visibleContentRect(scrollbarInclusion);
+    if (shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar() && !verticalScrollbar()->isOverlayScrollbar())
+        clipRect.move(verticalScrollbar()->width(), 0);
+    return contentsToWindow(clipRect);
+}
+
+void PopupListBox::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
+{
+    // Add in our offset within the ScrollView.
+    IntRect dirtyRect = rect;
+    dirtyRect.move(scrollbar->x(), scrollbar->y());
+    invalidateRect(dirtyRect);
+}
+
+bool PopupListBox::isActive() const
+{
+    // FIXME
+    return true;
+}
+
+bool PopupListBox::scrollbarsCanBeActive() const
+{
+    return isActive();
+}
+
+IntRect PopupListBox::scrollableAreaBoundingBox() const
+{
+    return windowClipRect(IncludeScrollbars);
+}
+
 } // namespace blink