Move rendering/RenderObject to layout/LayoutObject.

Source/core/layout/LayoutLayerModelObject.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 Apple Inc. All rights reserved.
  * Copyright (C) 2010, 2012 Google 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
@@ skipping 17 matching lines @@
 #include "core/frame/LocalFrame.h"
 #include "core/layout/Layer.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/rendering/RenderView.h"
 
 namespace blink {
 
 bool LayoutLayerModelObject::s_wasFloating = false;
 
 LayoutLayerModelObject::LayoutLayerModelObject(ContainerNode* node)
-    : RenderObject(node)
+    : LayoutObject(node)
 {
 }
 
 LayoutLayerModelObject::~LayoutLayerModelObject()
 {
     // Our layer should have been destroyed and cleared by now
     ASSERT(!hasLayer());
     ASSERT(!m_layer);
 }
 
@@ skipping 26 matching lines @@
     if (isPositioned()) {
         // Don't use this->view() because the document's renderView has been set to 0 during destruction.
         if (LocalFrame* frame = this->frame()) {
             if (FrameView* frameView = frame->view()) {
                 if (style()->hasViewportConstrainedPosition())
                     frameView->removeViewportConstrainedObject(this);
             }
         }
     }
 
-    RenderObject::willBeDestroyed();
+    LayoutObject::willBeDestroyed();
 
     destroyLayer();
 }
 
 void LayoutLayerModelObject::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
 {
     s_wasFloating = isFloating();
 
     if (RenderStyle* oldStyle = style()) {
         if (parent() && diff.needsPaintInvalidationLayer()) {
             if (oldStyle->hasAutoClip() != newStyle.hasAutoClip()
                 || oldStyle->clip() != newStyle.clip())
                 layer()->clipper().clearClipRectsIncludingDescendants();
         }
     }
 
-    RenderObject::styleWillChange(diff, newStyle);
+    LayoutObject::styleWillChange(diff, newStyle);
 }
 
 void LayoutLayerModelObject::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     bool hadTransform = hasTransformRelatedProperty();
     bool hadLayer = hasLayer();
     bool layerWasSelfPainting = hadLayer && layer()->isSelfPaintingLayer();
 
-    RenderObject::styleDidChange(diff, oldStyle);
+    LayoutObject::styleDidChange(diff, oldStyle);
     updateFromStyle();
 
     LayerType type = layerTypeRequired();
     if (type != NoLayer) {
         if (!layer() && layerCreationAllowedForSubtree()) {
             if (s_wasFloating && isFloating())
                 setChildNeedsLayout();
             createLayer(type);
             if (parent() && !needsLayout()) {
                 // FIXME: We should call a specialized version of this function.
@@ skipping 30 matching lines @@
                 frameView->removeViewportConstrainedObject(this);
         }
     }
 }
 
 void LayoutLayerModelObject::addLayerHitTestRects(LayerHitTestRects& rects, const Layer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const
 {
     if (hasLayer()) {
         if (isRenderView()) {
             // RenderView is handled with a special fast-path, but it needs to know the current layer.
-            RenderObject::addLayerHitTestRects(rects, layer(), LayoutPoint(), LayoutRect());
+            LayoutObject::addLayerHitTestRects(rects, layer(), LayoutPoint(), LayoutRect());
         } else {
-            // Since a RenderObject never lives outside it's container Layer, we can switch
+            // Since a LayoutObject never lives outside it's container Layer, we can switch
             // to marking entire layers instead. This may sometimes mark more than necessary (when
             // a layer is made of disjoint objects) but in practice is a significant performance
             // savings.
             layer()->addLayerHitTestRects(rects);
         }
     } else {
-        RenderObject::addLayerHitTestRects(rects, currentLayer, layerOffset, containerRect);
+        LayoutObject::addLayerHitTestRects(rects, currentLayer, layerOffset, containerRect);
     }
 }
 
 void LayoutLayerModelObject::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState)
 {
     ASSERT(!needsLayout());
 
     if (!shouldCheckForPaintInvalidation(paintInvalidationState))
         return;
 
@@ skipping 24 matching lines @@
             // Note: the subpixel accumulation of layer() does not need to be added here. It is already taken into account.
             squashingLayer->setNeedsDisplayInRect(pixelSnappedIntRect(paintInvalidationRect), invalidationReason);
         }
     } else {
         layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r, invalidationReason);
     }
 }
 
 void LayoutLayerModelObject::addChildFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
 {
-    for (RenderObject* current = slowFirstChild(); current; current = current->nextSibling()) {
+    for (LayoutObject* current = slowFirstChild(); current; current = current->nextSibling()) {
         if (current->isText() || current->isListMarker())
             continue;
 
         if (!current->isBox()) {
             current->addFocusRingRects(rects, additionalOffset);
             continue;
         }
 
         RenderBox* box = toRenderBox(current);
         if (!box->hasLayer()) {
             box->addFocusRingRects(rects, additionalOffset + box->locationOffset());
             continue;
         }
 
         Vector<LayoutRect> layerFocusRingRects;
         box->addFocusRingRects(layerFocusRingRects, LayoutPoint());
         for (size_t i = 0; i < layerFocusRingRects.size(); ++i) {
             FloatQuad quadInBox = box->localToContainerQuad(FloatQuad(layerFocusRingRects[i]), this);
             LayoutRect rect = LayoutRect(quadInBox.boundingBox());
             if (!rect.isEmpty()) {
                 rect.moveBy(additionalOffset);
                 rects.append(rect);
             }
         }
     }
 }
 
 } // namespace blink