diff options
| author | Victoria Lease <violets@google.com> | 2012-03-09 09:23:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-09 09:23:52 -0800 |
| commit | b06a81917e9e96870f43131aeb2e9a7032da4a8c (patch) | |
| tree | 2f177f39ed176159bd2d7490b5f5cce28bddbf9a /Source/WebKit/android/WebCoreSupport | |
| parent | ddacf299acbe17093f175cec8d86088ea3472793 (diff) | |
| parent | 23a9c23ab28314661206716c0846f6a10f34c5a7 (diff) | |
| download | external_webkit-b06a81917e9e96870f43131aeb2e9a7032da4a8c.zip external_webkit-b06a81917e9e96870f43131aeb2e9a7032da4a8c.tar.gz external_webkit-b06a81917e9e96870f43131aeb2e9a7032da4a8c.tar.bz2 | |
Merge "remove hacky workaround for a scrolling bug"
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp | 4 |
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); } } |