Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayoutGeometryMap.cpp

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 29 matching lines @@
     , m_transformedStepsCount(0)
     , m_fixedStepsCount(0)
     , m_mapCoordinatesFlags(flags)
 {
 }
 
 LayoutGeometryMap::~LayoutGeometryMap()
 {
 }
 
-void LayoutGeometryMap::mapToContainer(TransformState& transformState, const LayoutLayerModelObject* container) const
+void LayoutGeometryMap::mapToContainer(TransformState& transformState, const RenderBoxModelObject* container) const
 {
     // If the mapping includes something like columns, we have to go via renderers.
     if (hasNonUniformStep()) {
         m_mapping.last().m_renderer->mapLocalToContainer(container, transformState, ApplyContainerFlip | m_mapCoordinatesFlags);
         transformState.flatten();
         return;
     }
 
     bool inFixed = false;
 #if ENABLE(ASSERT)
@@ skipping 36 matching lines @@
         if (inFixed && !currentStep.m_offsetForFixedPosition.isZero()) {
             ASSERT(currentStep.m_renderer->isRenderView());
             transformState.move(currentStep.m_offsetForFixedPosition);
         }
     }
 
     ASSERT(foundContainer);
     transformState.flatten();
 }
 
-FloatPoint LayoutGeometryMap::mapToContainer(const FloatPoint& p, const LayoutLayerModelObject* container) const
+FloatPoint LayoutGeometryMap::mapToContainer(const FloatPoint& p, const RenderBoxModelObject* container) const
 {
     FloatPoint result;
 
     if (!hasFixedPositionStep() && !hasTransformStep() && !hasNonUniformStep() && (!container || (m_mapping.size() && container == m_mapping[0].m_renderer))) {
         result = p + m_accumulatedOffset;
     } else {
         TransformState transformState(TransformState::ApplyTransformDirection, p);
         mapToContainer(transformState, container);
         result = transformState.lastPlanarPoint();
     }
@@ skipping 24 matching lines @@
     fprintf(stderr, "LayoutGeometryMap::dumpSteps accumulatedOffset=%d,%d\n", m_accumulatedOffset.width().toInt(), m_accumulatedOffset.height().toInt());
     for (int i = m_mapping.size() - 1; i >= 0; --i) {
         fprintf(stderr, " [%d] %s: offset=%d,%d", i, m_mapping[i].m_renderer->debugName().ascii().data(), m_mapping[i].m_offset.width().toInt(), m_mapping[i].m_offset.height().toInt());
         if (m_mapping[i].m_hasTransform)
             fprintf(stderr, " hasTransform");
         fprintf(stderr, "\n");
     }
 }
 #endif
 
-FloatQuad LayoutGeometryMap::mapToContainer(const FloatRect& rect, const LayoutLayerModelObject* container) const
+FloatQuad LayoutGeometryMap::mapToContainer(const FloatRect& rect, const RenderBoxModelObject* container) const
 {
     FloatQuad result;
 
     if (!hasFixedPositionStep() && !hasTransformStep() && !hasNonUniformStep() && (!container || (m_mapping.size() && container == m_mapping[0].m_renderer))) {
         result = rect;
         result.move(m_accumulatedOffset);
     } else {
         TransformState transformState(TransformState::ApplyTransformDirection, rect.center(), rect);
         mapToContainer(transformState, container);
         result = transformState.lastPlanarQuad();
@@ skipping 13 matching lines @@
             // Inspector creates renderers with negative width <https://bugs.webkit.org/show_bug.cgi?id=87194>.
             // Taking FloatQuad bounds avoids spurious assertions because of that.
             ASSERT(enclosingIntRect(rendererMappedResult) == enclosingIntRect(result.boundingBox()));
         }
     }
 #endif
 
     return result;
 }
 
