diff options
| author | Derek Sollenberger <djsollen@google.com> | 2009-12-18 08:49:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-18 08:49:14 -0800 |
| commit | 3cc6d80119d793fd256083020b992f1ab02d4a8b (patch) | |
| tree | d41d5b3abd4af5ef4c63641402eb4b82125f11f4 | |
| parent | a0fb8e9960b7e264253886f20f214cdade1eb1e4 (diff) | |
| parent | 626f2058a8302d9e9770d3df2f9677344adb02d9 (diff) | |
| download | external_webkit-3cc6d80119d793fd256083020b992f1ab02d4a8b.zip external_webkit-3cc6d80119d793fd256083020b992f1ab02d4a8b.tar.gz external_webkit-3cc6d80119d793fd256083020b992f1ab02d4a8b.tar.bz2 | |
am 626f2058: Merge change Iab49f046 into eclair-mr2
Merge commit '626f2058a8302d9e9770d3df2f9677344adb02d9' into eclair-mr2-plus-aosp
* commit '626f2058a8302d9e9770d3df2f9677344adb02d9':
Fix to ensure plugin is notified even when the screen width does not change.
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 896d902..1c1384a 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1156,14 +1156,14 @@ void WebViewCore::setSizeScreenWidthAndScale(int width, int height, r->setNeedsLayoutAndPrefWidthsRecalc(); m_mainFrame->view()->forceLayout(); // scroll to restore current screen center - if (!node) - return; - const WebCore::IntRect& newBounds = node->getRect(); - DBG_NAV_LOGD("nb:(x=%d,y=%d,w=%d," - "h=%d,ns=%d)", newBounds.x(), newBounds.y(), - newBounds.width(), newBounds.height()); - scrollBy(newBounds.x() - bounds.x(), newBounds.y() - bounds.y(), - false); + if (node) { + const WebCore::IntRect& newBounds = node->getRect(); + DBG_NAV_LOGD("nb:(x=%d,y=%d,w=%d," + "h=%d,ns=%d)", newBounds.x(), newBounds.y(), + newBounds.width(), newBounds.height()); + scrollBy(newBounds.x() - bounds.x(), newBounds.y() - bounds.y(), + false); + } } } |