summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-17 14:14:01 +0100
committerBen Murdoch <benm@google.com>2011-05-23 18:54:18 +0100
commit9bbecbe38e6249c7b1c0874e80503f6162f13613 (patch)
tree65cb551afe66c35ba7a8bfaa242c21e4e422a376 /Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
parent18d7b4abf1327aa03ca786980e1c547321cad3da (diff)
downloadexternal_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/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 57cb576..d7b792b 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -572,10 +572,10 @@ bool GraphicsLayerAndroid::repaint()
// Paint at 0,0.
IntSize scroll = layer->scrolledContentOffset();
- layer->scrollToOffset(0, 0, true, false);
+ layer->scrollToOffset(0, 0);
// At this point, it doesn't matter if painting failed.
(void) paintContext(m_foregroundLayer->recordContext(), contentsRect);
- layer->scrollToOffset(scroll.width(), scroll.height(), true, false);
+ layer->scrollToOffset(scroll.width(), scroll.height());
// Construct the clip layer for masking the contents.
IntRect clip = layer->renderer()->absoluteBoundingBoxRect();