-void LayoutGeometryMap::pushMappingsToAncestor(const LayoutObject* renderer, const LayoutLayerModelObject* ancestorRenderer)
+void LayoutGeometryMap::pushMappingsToAncestor(const LayoutObject* renderer, const RenderBoxModelObject* ancestorRenderer)
 {
     // We need to push mappings in reverse order here, so do insertions rather than appends.
     TemporaryChange<size_t> positionChange(m_insertionPosition, m_mapping.size());
     do {
         renderer = renderer->pushMappingToContainer(ancestorRenderer, *this);
     } while (renderer && renderer != ancestorRenderer);
 
     ASSERT(m_mapping.isEmpty() || isTopmostRenderView(m_mapping[0].m_renderer));
 }
 
@@ skipping 35 matching lines @@
         if (!m_mapping.size()) {
             ASSERT(ancestorLayer->renderer()->isRenderView());
             pushMappingsToAncestor(ancestorLayer->renderer(), 0);
         }
 
         TemporaryChange<size_t> positionChange(m_insertionPosition, m_mapping.size());
         bool accumulatingTransform = layer->renderer()->style()->preserves3D() || ancestorLayer->renderer()->style()->preserves3D();
         push(renderer, toLayoutSize(layerOffset), accumulatingTransform, /*isNonUniform*/ false, /*isFixedPosition*/ false, /*hasTransform*/ false);
         return;
     }
-    const LayoutLayerModelObject* ancestorRenderer = ancestorLayer ? ancestorLayer->renderer() : 0;
+    const RenderBoxModelObject* ancestorRenderer = ancestorLayer ? ancestorLayer->renderer() : 0;
     pushMappingsToAncestor(renderer, ancestorRenderer);
 }
 
 void LayoutGeometryMap::push(const LayoutObject* renderer, const LayoutSize& offsetFromContainer, bool accumulatingTransform, bool isNonUniform, bool isFixedPosition, bool hasTransform, LayoutSize offsetForFixedPosition)
 {
 //    fprintf(stderr, "LayoutGeometryMap::push %p %d,%d isNonUniform=%d\n", renderer, offsetFromContainer.width().toInt(), offsetFromContainer.height().toInt(), isNonUniform);
 
     ASSERT(m_insertionPosition != kNotFound);
     ASSERT(!renderer->isRenderView() || !m_insertionPosition || m_mapCoordinatesFlags & TraverseDocumentBoundaries);
     ASSERT(offsetForFixedPosition.isZero() || renderer->isRenderView());
@@ skipping 19 matching lines @@
     step.m_offsetForFixedPosition = offsetForFixedPosition;
 
     if (!t.isIntegerTranslation())
         step.m_transform = adoptPtr(new TransformationMatrix(t));
     else
         step.m_offset = LayoutSize(t.e(), t.f());
 
     stepInserted(step);
 }
 
-void LayoutGeometryMap::popMappingsToAncestor(const LayoutLayerModelObject* ancestorRenderer)
+void LayoutGeometryMap::popMappingsToAncestor(const RenderBoxModelObject* ancestorRenderer)
 {
     ASSERT(m_mapping.size());
 
     while (m_mapping.size() && m_mapping.last().m_renderer != ancestorRenderer) {
         stepRemoved(m_mapping.last());
         m_mapping.removeLast();
     }
 }
 
 void LayoutGeometryMap::popMappingsToAncestor(const Layer* ancestorLayer)
 {
-    const LayoutLayerModelObject* ancestorRenderer = ancestorLayer ? ancestorLayer->renderer() : 0;
+    const RenderBoxModelObject* ancestorRenderer = ancestorLayer ? ancestorLayer->renderer() : 0;
     popMappingsToAncestor(ancestorRenderer);
 }
 
 void LayoutGeometryMap::stepInserted(const LayoutGeometryMapStep& step)
 {
     m_accumulatedOffset += step.m_offset;
 
     if (step.m_isNonUniform)
         ++m_nonUniformStepsCount;
 
@@ skipping 33 matching lines @@
     // If we're not working with multiple RenderViews, then any view is considered
     // "topmost" (to preserve original behavior).
     if (!(m_mapCoordinatesFlags & TraverseDocumentBoundaries))
         return true;
 
     return renderer->frame()->isMainFrame();
 }
 #endif
 
 } // namespace blink