diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-10-14 11:32:00 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2010-10-14 11:32:00 -0700 |
| commit | 0497927b70603f5643e3eeb0ebe1d0843839b6ca (patch) | |
| tree | 5218366ea0308c0fdb330a8f779df4746909a2a0 /WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | a5ffb7c279df240a07658953e1bd5df6d0480cb6 (diff) | |
| download | external_webkit-0497927b70603f5643e3eeb0ebe1d0843839b6ca.zip external_webkit-0497927b70603f5643e3eeb0ebe1d0843839b6ca.tar.gz external_webkit-0497927b70603f5643e3eeb0ebe1d0843839b6ca.tar.bz2 | |
Fix crash bug when calling WebView::clearView()
Bug:3097149
Change-Id: I280c0ca0e534d46570d758267c1e78c561a5b955
Diffstat (limited to 'WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/GLWebViewState.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/GLWebViewState.cpp b/WebCore/platform/graphics/android/GLWebViewState.cpp index 1a7ba6c..21836e1 100644 --- a/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -89,12 +89,14 @@ void GLWebViewState::setBaseLayer(BaseLayerAndroid* layer, IntRect& rect) { android::Mutex::Autolock lock(m_baseLayerLock); m_baseLayer = layer; - m_baseLayer->setGLWebViewState(this); - m_invalidatedRect.set(rect); - m_currentPictureCounter++; m_extra = 0; delete m_navLayer; m_navLayer = 0; + if (m_baseLayer) { + m_baseLayer->setGLWebViewState(this); + m_invalidatedRect.set(rect); + m_currentPictureCounter++; + } XLOG("%x setBaseLayer %x (%d)", this, layer, m_currentPictureCounter); } |