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

Unified Diff: sky/engine/core/rendering/RenderInline.cpp

Issue 823123003: Delete PaintInvalidationState. It's unused. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: proper diff Created 5 years, 11 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.h ('k') | sky/engine/core/rendering/RenderLayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderInline.cpp
diff --git a/sky/engine/core/rendering/RenderInline.cpp b/sky/engine/core/rendering/RenderInline.cpp
index cf3b72ddc45d98f54f4ce4e90bae34fecb8cdc52..527f525cd011be8d89a41978f922fcd9c641478d 100644
--- a/sky/engine/core/rendering/RenderInline.cpp
+++ b/sky/engine/core/rendering/RenderInline.cpp
@@ -616,19 +616,11 @@ LayoutSize RenderInline::offsetFromContainer(const RenderObject* container, cons
return offset;
}
-void RenderInline::mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode, const PaintInvalidationState* paintInvalidationState) const
+void RenderInline::mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode) const
{
if (paintInvalidationContainer == this)
return;
- if (paintInvalidationState && paintInvalidationState->canMapToContainer(paintInvalidationContainer)) {
- LayoutSize offset = paintInvalidationState->paintOffset();
- if (style()->hasInFlowPosition() && layer())
- offset += layer()->offsetForInFlowPosition();
- transformState.move(offset);
- return;
- }
-
bool containerSkipped;
RenderObject* o = container(paintInvalidationContainer, &containerSkipped);
if (!o)
@@ -656,7 +648,7 @@ void RenderInline::mapLocalToContainer(const RenderLayerModelObject* paintInvali
return;
}
- o->mapLocalToContainer(paintInvalidationContainer, transformState, mode, paintInvalidationState);
+ o->mapLocalToContainer(paintInvalidationContainer, transformState, mode);
}
void RenderInline::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
« no previous file with comments | « sky/engine/core/rendering/RenderInline.h ('k') | sky/engine/core/rendering/RenderLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698