diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 17:39:45 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 17:39:45 -0700 |
| commit | a4458b1fd08c42fec82899c0ec145e2639aa6799 (patch) | |
| tree | 7e17403a4ee11bf48deab41159c4cc847c19adf3 /WebCore/loader/FrameLoader.cpp | |
| parent | 3b1318beb3f32d5008cc74857d70e1abfac309ad (diff) | |
| download | external_webkit-a4458b1fd08c42fec82899c0ec145e2639aa6799.zip external_webkit-a4458b1fd08c42fec82899c0ec145e2639aa6799.tar.gz external_webkit-a4458b1fd08c42fec82899c0ec145e2639aa6799.tar.bz2 | |
auto import from //branches/cupcake_rel/...@140373
Diffstat (limited to 'WebCore/loader/FrameLoader.cpp')
| -rw-r--r-- | WebCore/loader/FrameLoader.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index adaea61..151ab37 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -113,6 +113,10 @@ #include "RenderArena.h" #endif +#if PLATFORM(ANDROID) +#include "WebCoreFrameBridge.h" +#endif + namespace WebCore { #if ENABLE(SVG) @@ -1697,9 +1701,14 @@ bool FrameLoader::gotoAnchor(const String& name) renderer = anchorNode->renderer(); rect = anchorNode->getRect(); } +#ifdef ANDROID_SCROLL_ON_GOTO_ANCHOR + android::WebFrame::getWebFrame(m_frame)->setUserInitiatedClick(true); +#endif if (renderer) renderer->enclosingLayer()->scrollRectToVisible(rect, true, RenderLayer::gAlignToEdgeIfNeeded, RenderLayer::gAlignTopAlways); - +#ifdef ANDROID_SCROLL_ON_GOTO_ANCHOR + android::WebFrame::getWebFrame(m_frame)->setUserInitiatedClick(false); +#endif return true; } |