diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-20 13:46:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-20 13:46:43 -0700 |
| commit | fc7f71bad1fe01396717f3425429f04cb009f741 (patch) | |
| tree | 1e219827e6176649d51b59ab0ffaebee312433c2 /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | bdf35d43ef1b9e7b9d6ed59f3783532920295d3b (diff) | |
| parent | 50034a4c4b41e0e3c99ec5a4ce8c6673190e20ac (diff) | |
| download | external_webkit-fc7f71bad1fe01396717f3425429f04cb009f741.zip external_webkit-fc7f71bad1fe01396717f3425429f04cb009f741.tar.gz external_webkit-fc7f71bad1fe01396717f3425429f04cb009f741.tar.bz2 | |
am 50034a4c: am 903d2ec9: Merge "Don\'t use deleted Node object in setSizeScreenWidthAndScale"
* commit '50034a4c4b41e0e3c99ec5a4ce8c6673190e20ac':
Don't use deleted Node object in setSizeScreenWidthAndScale
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
| -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 679dd97..b0317c06 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -1208,7 +1208,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)) { |