From e78cbe89e6f337f2f1fe40315be88f742b547151 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 26 May 2010 10:11:43 +0100
Subject: Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
---
 WebCore/platform/graphics/chromium/FontCacheLinux.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'WebCore/platform/graphics/chromium/FontCacheLinux.cpp')

diff --git a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
index ececd13..53f4a52 100644
--- a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
+++ b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
@@ -128,9 +128,10 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD
                 break;
             }
         }
-        // if we fall out of the loop, it's ok for name to still be 0
-    }
-    else {    // convert the name to utf8
+        if (!name)
+            name = "";
+    } else {
+        // convert the name to utf8
         s = family.string().utf8();
         name = s.data();
     }
-- 
cgit v1.1