Speculative fix for http://b/issue?id=1377375 (crashing bug when opening a popup).

I wasn't able to repro the bug, but I've spent far too long trying to do so
already. This seems like the right fix. 

Will wait to see that it actually fixes the crash in the wild and then
upstream the change to webkit.
Review URL: http://codereview.chromium.org/4102

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2626 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 1 deletions

diff --git a/webkit/pending/CSSFontSelector.cpp b/webkit/pending/CSSFontSelector.cpp
index 52066a1..5c386bf 100644
--- a/webkit/pending/CSSFontSelector.cpp
+++ b/webkit/pending/CSSFontSelector.cpp
@@ -348,7 +348,12 @@ FontData* CSSFontSelector::getFontData(const FontDescription& fontDescription, c
     if (!face) {
         // If we were handed a generic family, but there was no match, go ahead and return the correct font based off our
         // settings.
-        const Settings* settings = m_document->frame()->settings();
+
+        const Frame* frame = m_document->frame();
+        if (!frame)
+            return 0;
+
+        const Settings* settings = frame->settings();
         AtomicString genericFamily;
         if (familyName == "-webkit-serif")
             genericFamily = settings->serifFontFamily();