| Index: Source/core/rendering/RenderView.cpp
|
| diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp
|
| index 30b7b8c435ff7c269383e2b05401f1da90974257..5d1181d740f5fd697f8c0bdb4f682d896838b1e7 100644
|
| --- a/Source/core/rendering/RenderView.cpp
|
| +++ b/Source/core/rendering/RenderView.cpp
|
| @@ -456,6 +456,28 @@ void RenderView::invalidateTreeIfNeeded(const PaintInvalidationState& paintInval
|
| RenderBlock::invalidateTreeIfNeeded(paintInvalidationState);
|
| }
|
|
|
| +LayoutRect RenderView::rectForPaintInvalidation(const LayoutRect* repaintRectPtr) const
|
| +{
|
| + LayoutRect repaintRect = repaintRectPtr ? *repaintRectPtr : viewRect();
|
| + Element* owner = document().ownerElement();
|
| + if (document().printing() || !m_frameView
|
| + || layer()->compositingState() == PaintsIntoOwnBacking || !owner)
|
| + return repaintRect;
|
| + if (RenderBox* obj = owner->renderBox()) {
|
| + LayoutRect viewRectangle = viewRect();
|
| + LayoutRect rectToRepaint = intersection(repaintRect, viewRectangle);
|
| +
|
| + // Subtract out the contentsX and contentsY offsets to get our coords within the viewing
|
| + // rectangle.
|
| + rectToRepaint.moveBy(-viewRectangle.location());
|
| +
|
| + // FIXME: Hardcoded offsets here are not good.
|
| + rectToRepaint.moveBy(obj->contentBoxRect().location());
|
| + return rectToRepaint;
|
| + }
|
| + return repaintRect;
|
| +}
|
| +
|
| void RenderView::repaintViewRectangle(const LayoutRect& repaintRect) const
|
| {
|
| ASSERT(!repaintRect.isEmpty());
|
| @@ -471,16 +493,7 @@ void RenderView::repaintViewRectangle(const LayoutRect& repaintRect) const
|
| } else if (!owner) {
|
| m_frameView->contentRectangleForPaintInvalidation(pixelSnappedIntRect(repaintRect));
|
| } else if (RenderBox* obj = owner->renderBox()) {
|
| - LayoutRect viewRectangle = viewRect();
|
| - LayoutRect rectToRepaint = intersection(repaintRect, viewRectangle);
|
| -
|
| - // Subtract out the contentsX and contentsY offsets to get our coords within the viewing
|
| - // rectangle.
|
| - rectToRepaint.moveBy(-viewRectangle.location());
|
| -
|
| - // FIXME: Hardcoded offsets here are not good.
|
| - rectToRepaint.moveBy(obj->contentBoxRect().location());
|
| - obj->invalidatePaintRectangle(rectToRepaint);
|
| + obj->invalidatePaintRectangle(rectForPaintInvalidation(&repaintRect));
|
| }
|
| }
|
|
|
|
|