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

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

Issue 342203004: Get rid of compositing and squashing helper methods on RenderLayerModelObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed compile. Created 6 years, 6 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 | « no previous file | Source/core/rendering/RenderLayerClipper.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index bc2d5ca6d543a13cb9df6be94288d7cb3f0446d2..e6105b1197251091a3b3a3afb4e428672ab12909 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -600,7 +600,7 @@ void RenderLayer::updatePagination()
LayoutPoint RenderLayer::positionFromPaintInvalidationContainer(const RenderObject* renderObject, const RenderLayerModelObject* paintInvalidationContainer)
{
- if (!paintInvalidationContainer || !paintInvalidationContainer->groupedMapping())
+ if (!paintInvalidationContainer || !paintInvalidationContainer->layer()->groupedMapping())
return renderObject->positionFromPaintInvalidationContainer(paintInvalidationContainer);
RenderLayerModelObject* transformedAncestor = paintInvalidationContainer->layer()->enclosingTransformedAncestor()->renderer();
@@ -614,13 +614,13 @@ LayoutPoint RenderLayer::positionFromPaintInvalidationContainer(const RenderObje
ForceHorriblySlowRectMapping slowRectMapping(*transformedAncestor);
LayoutPoint point = renderObject->positionFromPaintInvalidationContainer(transformedAncestor);
- point.moveBy(-paintInvalidationContainer->groupedMapping()->squashingOffsetFromTransformedAncestor());
+ point.moveBy(-paintInvalidationContainer->layer()->groupedMapping()->squashingOffsetFromTransformedAncestor());
return point;
}
void RenderLayer::mapRectToPaintInvalidationBacking(const RenderObject* renderObject, const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect)
{
- if (!paintInvalidationContainer->groupedMapping()) {
+ if (!paintInvalidationContainer->layer()->groupedMapping()) {
renderObject->mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect);
return;
}
@@ -645,7 +645,7 @@ void RenderLayer::mapRectToPaintInvalidationBacking(const RenderObject* renderOb
// transformed ancestor.
rect = LayoutRect(paintInvalidationContainer->localToContainerQuad(FloatRect(rect), transformedAncestor).boundingBox());
- rect.moveBy(-paintInvalidationContainer->groupedMapping()->squashingOffsetFromTransformedAncestor());
+ rect.moveBy(-paintInvalidationContainer->layer()->groupedMapping()->squashingOffsetFromTransformedAncestor());
}
LayoutRect RenderLayer::computePaintInvalidationRect(const RenderObject* renderObject, const RenderLayer* paintInvalidationContainer)
« no previous file with comments | « no previous file | Source/core/rendering/RenderLayerClipper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698