diff options
| author | Derek Sollenberger <djsollen@google.com> | 2009-12-18 09:49:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-18 09:49:05 -0800 |
| commit | 36f687f9f79b594e08a1fb84059d381521f58949 (patch) | |
| tree | 486d9f906da67042124796d6b7c7715be0cb5064 /WebKit/android | |
| parent | e1131afba9067af45300e6343a757305051dfb5e (diff) | |
| parent | 3cc6d80119d793fd256083020b992f1ab02d4a8b (diff) | |
| download | external_webkit-36f687f9f79b594e08a1fb84059d381521f58949.zip external_webkit-36f687f9f79b594e08a1fb84059d381521f58949.tar.gz external_webkit-36f687f9f79b594e08a1fb84059d381521f58949.tar.bz2 | |
am 3cc6d801: am 626f2058: Merge change Iab49f046 into eclair-mr2
Merge commit '3cc6d80119d793fd256083020b992f1ab02d4a8b'
* commit '3cc6d80119d793fd256083020b992f1ab02d4a8b':
Fix to ensure plugin is notified even when the screen width does not change.
Diffstat (limited to 'WebKit/android')
| -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 7ee692c..d546067 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1103,14 +1103,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); + } } } |