| Index: Source/core/rendering/RenderReplaced.cpp
|
| diff --git a/Source/core/rendering/RenderReplaced.cpp b/Source/core/rendering/RenderReplaced.cpp
|
| index 5084f24e0c11b56771460ae5f8a63f42e2ba0ddc..d93b85b69a476d4c7b6f54fb997423cf4336eb36 100644
|
| --- a/Source/core/rendering/RenderReplaced.cpp
|
| +++ b/Source/core/rendering/RenderReplaced.cpp
|
| @@ -81,7 +81,7 @@ void RenderReplaced::layout()
|
| {
|
| ASSERT(needsLayout());
|
|
|
| - LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
|
| + LayoutRepainter repainter(*this, checkForPaintInvalidationDuringLayout());
|
|
|
| setHeight(minimumReplacedHeight());
|
|
|
| @@ -102,7 +102,7 @@ void RenderReplaced::intrinsicSizeChanged()
|
| int scaledWidth = static_cast<int>(cDefaultWidth * style()->effectiveZoom());
|
| int scaledHeight = static_cast<int>(cDefaultHeight * style()->effectiveZoom());
|
| m_intrinsicSize = IntSize(scaledWidth, scaledHeight);
|
| - setNeedsLayoutAndPrefWidthsRecalcAndFullRepaint();
|
| + setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
|
| }
|
|
|
| void RenderReplaced::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
|
| @@ -538,7 +538,7 @@ PositionWithAffinity RenderReplaced::positionForPoint(const LayoutPoint& point)
|
| return RenderBox::positionForPoint(point);
|
| }
|
|
|
| -LayoutRect RenderReplaced::selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent)
|
| +LayoutRect RenderReplaced::selectionRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, bool clipToVisibleContent)
|
| {
|
| ASSERT(!needsLayout());
|
|
|
| @@ -547,9 +547,9 @@ LayoutRect RenderReplaced::selectionRectForRepaint(const RenderLayerModelObject*
|
|
|
| LayoutRect rect = localSelectionRect();
|
| if (clipToVisibleContent)
|
| - mapRectToRepaintBacking(repaintContainer, rect);
|
| + mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect);
|
| else
|
| - rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosingBoundingBox();
|
| + rect = localToContainerQuad(FloatRect(rect), paintInvalidationContainer).enclosingBoundingBox();
|
|
|
| return rect;
|
| }
|
| @@ -609,7 +609,7 @@ bool RenderReplaced::isSelected() const
|
| ASSERT(0);
|
| return false;
|
| }
|
| -LayoutRect RenderReplaced::clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const
|
| +LayoutRect RenderReplaced::clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const
|
| {
|
| if (style()->visibility() != VISIBLE && !enclosingLayer()->hasVisibleContent())
|
| return LayoutRect();
|
| @@ -625,7 +625,7 @@ LayoutRect RenderReplaced::clippedOverflowRectForRepaint(const RenderLayerModelO
|
| r.move(v->layoutDelta());
|
| }
|
|
|
| - mapRectToRepaintBacking(repaintContainer, r);
|
| + mapRectToPaintInvalidationBacking(paintInvalidationContainer, r);
|
| return r;
|
| }
|
|
|
|
|