Clean up vestiges of ScrollView.

Source/core/frame/FrameView.cpp

Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index f145456bb85ac2c64bee43768a27489f3ff878ea..be47b6ca4f54600fd36518b97f27f060f4016a15 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -349,7 +349,7 @@ void FrameView::setFrameRect(const IntRect& 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();
     }
@@ -2762,22 +2762,17 @@ IntPoint FrameView::convertToRenderer(const RenderObject& renderer, const IntPoi
 
 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;
-
-            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);
+    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 localRect;
@@ -2785,23 +2780,17 @@ IntRect FrameView::convertToContainingView(const IntRect& localRect) const
 
 IntRect FrameView::convertFromContainingView(const IntRect& parentRect) 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 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);
+    if (const FrameView* parentView = toFrameView(parent())) {
+        // 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 parentRect;
@@ -2809,24 +2798,18 @@ IntRect FrameView::convertFromContainingView(const IntRect& parentRect) const
 
 IntPoint FrameView::convertToContainingView(const IntPoint& localPoint) 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 localPoint;
+    if (const FrameView* parentView = toFrameView(parent())) {
+        // 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;
@@ -2834,23 +2817,17 @@ IntPoint FrameView::convertToContainingView(const IntPoint& localPoint) const
 
 IntPoint FrameView::convertFromContainingView(const IntPoint& parentPoint) 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 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);
+    if (const FrameView* parentView = toFrameView(parent())) {
+        // 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 parentPoint;
@@ -3055,8 +3032,6 @@ IntPoint FrameView::maximumScrollPosition() const
     return maximumOffset;
 }
 
-// --- ScrollView ---
-
 void FrameView::addChild(PassRefPtr<Widget> prpChild)
 {
     Widget* child = prpChild.get();