| Index: Source/core/frame/FrameView.cpp
|
| diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
|
| index 7f2fd85aeceab4ee2a160a80e7be2059d408a107..bf3c3aad0340cca3c8e3c6bf3ca6e6bf6a0c27d6 100644
|
| --- a/Source/core/frame/FrameView.cpp
|
| +++ b/Source/core/frame/FrameView.cpp
|
| @@ -1364,10 +1364,15 @@ void FrameView::scrollContentsIfNeeded()
|
| updateFixedElementPaintInvalidationRectsAfterScroll();
|
| }
|
|
|
| -bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
|
| +bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& unusedClipRect)
|
| {
|
| + // FIXME: once we can switch plugins to a unified scrolling scheme, then
|
| + // we can do away with this parameter. Leaving as an empty rect for now to
|
| + // document the uselessness of the parameter to hostWindow.
|
| + static const IntRect dummyScrollRect;
|
| +
|
| if (!m_viewportConstrainedObjects || m_viewportConstrainedObjects->isEmpty()) {
|
| - hostWindow()->scroll(scrollDelta, rectToScroll, clipRect);
|
| + hostWindow()->scroll(dummyScrollRect);
|
| return true;
|
| }
|
|
|
| @@ -1427,7 +1432,7 @@ bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect
|
| }
|
|
|
| // 1) scroll
|
| - hostWindow()->scroll(scrollDelta, rectToScroll, clipRect);
|
| + hostWindow()->scroll(dummyScrollRect);
|
|
|
| // 2) update the area of fixed objects that has been invalidated
|
| Vector<IntRect> subRectsToUpdate = regionToUpdate.rects();
|
|
|