Move rendering/RenderBox to layout/LayoutBox.

Source/core/layout/Layer.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 34 matching lines @@
 #ifndef Layer_h
 #define Layer_h
 
 #include "core/layout/LayerClipper.h"
 #include "core/layout/LayerFilterInfo.h"
 #include "core/layout/LayerFragment.h"
 #include "core/layout/LayerReflectionInfo.h"
 #include "core/layout/LayerScrollableArea.h"
 #include "core/layout/LayerStackingNode.h"
 #include "core/layout/LayerStackingNodeIterator.h"
-#include "core/rendering/RenderBox.h"
+#include "core/layout/LayoutBox.h"
 #include "platform/graphics/CompositingReasons.h"
 #include "public/platform/WebBlendMode.h"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
 class FilterEffectRenderer;
 class FilterOperations;
 class HitTestRequest;
 class HitTestResult;
@@ skipping 21 matching lines @@
 
 class Layer {
     WTF_MAKE_NONCOPYABLE(Layer);
 public:
     Layer(LayoutBoxModelObject*, LayerType);
     ~Layer();
 
     String debugName() const;
 
     LayoutBoxModelObject* renderer() const { return m_renderer; }
-    RenderBox* renderBox() const { return m_renderer && m_renderer->isBox() ? toRenderBox(m_renderer) : 0; }
+    LayoutBox* layoutBox() const { return m_renderer && m_renderer->isBox() ? toLayoutBox(m_renderer) : 0; }
     Layer* parent() const { return m_parent; }
     Layer* previousSibling() const { return m_previous; }
     Layer* nextSibling() const { return m_next; }
     Layer* firstChild() const { return m_first; }
     Layer* lastChild() const { return m_last; }
 
     const Layer* compositingContainer() const;
 
     void addChild(Layer* newChild, Layer* beforeChild = 0);
     Layer* removeChild(Layer*);
@@ skipping 394 matching lines @@
         ASSERT(!m_hasSelfPaintingLayerDescendantDirty);
         return m_hasSelfPaintingLayerDescendant;
     }
     LayoutRect paintingExtent(const Layer* rootLayer, const LayoutRect& paintDirtyRect, const LayoutSize& subPixelAccumulation, PaintBehavior);
     void appendSingleFragmentIgnoringPagination(LayerFragments&, const Layer* rootLayer, const LayoutRect& dirtyRect, ClipRectsCacheSlot, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize, ShouldRespectOverflowClip = RespectOverflowClip, const LayoutPoint* offsetFromRoot = 0, const LayoutSize& subPixelAccumulation = LayoutSize());
     void collectFragments(LayerFragments&, const Layer* rootLayer, const LayoutRect& dirtyRect,
         ClipRectsCacheSlot, OverlayScrollbarSizeRelevancy inOverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize,
         ShouldRespectOverflowClip = RespectOverflowClip, const LayoutPoint* offsetFromRoot = 0,
         const LayoutSize& subPixelAccumulation = LayoutSize(), const LayoutRect* layerBoundingBox = 0);
 
-    LayoutPoint renderBoxLocation() const { return renderer()->isBox() ? toRenderBox(renderer())->location() : LayoutPoint(); }
+    LayoutPoint layoutBoxLocation() const { return renderer()->isBox() ? toLayoutBox(renderer())->location() : LayoutPoint(); }
 
     enum TransparencyClipBoxBehavior {
         PaintingTransparencyClipBox,
         HitTestingTransparencyClipBox
     };
 
     enum TransparencyClipBoxMode {
         DescendantsOfTransparencyClipBox,
         RootOfTransparencyClipBox
     };
@@ skipping 53 matching lines @@
 
     bool shouldBeSelfPaintingLayer() const;
 
     // FIXME: We should only create the stacking node if needed.
     bool requiresStackingNode() const { return true; }
     void updateStackingNode();
 
     void updateReflectionInfo(const LayoutStyle*);
 
     // FIXME: We could lazily allocate our ScrollableArea based on style properties ('overflow', ...)
-    // but for now, we are always allocating it for RenderBox as it's safer.
-    bool requiresScrollableArea() const { return renderBox(); }
+    // but for now, we are always allocating it for LayoutBox as it's safer.
+    bool requiresScrollableArea() const { return layoutBox(); }
     void updateScrollableArea();
 
     void dirtyAncestorChainVisibleDescendantStatus();
 
     bool attemptDirectCompositingUpdate(StyleDifference, const LayoutStyle* oldStyle);
     void updateTransform(const LayoutStyle* oldStyle, const LayoutStyle& newStyle);
 
     void dirty3DTransformedDescendantStatus();
     // Both updates the status, and returns true if descendants of this have 3d.
     bool update3DTransformedDescendantStatus();
@@ skipping 119 matching lines @@
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showLayerTree(const blink::Layer*);
 void showLayerTree(const blink::LayoutObject*);
 #endif
 
 #endif // Layer_h