diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 10:11:43 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:14:42 +0100 |
| commit | e78cbe89e6f337f2f1fe40315be88f742b547151 (patch) | |
| tree | d778000b84a04f24bbad50c7fa66244365e960e9 /WebCore/platform/graphics/chromium/FontCacheLinux.cpp | |
| parent | 7b582e96e4e909ed7dba1e07153d20fbddaec3f7 (diff) | |
| download | external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.zip external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.gz external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.bz2 | |
Merge WebKit at r60074: Initial merge by git
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
Diffstat (limited to 'WebCore/platform/graphics/chromium/FontCacheLinux.cpp')
| -rw-r--r-- | WebCore/platform/graphics/chromium/FontCacheLinux.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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(); } |