diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-12 18:34:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-12 18:34:31 -0800 |
| commit | 625ef54c9e40168e824ee100fc6d3cb90c99b39f (patch) | |
| tree | d3d91a3874e7a72f7fa374a40678039d116f492d | |
| parent | e0286f6669308d19556bab47276d44eb1e67055f (diff) | |
| parent | dbb3061334333f32b6f12c294a551bd2a4a3844c (diff) | |
| download | external_webkit-625ef54c9e40168e824ee100fc6d3cb90c99b39f.zip external_webkit-625ef54c9e40168e824ee100fc6d3cb90c99b39f.tar.gz external_webkit-625ef54c9e40168e824ee100fc6d3cb90c99b39f.tar.bz2 | |
am dbb30613: DO NOT MERGE.
Merge commit 'dbb3061334333f32b6f12c294a551bd2a4a3844c' into eclair-plus-aosp
* commit 'dbb3061334333f32b6f12c294a551bd2a4a3844c':
DO NOT MERGE.
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 1f56582..0eca9bc 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1115,7 +1115,8 @@ void WebViewCore::setSizeScreenWidthAndScale(int width, int height, if ((anchorX | anchorY) == 0) scrollBy(newBounds.x() - bounds.x(), newBounds.y() - bounds.y(), false); - else if (bounds != newBounds) { + else if ((orsw && osh && bounds.width() && bounds.height()) + && (bounds != newBounds)) { WebCore::FrameView* view = m_mainFrame->view(); // force left align if width is not changed while height changed. // the anchorPoint is probably at some white space in the node |