commit a8185118f3bc09b1874f02cd0b95a6397723f31b
author Grace Kloba <klobag@google.com> Fri Sep 11 11:32:27 2009 -0700
committer Grace Kloba <klobag@google.com> Fri Sep 11 11:32:27 2009 -0700
tree dbf9b98b4a19afb6b1b008926ab6a262711c3a0f
parent 8aafea2d231d98acf3fd26118f4b15e4ca1a1f11

Add more null checking to avoid the crash.

WebCore/dom/Document.cpp

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index c510669..e86cbc0 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -548,11 +548,12 @@
     if (m_docType)
         m_docType->setDocument(this);
 #ifdef ANDROID_META_SUPPORT
-    if (!ownerElement() && m_docType->publicId().startsWith("-//wapforum//dtd xhtml mobile 1.", false)) {
+    if (m_docType && !ownerElement()
+            && m_docType->publicId().startsWith("-//wapforum//dtd xhtml mobile 1.", false)) {
         // fit mobile sites directly in the screen
-        frame()->settings()->setMetadataSettings("width", "device-width");
-        FrameView* frameView = view();
-        if (frameView)
+        if (Frame *f = frame())
+            f->settings()->setMetadataSettings("width", "device-width");
+        if (FrameView* frameView = view())
             android::WebViewCore::getWebViewCore(frameView)->updateViewport();
     }
 #endif