Removed FrameView's windowToContents and contentsToWindow methods.

Source/core/layout/LayoutBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 751 matching lines @@
         return true;
 
     return node && node->hasEditableStyle();
 }
 
 bool LayoutBox::usesCompositedScrolling() const
 {
     return hasOverflowClip() && hasLayer() && layer()->scrollableArea()->usesCompositedScrolling();
 }
 
-void LayoutBox::autoscroll(const IntPoint& position)
+void LayoutBox::autoscroll(const IntPoint& positionInRootFrame)
 {
     LocalFrame* frame = this->frame();
     if (!frame)
         return;
 
     FrameView* frameView = frame->view();
     if (!frameView)
         return;
 
-    IntPoint currentDocumentPosition = frameView->windowToContents(position);
-    scrollRectToVisible(LayoutRect(currentDocumentPosition, LayoutSize(1, 1)), ScrollAlignment::alignToEdgeIfNeeded, ScrollAlignment::alignToEdgeIfNeeded);
+    IntPoint positionInContent = frameView->rootFrameToContents(positionInRootFrame);
+    scrollRectToVisible(LayoutRect(positionInContent, LayoutSize(1, 1)), ScrollAlignment::alignToEdgeIfNeeded, ScrollAlignment::alignToEdgeIfNeeded);
 }
 
 // There are two kinds of renderer that can autoscroll.
 bool LayoutBox::canAutoscroll() const
 {
     if (node() && node()->isDocumentNode())
         return view()->frameView()->isScrollable();
 
     // Check for a box that can be scrolled in its own right.
     return canBeScrolledAndHasScrollableArea();
 }
 
 // If specified point is in border belt, returned offset denotes direction of
 // scrolling.
-IntSize LayoutBox::calculateAutoscrollDirection(const IntPoint& windowPoint) const
+IntSize LayoutBox::calculateAutoscrollDirection(const IntPoint& pointInRootFrame) const
 {
     if (!frame())
         return IntSize();
 
     FrameView* frameView = frame()->view();
     if (!frameView)
         return IntSize();
 
     IntRect box(absoluteBoundingBoxRect());
     box.move(view()->frameView()->scrollOffset());
-    IntRect windowBox = view()->frameView()->contentsToWindow(box);
+    IntRect windowBox = view()->frameView()->contentsToRootFrame(box);
 
-    IntPoint windowAutoscrollPoint = windowPoint;
+    IntPoint windowAutoscrollPoint = pointInRootFrame;
 
     if (windowAutoscrollPoint.x() < windowBox.x() + autoscrollBeltSize)
         windowAutoscrollPoint.move(-autoscrollBeltSize, 0);
     else if (windowAutoscrollPoint.x() > windowBox.maxX() - autoscrollBeltSize)
         windowAutoscrollPoint.move(autoscrollBeltSize, 0);
 
     if (windowAutoscrollPoint.y() < windowBox.y() + autoscrollBeltSize)
         windowAutoscrollPoint.move(0, -autoscrollBeltSize);
     else if (windowAutoscrollPoint.y() > windowBox.maxY() - autoscrollBeltSize)
         windowAutoscrollPoint.move(0, autoscrollBeltSize);
 
-    return windowAutoscrollPoint - windowPoint;
+    return windowAutoscrollPoint - pointInRootFrame;
 }
 
 LayoutBox* LayoutBox::findAutoscrollable(LayoutObject* renderer)
 {
     while (renderer && !(renderer->isBox() && toLayoutBox(renderer)->canAutoscroll())) {
         if (!renderer->parent() && renderer->node() == renderer->document() && renderer->document().ownerElement())
             renderer = renderer->document().ownerElement()->renderer();
         else
             renderer = renderer->parent();
     }
@@ skipping 3803 matching lines @@
     computedValues.m_margins.m_end = marginEnd();
 
     setLogicalTop(oldLogicalTop);
     setLogicalWidth(oldLogicalWidth);
     setLogicalLeft(oldLogicalLeft);
     setMarginLeft(oldMarginLeft);
     setMarginRight(oldMarginRight);
 }
 
 } // namespace blink