Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(964)

Unified Diff: Source/core/rendering/RenderBoxModelObject.cpp

Issue 898783003: Move rendering/RenderLayer* to layout/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.h ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBoxModelObject.cpp
diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp
index 65dedf2c0c503e5b7917aecdd672de804806dff0..3b9203b3009c822fc2038dba76903baec8c350f0 100644
--- a/Source/core/rendering/RenderBoxModelObject.cpp
+++ b/Source/core/rendering/RenderBoxModelObject.cpp
@@ -26,15 +26,15 @@
#include "config.h"
#include "core/rendering/RenderBoxModelObject.h"
+#include "core/layout/Layer.h"
#include "core/layout/compositing/CompositedLayerMapping.h"
-#include "core/layout/compositing/RenderLayerCompositor.h"
+#include "core/layout/compositing/LayerCompositor.h"
#include "core/page/scrolling/ScrollingConstraints.h"
#include "core/rendering/ImageQualityController.h"
#include "core/rendering/RenderBlock.h"
#include "core/rendering/RenderFlowThread.h"
#include "core/rendering/RenderGeometryMap.h"
#include "core/rendering/RenderInline.h"
-#include "core/rendering/RenderLayer.h"
#include "core/rendering/RenderObjectInlines.h"
#include "core/rendering/RenderRegion.h"
#include "core/rendering/RenderTextFragment.h"
@@ -93,7 +93,7 @@ bool RenderBoxModelObject::hasAcceleratedCompositing() const
}
RenderBoxModelObject::RenderBoxModelObject(ContainerNode* node)
- : RenderLayerModelObject(node)
+ : LayoutLayerModelObject(node)
{
}
@@ -108,7 +108,7 @@ void RenderBoxModelObject::willBeDestroyed()
// A continuation of this RenderObject should be destroyed at subclasses.
ASSERT(!continuation());
- RenderLayerModelObject::willBeDestroyed();
+ LayoutLayerModelObject::willBeDestroyed();
}
bool RenderBoxModelObject::calculateHasBoxDecorations() const
@@ -120,7 +120,7 @@ bool RenderBoxModelObject::calculateHasBoxDecorations() const
void RenderBoxModelObject::updateFromStyle()
{
- RenderLayerModelObject::updateFromStyle();
+ LayoutLayerModelObject::updateFromStyle();
RenderStyle* styleToUse = style();
setHasBoxDecorationBackground(calculateHasBoxDecorations());
@@ -482,7 +482,7 @@ void RenderBoxModelObject::setContinuation(RenderBoxModelObject* continuation)
void RenderBoxModelObject::computeLayerHitTestRects(LayerHitTestRects& rects) const
{
- RenderLayerModelObject::computeLayerHitTestRects(rects);
+ LayoutLayerModelObject::computeLayerHitTestRects(rects);
// If there is a continuation then we need to consult it here, since this is
// the root of the tree walk and it wouldn't otherwise get picked up.
@@ -587,7 +587,7 @@ void RenderBoxModelObject::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, Tra
transformState.move(containerOffset.width(), containerOffset.height(), preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform);
}
-const RenderObject* RenderBoxModelObject::pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
+const RenderObject* RenderBoxModelObject::pushMappingToContainer(const LayoutLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
{
ASSERT(ancestorToStopAt != this);
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.h ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698