commit e928bda36c88e290dbae3f68b52e2fdeb9fa6e9e
author Cary Clark <cary@android.com> Mon May 04 08:55:10 2009 -0400
committer Cary Clark <cary@android.com> Mon May 04 08:55:10 2009 -0400
tree 24d08a0ca8028b67f74d52612c165d0bb3fbb551
parent 7e863fe348e9e6044d2228a3a4752669cef73196

webcore pointer may be null in svg

Fix crash during frame deconstruction; the scrollview used
by svg may have a null pointer to webcore.

WebCore/page/Frame.cpp

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 0d1a27f..dcedaf5 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -232,7 +232,9 @@
     if (!view && m_view) {
         // FIXME(for Cary): This is moved from FrameAndroid destructor. Do we 
         // need to call removeFrameGeneration per Frame or per FrameView?
-        android::WebViewCore::getWebViewCore(m_view.get())->removeFrameGeneration(this);
+        android::WebViewCore* core = android::WebViewCore::getWebViewCore(m_view.get());
+        if (core)
+            core->removeFrameGeneration(this);
     }
 #endif