From 9bbecbe38e6249c7b1c0874e80503f6162f13613 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 17 May 2011 14:14:01 +0100 Subject: 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 --- Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/platform') 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(); -- cgit v1.1