diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-17 14:14:01 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:18 +0100 |
| commit | 9bbecbe38e6249c7b1c0874e80503f6162f13613 (patch) | |
| tree | 65cb551afe66c35ba7a8bfaa242c21e4e422a376 /Source/WebKit/android/nav | |
| parent | 18d7b4abf1327aa03ca786980e1c547321cad3da (diff) | |
| download | external_webkit-9bbecbe38e6249c7b1c0874e80503f6162f13613.zip external_webkit-9bbecbe38e6249c7b1c0874e80503f6162f13613.tar.gz external_webkit-9bbecbe38e6249c7b1c0874e80503f6162f13613.tar.bz2 | |
Merge WebKit at r76408: Fix calls to RenderLayer::scrollToOffset()
As of http://trac.webkit.org/changeset/76291 RenderLayer::scrollToOffset
only takes two parameters (the x and y offset). Update our callsites to
reflect this. It seems safe to disregard the booleans.
Change-Id: I63bc103e4fc961968055770792aead82be82435a
Diffstat (limited to 'Source/WebKit/android/nav')
| -rw-r--r-- | Source/WebKit/android/nav/CacheBuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp index dc10f21..e7691d7 100644 --- a/Source/WebKit/android/nav/CacheBuilder.cpp +++ b/Source/WebKit/android/nav/CacheBuilder.cpp @@ -100,7 +100,7 @@ CacheBuilder::LayerTracker::~LayerTracker() { if (mRenderLayer && mRenderLayer->stackingContext()) // Restore the scroll position of the layer. Does not affect layers // without overflow scroll as the layer will not be scrolled. - mRenderLayer->scrollToOffset(mScroll.x(), mScroll.y(), false, false); + mRenderLayer->scrollToOffset(mScroll.x(), mScroll.y()); } #if DUMP_NAV_CACHE @@ -2930,7 +2930,7 @@ void CacheBuilder::TrackLayer(WTF::Vector<LayerTracker>& layerTracker, return; // Prevent a crash when scrolling a layer that does not have a parent. if (layer->stackingContext()) - layer->scrollToOffset(0, 0, false, false); + layer->scrollToOffset(0, 0); #endif layerTracker.grow(layerTracker.size() + 1); LayerTracker& indexTracker = layerTracker.last(); |