diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-10-07 16:13:31 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-10-07 16:14:12 -0400 |
| commit | 54b541647c8a934868c6c0f00665611569c9e4b8 (patch) | |
| tree | 90f166d878fb0cf8d061bca87615054d818acfb1 /WebKit | |
| parent | db58df4991c8c4dc1da936fb1ae866cf394d3646 (diff) | |
| download | external_webkit-54b541647c8a934868c6c0f00665611569c9e4b8.zip external_webkit-54b541647c8a934868c6c0f00665611569c9e4b8.tar.gz external_webkit-54b541647c8a934868c6c0f00665611569c9e4b8.tar.bz2 | |
Revert "Prohibit scrolling not initiated by the user."
Bug:3067265
This reverts commit f116b073399a3c3f644d6e6aeb2521ef9d2c9e9b.
Conflicts:
WebCore/platform/android/PlatformBridge.h
WebKit/android/WebCoreSupport/PlatformBridge.cpp
Change-Id: I358ce936a8c6f99717b976cfa07e7fe26014760a
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/PlatformBridge.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp index abfb3bb..945db00 100644 --- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp +++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp @@ -34,7 +34,6 @@ #include "KeyGeneratorClient.h" #include "PluginView.h" #include "Settings.h" -#include "WebCoreFrameBridge.h" #include "WebRequestContext.h" #include "WebViewCore.h" #include "npruntime.h" @@ -132,17 +131,6 @@ bool PlatformBridge::isWebViewPaused(const WebCore::FrameView* frameView) return webViewCore->isPaused(); } -bool PlatformBridge::canScroll(const WebCore::FrameView* frameView) -{ - // We want to ignore requests to scroll that were not initiated by the - // user. An example of this is when text is inserted into a - // textfield/area, which results in a scroll. We ignore this because - // we know how to do this ourselves in the UI thread. - // An example of it being initiated by the user is if the user clicks - // an anchor element which simply scrolls the page. - return android::WebFrame::getWebFrame(frameView->frame())->userInitiatedAction(); -} - bool PlatformBridge::popupsAllowed(NPP) { return false; |
