| Index: third_party/WebKit/Source/core/paint/FramePainter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/FramePainter.cpp b/third_party/WebKit/Source/core/paint/FramePainter.cpp
|
| index 29a03e8ca545293e5f7955865df3b2e55ca4cd58..0f222773c109aae59a5db8d655c65a0be852741c 100644
|
| --- a/third_party/WebKit/Source/core/paint/FramePainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/FramePainter.cpp
|
| @@ -27,11 +27,11 @@ namespace blink {
|
|
|
| bool FramePainter::s_inPaintContents = false;
|
|
|
| -void FramePainter::paint(GraphicsContext* context, const GlobalPaintFlags globalPaintFlags, const IntRect& rect)
|
| +void FramePainter::paint(GraphicsContext* context, const GlobalPaintFlags globalPaintFlags, const CullRect& rect)
|
| {
|
| frameView().notifyPageThatContentAreaWillPaint();
|
|
|
| - IntRect documentDirtyRect = rect;
|
| + IntRect documentDirtyRect = rect.m_rect;
|
| IntRect visibleAreaWithoutScrollbars(frameView().location(), frameView().visibleContentRect().size());
|
| documentDirtyRect.intersect(visibleAreaWithoutScrollbars);
|
|
|
| @@ -47,7 +47,7 @@ void FramePainter::paint(GraphicsContext* context, const GlobalPaintFlags global
|
|
|
| // Now paint the scrollbars.
|
| if (!frameView().scrollbarsSuppressed() && (frameView().horizontalScrollbar() || frameView().verticalScrollbar())) {
|
| - IntRect scrollViewDirtyRect = rect;
|
| + IntRect scrollViewDirtyRect = rect.m_rect;
|
| IntRect visibleAreaWithScrollbars(frameView().location(), frameView().visibleContentRect(IncludeScrollbars).size());
|
| scrollViewDirtyRect.intersect(visibleAreaWithScrollbars);
|
| scrollViewDirtyRect.moveBy(-frameView().location());
|
| @@ -184,7 +184,7 @@ void FramePainter::paintScrollbar(GraphicsContext* context, Scrollbar* bar, cons
|
| context->fillRect(toFill, frameView().baseBackgroundColor());
|
| }
|
|
|
| - bar->paint(context, rect);
|
| + bar->paint(context, CullRect(rect));
|
| }
|
|
|
| const FrameView& FramePainter::frameView()
|
|
|