diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-01-11 09:59:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-11 09:59:33 -0800 |
| commit | cea2bc79994f4e4f617a2e1a372dfc44a3f5365a (patch) | |
| tree | 5b682d4183b106955321e17ebcf14da560f3e684 /WebCore | |
| parent | 354a67ba58009fa494d34c28980688a3ee292205 (diff) | |
| parent | 16985906886590f9a70e45e302a2f1296cca6cdb (diff) | |
| download | external_webkit-cea2bc79994f4e4f617a2e1a372dfc44a3f5365a.zip external_webkit-cea2bc79994f4e4f617a2e1a372dfc44a3f5365a.tar.gz external_webkit-cea2bc79994f4e4f617a2e1a372dfc44a3f5365a.tar.bz2 | |
Merge "Remove ANDROID_SCROLL_ON_GOTO_ANCHOR in WebCore/config.h" into honeycomb
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/config.h | 6 | ||||
| -rw-r--r-- | WebCore/page/FrameView.cpp | 7 |
2 files changed, 0 insertions, 13 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; } |