Chromium Code Reviews| 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)) { |
|
esprehn
2014/06/13 23:25:26
You could probably do this rename separately to ma
|
| 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()) |