From a4458b1fd08c42fec82899c0ec145e2639aa6799 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 18 Mar 2009 17:39:45 -0700
Subject: auto import from //branches/cupcake_rel/...@140373

---
 WebCore/loader/FrameLoader.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'WebCore/loader/FrameLoader.cpp')

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;
 }
 
-- 
cgit v1.1