Clean up vestiges of ScrollView.

Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 331 matching lines @@
     // Autosized font sizes depend on the width of the viewing area.
     bool autosizerNeedsUpdating = false;
     if (newRect.width() != oldRect.width() && m_frame->isMainFrame() && m_frame->settings()->textAutosizingEnabled())
         autosizerNeedsUpdating = true;
 
     setFrameRectInternal(newRect);
 
     updateScrollableAreaSet();
 
     if (autosizerNeedsUpdating) {
-        // This needs to be after the call to ScrollView::setFrameRect, because it reads the new width.
+        // This needs to be after the call to setFrameRectInternal, because it reads the new width.
         if (TextAutosizer* textAutosizer = m_frame->document()->textAutosizer())
             textAutosizer->updatePageInfoInAllFrames();
     }
 
     if (RenderView* renderView = this->renderView()) {
         if (renderView->usesCompositing())
             renderView->compositor()->frameViewDidChangeSize();
     }
 
     viewportConstrainedVisibleContentSizeChanged(newRect.width() != oldRect.width(), newRect.height() != oldRect.height());
@@ skipping 2392 matching lines @@
     IntPoint point = viewPoint;
 
     // Convert from FrameView coords into page ("absolute") coordinates.
     point += IntSize(scrollX(), scrollY());
 
     return roundedIntPoint(renderer.absoluteToLocal(point, UseTransforms));
 }
 
 IntRect FrameView::convertToContainingView(const IntRect& localRect) const
 {
-    if (const FrameView* parentScrollView = toFrameView(parent())) {
-        if (parentScrollView->isFrameView()) {
-            const FrameView* parentView = parentScrollView;
-            // Get our renderer in the parent view
-            RenderPart* renderer = m_frame->ownerRenderer();
-            if (!renderer)
-                return localRect;
+    if (const FrameView* parentView = toFrameView(parent())) {
+        // Get our renderer in the parent view
+        RenderPart* renderer = m_frame->ownerRenderer();
+        if (!renderer)
+            return localRect;
 
-            IntRect rect(localRect);
-            // Add borders and padding??
-            rect.move(renderer->borderLeft() + renderer->paddingLeft(),
-                renderer->borderTop() + renderer->paddingTop());
-            return parentView->convertFromRenderer(*renderer, rect);
-        }
-
-        return Widget::convertToContainingView(localRect);
+        IntRect rect(localRect);
+        // Add borders and padding??
+        rect.move(renderer->borderLeft() + renderer->paddingLeft(),
+            renderer->borderTop() + renderer->paddingTop());
+        return parentView->convertFromRenderer(*renderer, rect);
     }
 
     return localRect;
 }
 
 IntRect FrameView::convertFromContainingView(const IntRect& parentRect) const
 {
-    if (const FrameView* parentScrollView = toFrameView(parent())) {
-        if (parentScrollView->isFrameView()) {
-            const FrameView* parentView = parentScrollView;
+    if (const FrameView* parentView = toFrameView(parent())) {
+        // Get our renderer in the parent view
+        RenderPart* renderer = m_frame->ownerRenderer();
+        if (!renderer)
+            return parentRect;
 
-            // Get our renderer in the parent view
-            RenderPart* renderer = m_frame->ownerRenderer();
-            if (!renderer)
-                return parentRect;
-
-            IntRect rect = parentView->convertToRenderer(*renderer, parentRect);
-            // Subtract borders and padding
-            rect.move(-renderer->borderLeft() - renderer->paddingLeft(),
-                      -renderer->borderTop() - renderer->paddingTop());
-            return rect;
-        }
-
-        return Widget::convertFromContainingView(parentRect);
+        IntRect rect = parentView->convertToRenderer(*renderer, parentRect);
+        // Subtract borders and padding
+        rect.move(-renderer->borderLeft() - renderer->paddingLeft(),
+            -renderer->borderTop() - renderer->paddingTop());
+        return rect;
     }
 
     return parentRect;
 }
 
 IntPoint FrameView::convertToContainingView(const IntPoint& localPoint) const
 {
-    if (const FrameView* parentScrollView = toFrameView(parent())) {
-        if (parentScrollView->isFrameView()) {
-            const FrameView* parentView = parentScrollView;
+    if (const FrameView* parentView = toFrameView(parent())) {
+        // Get our renderer in the parent view
+        RenderPart* renderer = m_frame->ownerRenderer();
+        if (!renderer)
+            return localPoint;
 
-            // Get our renderer in the parent view
-            RenderPart* renderer = m_frame->ownerRenderer();
-            if (!renderer)
-                return localPoint;
+        IntPoint point(localPoint);
 
-            IntPoint point(localPoint);
-
-            // Add borders and padding
-            point.move(renderer->borderLeft() + renderer->paddingLeft(),
-                       renderer->borderTop() + renderer->paddingTop());
-            return parentView->convertFromRenderer(*renderer, point);
-        }
-
-        return Widget::convertToContainingView(localPoint);
+        // Add borders and padding
+        point.move(renderer->borderLeft() + renderer->paddingLeft(),
+            renderer->borderTop() + renderer->paddingTop());
+        return parentView->convertFromRenderer(*renderer, point);
     }
 
     return localPoint;
 }
 
 IntPoint FrameView::convertFromContainingView(const IntPoint& parentPoint) const
 {
-    if (const FrameView* parentScrollView = toFrameView(parent())) {
-        if (parentScrollView->isFrameView()) {
-            const FrameView* parentView = parentScrollView;
+    if (const FrameView* parentView = toFrameView(parent())) {
+        // Get our renderer in the parent view
+        RenderPart* renderer = m_frame->ownerRenderer();
+        if (!renderer)
+            return parentPoint;
 
-            // Get our renderer in the parent view
-            RenderPart* renderer = m_frame->ownerRenderer();
-            if (!renderer)
-                return parentPoint;
-
-            IntPoint point = parentView->convertToRenderer(*renderer, parentPoint);
-            // Subtract borders and padding
-            point.move(-renderer->borderLeft() - renderer->paddingLeft(),
-                       -renderer->borderTop() - renderer->paddingTop());
-            return point;
-        }
-
-        return Widget::convertFromContainingView(parentPoint);
+        IntPoint point = parentView->convertToRenderer(*renderer, parentPoint);
+        // Subtract borders and padding
+        point.move(-renderer->borderLeft() - renderer->paddingLeft(),
+            -renderer->borderTop() - renderer->paddingTop());
+        return point;
     }
 
     return parentPoint;
 }
 
 void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations)
 {
     if (trackPaintInvalidations == m_isTrackingPaintInvalidations)
         return;
 
@@ skipping 184 matching lines @@
     visibleContentSizeF.scale(1 / visibleContentScaleFactor());
     IntSize visibleSize = expandedIntSize(visibleContentSizeF);
 
     IntPoint maximumOffset(
         contentsWidth() - visibleSize.width() - scrollOrigin().x(),
         contentsHeight() - visibleSize.height() - scrollOrigin().y());
     maximumOffset.clampNegativeToZero();
     return maximumOffset;
 }
 
-// --- ScrollView ---
-
 void FrameView::addChild(PassRefPtr<Widget> prpChild)
 {
     Widget* child = prpChild.get();
     ASSERT(child != this && !child->parent());
     child->setParent(this);
     m_children.add(prpChild);
 }
 
 void FrameView::removeChildInternal(Widget* child)
 {
@@ skipping 1103 matching lines @@
         return;
 
     ScrollableArea::setScrollOrigin(origin);
 
     // Update if the scroll origin changes, since our position will be different if the content size did not change.
     if (updatePositionAtAll && updatePositionSynchronously)
         updateScrollbars(scrollOffsetDouble());
 }
 
 } // namespace blink