summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2012-03-07 17:09:45 -0800
committerVictoria Lease <violets@google.com>2012-03-07 17:09:45 -0800
commit23a9c23ab28314661206716c0846f6a10f34c5a7 (patch)
tree90fb2e3d9c689659e4a6f4c7ca723a162c2f0a9f /Source
parentcc845c6b387500f968dea35d760d4a6bddae805a (diff)
downloadexternal_webkit-23a9c23ab28314661206716c0846f6a10f34c5a7.zip
external_webkit-23a9c23ab28314661206716c0846f6a10f34c5a7.tar.gz
external_webkit-23a9c23ab28314661206716c0846f6a10f34c5a7.tar.bz2
remove hacky workaround for a scrolling bug
Bug: 5470588 I'll file a bug for the scrolling issue that this unmasks. Change-Id: If6ea7ffd163260c70ada61960ac3d70465e93918
Diffstat (limited to 'Source')
-rw-r--r--Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index 000cd5a..04b487a 100644
--- a/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -176,11 +176,9 @@ void PlatformBridge::setScrollPosition(ScrollView* scrollView, int x, int y) {
// Check to make sure the view is the main FrameView.
android::WebViewCore *webViewCore = android::WebViewCore::getWebViewCore(scrollView);
if (webViewCore->mainFrame()->view() == scrollView) {
- const IntRect& visibleContentRect = frameView->visibleContentRect();
x = std::max(0, std::min(frameView->contentsWidth(), x));
y = std::max(0, std::min(frameView->contentsHeight(), y));
- if ((x != visibleContentRect.x()) || (y != visibleContentRect.y()))
- webViewCore->scrollTo(x, y);
+ webViewCore->scrollTo(x, y);
}
}