diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-20 13:43:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-20 13:43:28 -0700 |
| commit | 50034a4c4b41e0e3c99ec5a4ce8c6673190e20ac (patch) | |
| tree | c6af3518bfba5f128037e8858fe93dfd17e44fcc /Source/WebKit | |
| parent | d548db16b0a9cd471bab55853f439ada9f1de1fe (diff) | |
| parent | 903d2ec97b2ac9cf4f50fc3d7f9e503611bce470 (diff) | |
| download | external_webkit-50034a4c4b41e0e3c99ec5a4ce8c6673190e20ac.zip external_webkit-50034a4c4b41e0e3c99ec5a4ce8c6673190e20ac.tar.gz external_webkit-50034a4c4b41e0e3c99ec5a4ce8c6673190e20ac.tar.bz2 | |
am 903d2ec9: Merge "Don\'t use deleted Node object in setSizeScreenWidthAndScale"
* commit '903d2ec97b2ac9cf4f50fc3d7f9e503611bce470':
Don't use deleted Node object in setSizeScreenWidthAndScale
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 2a24554..f17e573 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -1216,7 +1216,7 @@ void WebViewCore::setSizeScreenWidthAndScale(int width, int height, m_mainFrame->view()->forceLayout(); // scroll to restore current screen center - if (node) { + if (node && node->inDocument()) { const WebCore::IntRect& newBounds = node->getRect(); if ((osw && osh && bounds.width() && bounds.height()) && (bounds != newBounds)) { |