*** NOT FOR LANDING *** mapLocalToContainer and offsetFromContainer cleanup.

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 1540 matching lines @@
             ? view()->frameView()->visibleContentSize().height()
             : view()->frameView()->visibleContentSize().width();
         LayoutUnit fillAvailableExtent = containingBlock()->availableLogicalHeight(ExcludeMarginBorderPadding);
         return std::min(fillAvailableExtent, fillFallbackExtent);
     }
 
     // Use the content box logical height as specified by the style.
     return cb->adjustContentBoxLogicalHeightForBoxSizing(logicalHeightLength.value());
 }
 
-void LayoutBox::mapLocalToContainer(const LayoutBoxModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const
-{
-    if (paintInvalidationContainer == this)
-        return;
-
-    if (paintInvalidationState && paintInvalidationState->canMapToContainer(paintInvalidationContainer)) {
-        LayoutSize offset = paintInvalidationState->paintOffset() + locationOffset();
-        if (style()->hasInFlowPosition() && layer())
-            offset += layer()->offsetForInFlowPosition();
-        transformState.move(offset);
-        return;
-    }
-
-    bool containerSkipped;
-    LayoutObject* o = container(paintInvalidationContainer, &containerSkipped);
-    if (!o)
-        return;
-
-    bool isFixedPos = style()->position() == FixedPosition;
-    bool hasTransform = hasLayer() && layer()->transform();
-    // If this box has a transform, it acts as a fixed position container for fixed descendants,
-    // and may itself also be fixed position. So propagate 'fixed' up only if this box is fixed position.
-    if (hasTransform && !isFixedPos)
-        mode &= ~IsFixed;
-    else if (isFixedPos)
-        mode |= IsFixed;
-
-    if (wasFixed)
-        *wasFixed = mode & IsFixed;
-
-    LayoutSize containerOffset = offsetFromContainer(o, roundedLayoutPoint(transformState.mappedPoint()));
-
-    bool preserve3D = mode & UseTransforms && (o->style()->preserves3D() || style()->preserves3D());
-    if (mode & UseTransforms && shouldUseTransformFromContainer(o)) {
-        TransformationMatrix t;
-        getTransformFromContainer(o, containerOffset, t);
-        transformState.applyTransform(t, preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform);
-    } else {
-        transformState.move(containerOffset.width(), containerOffset.height(), preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform);
-    }
-
-    if (containerSkipped) {
-        // There can't be a transform between paintInvalidationContainer and o, because transforms create containers, so it should be safe
-        // to just subtract the delta between the paintInvalidationContainer and o.
-        LayoutSize containerOffset = paintInvalidationContainer->offsetFromAncestorContainer(o);
-        transformState.move(-containerOffset.width(), -containerOffset.height(), preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform);
-        return;
-    }
-
-    mode &= ~ApplyContainerFlip;
-
-    o->mapLocalToContainer(paintInvalidationContainer, transformState, mode, wasFixed);
-}
-
 void LayoutBox::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const
 {
     bool isFixedPos = style()->position() == FixedPosition;
     bool hasTransform = hasLayer() && layer()->transform();
     if (hasTransform && !isFixedPos) {
         // If this box has a transform, it acts as a fixed position container for fixed descendants,
         // and may itself also be fixed position. So propagate 'fixed' up only if this box is fixed position.
         mode &= ~IsFixed;
     } else if (isFixedPos) {
         mode |= IsFixed;
     }
 
     LayoutBoxModelObject::mapAbsoluteToLocalPoint(mode, transformState);
 }
 
-LayoutSize LayoutBox::offsetFromContainer(const LayoutObject* o, const LayoutPoint& point, bool* offsetDependsOnPoint) const
+LayoutSize LayoutBox::offsetFromContainer(const LayoutObject* o) const
 {
-    ASSERT(o == container());
-
-    LayoutSize offset;
-    if (isRelPositioned())
-        offset += offsetForInFlowPosition();
-
-    if (!isInline() || isReplaced()) {
-        offset += topLeftLocationOffset();
-        if (o->isLayoutFlowThread()) {
-            // So far the point has been in flow thread coordinates (i.e. as if everything in
-            // the fragmentation context lived in one tall single column). Convert it to a
-            // visual point now.
-            LayoutPoint pointInContainer = point + offset;
-            offset += o->columnOffset(pointInContainer);
-            if (offsetDependsOnPoint)
-                *offsetDependsOnPoint = true;
-        }
-    }
-
-    if (o->hasOverflowClip())
-        offset -= toLayoutBox(o)->scrolledContentOffset();
+    LayoutSize offset = topLeftLocationOffset();
 
     if (style()->position() == AbsolutePosition && o->isRelPositioned() && o->isLayoutInline())
         offset += toLayoutInline(o)->offsetForInFlowPositionedInline(*this);
 
-    return offset;
+    return offset + LayoutBoxModelObject::offsetFromContainer(o);
 }
 
 InlineBox* LayoutBox::createInlineBox()
 {
     return new InlineBox(*this);
 }
 
 void LayoutBox::dirtyLineBoxes(bool fullLayout)
 {
     if (inlineBoxWrapper()) {
@@ skipping 3101 matching lines @@
 bool LayoutBox::canRenderBorderImage() const
 {
     if (!style()->hasBorderDecoration())
         return false;
 
     StyleImage* borderImage = style()->borderImage().image();
     return borderImage && borderImage->canRender(*this, style()->effectiveZoom()) && borderImage->isLoaded();
 }
 
 } // namespace blink