diff options
| -rw-r--r-- | WebCore/config.h | 6 | ||||
| -rw-r--r-- | WebCore/page/FrameView.cpp | 7 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.h | 2 |
3 files changed, 0 insertions, 15 deletions
diff --git a/WebCore/config.h b/WebCore/config.h index 098e3f0..b2af90a 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -189,12 +189,6 @@ // Enable dumping the display tree to a file (triggered in WebView.java) #define ANDROID_DUMP_DISPLAY_TREE -// Allow webkit to initiate scroll when going to an anchor on a page -// The implementation is not acceptable to webkit. Either scrollRectToVisible -// needs additional flavor or parameter to know that it can't be ignored, -// and/or script engine must keep whether event was user initiated. -#define ANDROID_SCROLL_ON_GOTO_ANCHOR - // Animated GIF support. #define ANDROID_ANIMATED_GIF diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp index 92ee051..0e2404e 100644 --- a/WebCore/page/FrameView.cpp +++ b/WebCore/page/FrameView.cpp @@ -1270,14 +1270,7 @@ bool FrameView::scrollToAnchor(const String& name) if (!anchorNode && !(name.isEmpty() || equalIgnoringCase(name, "top"))) return false; -#ifdef ANDROID_SCROLL_ON_GOTO_ANCHOR - // TODO(andreip): check with Grace if this is correct. - android::WebFrame::getWebFrame(m_frame.get())->setUserInitiatedAction(true); -#endif maintainScrollPositionAtAnchor(anchorNode ? static_cast<Node*>(anchorNode) : m_frame->document()); -#ifdef ANDROID_SCROLL_ON_GOTO_ANCHOR - android::WebFrame::getWebFrame(m_frame.get())->setUserInitiatedAction(false); -#endif return true; } diff --git a/WebKit/android/jni/WebCoreFrameBridge.h b/WebKit/android/jni/WebCoreFrameBridge.h index 41037d9..b9e1f43 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.h +++ b/WebKit/android/jni/WebCoreFrameBridge.h @@ -126,8 +126,6 @@ class WebFrame : public WebCoreRefObject { * we set mUserInitiatedAction to true. If a load happens due to this click, * then we ask the application if it wants to override * the load. Otherwise, we attempt to load the resource internally. - * We also check it to determine whether or not to allow webkit to request - * a scroll. If it was user initated, the scroll is allowed. */ void setUserInitiatedAction(bool userInitiatedAction) { mUserInitiatedAction = userInitiatedAction; } |