From 0497927b70603f5643e3eeb0ebe1d0843839b6ca Mon Sep 17 00:00:00 2001
From: Nicolas Roard <nicolas@android.com>
Date: Thu, 14 Oct 2010 11:32:00 -0700
Subject: Fix crash bug when calling WebView::clearView()

Bug:3097149
Change-Id: I280c0ca0e534d46570d758267c1e78c561a5b955
---
 WebCore/platform/graphics/android/GLWebViewState.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'WebCore/platform/graphics/android/GLWebViewState.cpp')

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);
 }
 
-- 
cgit v1.1