Remove LayoutView's special version mapToVisualRectInAncestorSpace().

third_party/WebKit/Source/core/layout/LayoutView.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 461 matching lines @@
 {
     setShouldDoFullPaintInvalidationIncludingNonCompositingDescendants();
 
     // The only way we know how to hit these ASSERTS below this point is via the Chromium OS login screen.
     DisableCompositingQueryAsserts disabler;
 
     if (compositor()->inCompositingMode())
         compositor()->fullyInvalidatePaint();
 }
 
+bool LayoutView::mapContentRectToFrameSpace(const LayoutBox* contentObject, LayoutRect& rect, VisualRectFlags visualRectFlags) const
+{
+    if (document().settings() && document().settings()->rootLayerScrolls())
+        return true;
+
+    if (contentObject && contentObject->styleRef().position() == FixedPosition)
+        adjustOffsetForFixedPosition(rect);
+
+    // Intersect the viewport with the paint invalidation rect.
+    LayoutRect viewRectangle = viewRect();
+    if (visualRectFlags & EdgeInclusive) {
+        if (!rect.inclusiveIntersect(viewRectangle))
+            return false;
+    } else {
+        rect.intersect(viewRectangle);
+        if (rect.isEmpty())
+            return false;
+    }
+
+    // Adjust for scroll offset of the view.
+    rect.moveBy(-viewRectangle.location());
+    return true;
+}
+
 bool LayoutView::mapToVisualRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect, VisualRectFlags visualRectFlags) const
 {
-    return mapToVisualRectInAncestorSpace(ancestor, rect, 0, visualRectFlags);
-}
-
-bool LayoutView::mapToVisualRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect, MapCoordinatesFlags mode, VisualRectFlags visualRectFlags) const
-{
     if (document().printing())
         return true;
 
     if (style()->isFlippedBlocksWritingMode()) {
         // We have to flip by hand since the view's logical width has not been determined.  We
         // can use the viewport width.
         rect.setX(viewWidth() - rect.maxX());
     }
 
-    if (mode & IsFixed)
-        adjustOffsetForFixedPosition(rect);
-
-    // Apply our transform if we have one (because of full page zooming).
-    if (!ancestor && layer() && layer()->transform())
-        rect = layer()->transform()->mapRect(rect);
+    ASSERT(!layer()->transform());
 
     ASSERT(ancestor);
     if (ancestor == this)
         return true;
 
-    Element* owner = document().ownerElement();
-    if (!owner)
-        return true;
-
-    if (LayoutBox* obj = owner->layoutBox()) {
-        if (!(mode & InputIsInFrameCoordinates)) {
-            // Intersect the viewport with the paint invalidation rect.
-            LayoutRect viewRectangle = viewRect();
-            if (visualRectFlags & EdgeInclusive) {
-                if (!rect.inclusiveIntersect(viewRectangle))
-                    return false;
-            } else {
-                rect.intersect(viewRectangle);
-            }
-
-            // Adjust for scroll offset of the view.
-            rect.moveBy(-viewRectangle.location());
-        }
+    if (LayoutPart* owner = frame()->ownerLayoutObject()) {
         // Frames are painted at rounded-int position. Since we cannot efficiently compute the subpixel offset
         // of painting at this point in a a bottom-up walk, round to the enclosing int rect, which will enclose
         // the actual visible rect.
         rect = LayoutRect(enclosingIntRect(rect));
 
         // Adjust for frame border.
-        rect.move(obj->contentBoxOffset());
-        return obj->mapToVisualRectInAncestorSpace(ancestor, rect, visualRectFlags);
+        rect.move(owner->contentBoxOffset());
+        return owner->mapToVisualRectInAncestorSpace(ancestor, rect, visualRectFlags);
     }
 
     return true;
 }
 
 void LayoutView::adjustOffsetForFixedPosition(LayoutRect& rect) const
 {
     if (m_frameView) {
         rect.move(toIntSize(m_frameView->scrollPosition()));
         if (hasOverflowClip())
@@ skipping 490 matching lines @@
 
 ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize& delta)
 {
     if (!frameView())
         return ScrollResult();
 
     return frame()->applyScrollDelta(granularity, delta, false);
 }
 
 } // namespace blink