Changeset 48787 in webkit

Timestamp:

Sep 25, 2009, 11:43:25 PM (16 years ago)

Author:

mitz@apple.com

Message:

REGRESSION (r48775) FontList.plist written by TOT WebKit causes Safari 4
to crash on launch
​https://bugs.webkit.org/show_bug.cgi?id=29759

Reviewed by Sam Weinig.

• platform/graphics/win/FontDatabase.cpp:

(WebCore::writeFontDatabaseToPlist): Reverted to saving the CG font DB
property list at the root of FontList.plist, but with an additional
key for the last value of the Fonts registry key.
(WebCore::populateFontDatabase): Pass the FontList.plist in its entirety
to populatFontDatabaseFromPlist.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/FontDatabase.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-25  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        REGRESSION (r48775) FontList.plist written by TOT WebKit causes Safari 4
+        to crash on launch
+        https://bugs.webkit.org/show_bug.cgi?id=29759
+
+        * platform/graphics/win/FontDatabase.cpp:
+        (WebCore::writeFontDatabaseToPlist): Reverted to saving the CG font DB
+        property list at the root of FontList.plist, but with an additional
+        key for the last value of the Fonts registry key.
+        (WebCore::populateFontDatabase): Pass the FontList.plist in its entirety
+        to populatFontDatabaseFromPlist.
+
 2009-09-25  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/platform/graphics/win/FontDatabase.cpp

@@ -125 +125 @@
 }
 
-static CFStringRef cgFontDBKey()
-{
-    static CFStringRef key = CFSTR("WebKitCGFontDB");
-    return key;
-}
-
 static void writeFontDatabaseToPlist(CFPropertyListRef cgFontDBPropertyList, CFPropertyListRef filenamesFromRegistry)
 {
-    RetainPtr<CFMutableDictionaryRef> dictionary(AdoptCF, CFDictionaryCreateMutable(kCFAllocatorDefault, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
-
-    if (cgFontDBPropertyList)
-        CFDictionarySetValue(dictionary.get(), cgFontDBKey(), cgFontDBPropertyList);
-    if (filenamesFromRegistry)
+    if (!cgFontDBPropertyList)
+        return;
+
+    RetainPtr<CFDataRef> data;
+
+    if (!filenamesFromRegistry || CFGetTypeID(cgFontDBPropertyList) != CFDictionaryGetTypeID())
+        data.adoptCF(CFPropertyListCreateXMLData(kCFAllocatorDefault, cgFontDBPropertyList));
+    else {
+        RetainPtr<CFMutableDictionaryRef> dictionary(AdoptCF, CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 2, static_cast<CFDictionaryRef>(cgFontDBPropertyList)));
         CFDictionarySetValue(dictionary.get(), fontFilenamesFromRegistryKey(), filenamesFromRegistry);
-
-    RetainPtr<CFDataRef> data(AdoptCF, CFPropertyListCreateXMLData(kCFAllocatorDefault, dictionary.get()));
+        data.adoptCF(CFPropertyListCreateXMLData(kCFAllocatorDefault, dictionary.get()));
+    }
+
     if (!data)
         return;
@@ -202 +201 @@
 
     if (!registryChanged && !systemHasFontsNewerThanFontsPlist()) {
-        RetainPtr<CFPropertyListRef> cgFontDBPropertyList;
-        if (propertyList) {
-            if (CFGetTypeID(propertyList.get()) == CFDictionaryGetTypeID()) {
-                CFDictionaryRef dictionary = static_cast<CFDictionaryRef>(propertyList.get());
-                cgFontDBPropertyList = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionary, cgFontDBKey()));
-            }
-            // Older versions of WebKit stored the CG font DB property list at the root of the property list.
-            if (!cgFontDBPropertyList)
-                cgFontDBPropertyList = propertyList;
-        }
-
-        if (populateFontDatabaseFromPlist(cgFontDBPropertyList.get()))
+        if (populateFontDatabaseFromPlist(propertyList.get()))
             return;
     }