diff options
| author | Grace Kloba <klobag@google.com> | 2009-12-04 00:32:52 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-12-04 00:32:52 -0800 |
| commit | 49b2fbe0299cb92d13e2be317a59cb0881b221fc (patch) | |
| tree | d4b2de534d8376703ebcbac1544153b02df44e7e | |
| parent | 472affe311f3854aaac7cca73d398d36a9eefaf3 (diff) | |
| download | external_webkit-49b2fbe0299cb92d13e2be317a59cb0881b221fc.zip external_webkit-49b2fbe0299cb92d13e2be317a59cb0881b221fc.tar.gz external_webkit-49b2fbe0299cb92d13e2be317a59cb0881b221fc.tar.bz2 | |
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
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index f138662..4e3d8bf 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)", |