Clean up vestiges of ScrollView.

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 266 matching lines @@
         abandon();
         // Return false so the TAB key event is propagated to the page.
         return false;
     }
 
     return true;
 }
 
 HostWindow* PopupListBox::hostWindow() const
 {
-    // Our parent is the root ScrollView, so it is the one that has a
+    // Our parent is the root FrameView, so it is the one that has a
     // HostWindow. FrameView::hostWindow() works similarly.
     return parent() ? parent()->hostWindow() : 0;
 }
 
 bool PopupListBox::shouldPlaceVerticalScrollbarOnLeft() const
 {
     return m_popupClient->menuStyle().textDirection() == RTL;
 }
 
 // From HTMLSelectElement.cpp
@@ skipping 561 matching lines @@
 IntRect PopupListBox::windowClipRect() const
 {
     IntRect clipRect = visibleContentRect();
     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.
+    // Add in our offset within the FrameView.
     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();
 }
 
-// FIXME: The following methods are based on code in ScrollView, with
+// FIXME: The following methods are based on code in FrameView, with
 // simplifications for the constraints of PopupListBox (e.g. only vertical
 // scrollbar, not horizontal). This functionality should be moved into
 // ScrollableArea after http://crbug.com/417782 is fixed.
 
 void PopupListBox::setHasVerticalScrollbar(bool hasBar)
 {
     if (hasBar && !m_verticalScrollbar) {
         m_verticalScrollbar = Scrollbar::create(this, VerticalScrollbar, RegularScrollbar);
         m_verticalScrollbar->setParent(this);
         didAddScrollbar(m_verticalScrollbar.get(), VerticalScrollbar);
@@ skipping 33 matching lines @@
         return;
 
     Widget::setFrameRect(newRect);
     updateScrollbars(scrollPosition());
     // NOTE: We do not need to call m_verticalScrollbar->frameRectsChanged as
     // Scrollbar does not implement it.
 }
 
 IntRect PopupListBox::visibleContentRect(IncludeScrollbarsInRect scrollbarInclusion) const
 {
-    // NOTE: Unlike ScrollView we do not need to incorporate any scaling factor,
+    // NOTE: Unlike FrameView we do not need to incorporate any scaling factor,
     // and there is only one scrollbar to exclude.
     IntSize size = frameRect().size();
     Scrollbar* verticalBar = verticalScrollbar();
     if (scrollbarInclusion == ExcludeScrollbars && verticalBar && !verticalBar->isOverlayScrollbar()) {
         size.setWidth(std::max(0, size.width() - verticalBar->width()));
     }
     return IntRect(m_scrollOffset, size);
 }
 
 void PopupListBox::updateScrollbars(const IntPoint& desiredOffset)
@@ skipping 85 matching lines @@
     maximumOffset.clampNegativeToZero();
     return maximumOffset;
 }
 
 IntPoint PopupListBox::minimumScrollPosition() const
 {
     return IntPoint(-scrollOrigin().x(), -scrollOrigin().y());
 }
 
 } // namespace blink