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

Unified Diff: sky/engine/core/rendering/RenderLayer.h

Issue 953673002: Delete RenderLayerModelObject. (Closed) Base URL: git@github.com:domokit/mojo.git@master
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 | « sky/engine/core/rendering/RenderInline.cpp ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderLayer.h
diff --git a/sky/engine/core/rendering/RenderLayer.h b/sky/engine/core/rendering/RenderLayer.h
index ea26e38dfddb172f2ab37deeec13fc1e8cf12feb..26e248bf28492683c353c0d7bd7f1aed99bb3597 100644
--- a/sky/engine/core/rendering/RenderLayer.h
+++ b/sky/engine/core/rendering/RenderLayer.h
@@ -70,13 +70,14 @@ enum IncludeSelfOrNot { IncludeSelf, ExcludeSelf };
class RenderLayer {
WTF_MAKE_NONCOPYABLE(RenderLayer);
public:
- RenderLayer(RenderLayerModelObject*, LayerType);
+ RenderLayer(RenderBox*, LayerType);
~RenderLayer();
String debugName() const;
- RenderLayerModelObject* renderer() const { return m_renderer; }
- RenderBox* renderBox() const { return m_renderer && m_renderer->isBox() ? toRenderBox(m_renderer) : 0; }
+ RenderBox* renderer() const { return m_renderer; }
+ // FIXME(sky): Remove
+ RenderBox* renderBox() const { return m_renderer; }
RenderLayer* parent() const { return m_parent; }
RenderLayer* previousSibling() const { return m_previous; }
RenderLayer* nextSibling() const { return m_next; }
@@ -189,7 +190,7 @@ public:
bool hasFilter() const { return renderer()->hasFilter(); }
void* operator new(size_t);
- // Only safe to call from RenderLayerModelObject::destroyLayer()
+ // Only safe to call from RenderBox::destroyLayer()
void operator delete(void*);
bool paintsWithTransform() const;
@@ -222,7 +223,7 @@ public:
inline bool isPositionedContainer() const
{
// FIXME: This is not in sync with containingBlock.
- RenderLayerModelObject* layerRenderer = renderer();
+ RenderBox* layerRenderer = renderer();
return isRootLayer() || layerRenderer->isPositioned() || hasTransform();
}
@@ -259,7 +260,7 @@ private:
return m_hasSelfPaintingLayerDescendant;
}
- LayoutPoint renderBoxLocation() const { return renderer()->isBox() ? toRenderBox(renderer())->location() : LayoutPoint(); }
+ LayoutPoint renderBoxLocation() const { return renderer()->location(); }
bool shouldBeSelfPaintingLayer() const;
@@ -300,7 +301,7 @@ private:
unsigned m_hasFilterInfo : 1;
- RenderLayerModelObject* m_renderer;
+ RenderBox* m_renderer;
RenderLayer* m_parent;
RenderLayer* m_previous;
« no previous file with comments | « sky/engine/core/rendering/RenderInline.cpp ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698