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

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

Issue 335963002: Change LayoutState to be stack-allocated (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix push function to match old behavior... 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
Index: Source/core/rendering/RenderInline.cpp
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp
index 2b40472574e315ca780dc4b46a82b0fc80f28c55..80664b5e3b1ad0ba9a917d967316600a1de84671 100644
--- a/Source/core/rendering/RenderInline.cpp
+++ b/Source/core/rendering/RenderInline.cpp
@@ -994,7 +994,7 @@ LayoutRect RenderInline::linesVisualOverflowBoundingBox() const
LayoutRect RenderInline::clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const
{
- ASSERT(!view() || !view()->layoutStateEnabled());
+ ASSERT(!view() || !view()->layoutStateCachedOffsetsEnabled());
if (!firstLineBoxIncludingCulling() && !continuation())
return LayoutRect();
@@ -1056,7 +1056,7 @@ void RenderInline::mapRectToPaintInvalidationBacking(const RenderLayerModelObjec
{
if (RenderView* v = view()) {
// LayoutState is only valid for root-relative repainting
- if (v->canUseLayoutStateForContainer(paintInvalidationContainer)) {
+ if (v->canMapUsingLayoutStateForContainer(paintInvalidationContainer)) {
LayoutState* layoutState = v->layoutState();
if (style()->hasInFlowPosition() && layer())
rect.move(layer()->offsetForInFlowPosition());
@@ -1143,7 +1143,7 @@ void RenderInline::mapLocalToContainer(const RenderLayerModelObject* repaintCont
return;
if (RenderView *v = view()) {
- if (v->canUseLayoutStateForContainer(repaintContainer)) {
+ if (v->canMapUsingLayoutStateForContainer(repaintContainer)) {
LayoutState* layoutState = v->layoutState();
LayoutSize offset = layoutState->paintOffset();
if (style()->hasInFlowPosition() && layer())

Powered by Google App Engine
This is Rietveld 408576698