From 49b2fbe0299cb92d13e2be317a59cb0881b221fc Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Fri, 4 Dec 2009 00:32:52 -0800 Subject: [PATCH] Only re-center the page if it is zoom change or orientation change. Do not re-center the page if it is caused by show/hide soft keyboard. Fix http://b/issue?id=2303918 --- WebKit/android/jni/WebViewCore.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index f1386624e..4e3d8bfeb 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1100,11 +1100,18 @@ void WebViewCore::setSizeScreenWidthAndScale(int width, int height, WebCore::IntPoint screenCenter = WebCore::IntPoint( m_scrollOffsetX + (realScreenWidth >> 1), m_scrollOffsetY + (screenHeight >> 1)); - WebCore::HitTestResult hitTestResult = m_mainFrame->eventHandler()-> - hitTestResultAtPoint(screenCenter, false); - WebCore::Node* node = hitTestResult.innerNode(); + WebCore::Node* node = 0; WebCore::IntRect bounds; WebCore::IntPoint offset; + // If the screen width changed, it is probably zoom change or + // orientation change. Try to keep the node in the center of the + // screen staying at the same place. + if (osw != screenWidth) { + WebCore::HitTestResult hitTestResult = + m_mainFrame->eventHandler()-> hitTestResultAtPoint( + screenCenter, false); + node = hitTestResult.innerNode(); + } if (node) { bounds = node->getRect(); DBG_NAV_LOGD("ob:(x=%d,y=%d,w=%d,h=%d)", -- 2.11.0