diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-20 09:43:56 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-20 09:43:57 -0700 |
| commit | 903d2ec97b2ac9cf4f50fc3d7f9e503611bce470 (patch) | |
| tree | 57e8ce6d88d46fa3794450e660a6ee7cc3cbf3c9 | |
| parent | 31874a9d49b110cd82de0efc5eab2c9cddcddde1 (diff) | |
| parent | 5550319aaa0f9d0a05283a10971fc3240b9ed8eb (diff) | |
| download | external_webkit-903d2ec97b2ac9cf4f50fc3d7f9e503611bce470.zip external_webkit-903d2ec97b2ac9cf4f50fc3d7f9e503611bce470.tar.gz external_webkit-903d2ec97b2ac9cf4f50fc3d7f9e503611bce470.tar.bz2 | |
Merge "Don't use deleted Node object in setSizeScreenWidthAndScale"
| -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 1e406b1..1b53a6e 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -1359,7 +1359,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(); DBG_NAV_LOGD("nb:(x=%d,y=%d,w=%d," "h=%d)", newBounds.x(), newBounds.y(), |