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

Unified Diff: Source/core/layout/compositing/CompositingInputsUpdater.cpp

Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Better rebasing. 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
Index: Source/core/layout/compositing/CompositingInputsUpdater.cpp
diff --git a/Source/core/layout/compositing/CompositingInputsUpdater.cpp b/Source/core/layout/compositing/CompositingInputsUpdater.cpp
index 8b0ddd77f9e13ca7ab619d6599c7d9acff60a7ed..f0deca8fda0f8e67977fd9c37dfcae8060b551b9 100644
--- a/Source/core/layout/compositing/CompositingInputsUpdater.cpp
+++ b/Source/core/layout/compositing/CompositingInputsUpdater.cpp
@@ -39,14 +39,14 @@ static const Layer* findParentLayerOnClippingContainerChain(const Layer* layer)
// Note: it's unclear whether this is what the spec says. Firefox does not clip, but Chrome does.
if (current->style()->position() == FixedPosition && current->hasClipOrOverflowClip()) {
ASSERT(current->hasLayer());
- return static_cast<const LayoutLayerModelObject*>(current)->layer();
+ return static_cast<const LayoutBoxModelObject*>(current)->layer();
}
// CSS clip applies to fixed position elements even for ancestors that are not what the
// fixed element is positioned with respect to.
if (current->hasClip()) {
ASSERT(current->hasLayer());
- return static_cast<const LayoutLayerModelObject*>(current)->layer();
+ return static_cast<const LayoutBoxModelObject*>(current)->layer();
}
}
} else {
@@ -54,7 +54,7 @@ static const Layer* findParentLayerOnClippingContainerChain(const Layer* layer)
}
if (current->hasLayer())
- return static_cast<const LayoutLayerModelObject*>(current)->layer();
+ return static_cast<const LayoutBoxModelObject*>(current)->layer();
// Having clip or overflow clip forces the LayoutObject to become a layer.
ASSERT(!current->hasClipOrOverflowClip());
}
@@ -66,7 +66,7 @@ static const Layer* findParentLayerOnContainingBlockChain(const LayoutObject* ob
{
for (const LayoutObject* current = object; current; current = current->containingBlock()) {
if (current->hasLayer())
- return static_cast<const LayoutLayerModelObject*>(current)->layer();
+ return static_cast<const LayoutBoxModelObject*>(current)->layer();
}
ASSERT_NOT_REACHED();
return 0;
« no previous file with comments | « Source/core/layout/compositing/CompositedLayerMapping.h ('k') | Source/core/layout/compositing/LayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698