Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1051)

Unified Diff: Source/core/frame/FrameView.cpp

Issue 348193002: Remove some dead scrolling paths and unused params (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/loader/EmptyClients.h » ('j') | public/web/WebWidgetClient.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « no previous file | Source/core/loader/EmptyClients.h » ('j') | public/web/WebWidgetClient.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698