Changeset 178028 in webkit

Timestamp:

Jan 7, 2015 1:51:48 AM (9 years ago)

Author:

Antti Koivisto

Message:

Use HashMap instead of CFDictionary for composite font reference map
​https://bugs.webkit.org/show_bug.cgi?id=140150

Reviewed by Geoff Garen.

Use WebKit types. Also use USE(APPKIT) consistently for this feature.

• platform/graphics/SimpleFontData.cpp:

(WebCore::SimpleFontData::DerivedFontData::~DerivedFontData):

The whole desctructor gets handled implicitly.

• platform/graphics/SimpleFontData.h:
• platform/graphics/mac/GlyphPageMac.cpp:

(WebCore::GlyphPage::mayUseMixedFontDataWhenFilling):
(WebCore::GlyphPage::fill):

• platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore::SimpleFontData::compositeFontReferenceFontData):
(WebCore::SimpleFontData::getCompositeFontReferenceFontData): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/SimpleFontData.cpp (modified) (1 diff)
• platform/graphics/SimpleFontData.h (modified) (2 diffs)
• platform/graphics/mac/GlyphPageMac.cpp (modified) (3 diffs)
• platform/graphics/mac/SimpleFontDataMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-06  Antti Koivisto  <antti@apple.com>
+
+        Use HashMap instead of CFDictionary for composite font reference map
+        https://bugs.webkit.org/show_bug.cgi?id=140150
+
+        Reviewed by Geoff Garen.
+
+        Use WebKit types. Also use USE(APPKIT) consistently for this feature.
+
+        * platform/graphics/SimpleFontData.cpp:
+        (WebCore::SimpleFontData::DerivedFontData::~DerivedFontData):
+
+            The whole desctructor gets handled implicitly.
+
+        * platform/graphics/SimpleFontData.h:
+        * platform/graphics/mac/GlyphPageMac.cpp:
+        (WebCore::GlyphPage::mayUseMixedFontDataWhenFilling):
+        (WebCore::GlyphPage::fill):
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::compositeFontReferenceFontData):
+        (WebCore::SimpleFontData::getCompositeFontReferenceFontData): Deleted.
+
 2015-01-07  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp

@@ -389 +389 @@
 SimpleFontData::DerivedFontData::~DerivedFontData()
 {
-#if PLATFORM(COCOA)
-    if (compositeFontReferences) {
-        // FIXME: Why don't we use WebKit types here?
-        CFDictionaryRef dictionary = CFDictionaryRef(compositeFontReferences.get());
-        CFIndex count = CFDictionaryGetCount(dictionary);
-        if (count > 0) {
-            Vector<SimpleFontData*, 2> stash(count);
-            SimpleFontData** fonts = stash.data();
-            CFDictionaryGetKeysAndValues(dictionary, 0, (const void **)fonts);
-            // This deletes the fonts.
-            while (count-- > 0 && *fonts)
-                adoptRef(*fonts++);
-        }
-    }
-#endif
 }
 

trunk/Source/WebCore/platform/graphics/SimpleFontData.h

@@ -188 +188 @@
 
 #if USE(APPKIT)
-    const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
+    const SimpleFontData* compositeFontReferenceFontData(NSFont *key) const;
     NSFont* getNSFont() const { return m_platformData.nsFont(); }
 #endif
@@ -296 +296 @@
         RefPtr<SimpleFontData> uprightOrientation;
         RefPtr<SimpleFontData> nonSyntheticItalic;
-#if PLATFORM(COCOA)
-        mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
+#if USE(APPKIT)
+        HashMap<NSFont*, RefPtr<SimpleFontData>> compositeFontReferences;
 #endif
     };

trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp

@@ -58 +58 @@
 bool GlyphPage::mayUseMixedFontDataWhenFilling(const UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
 {
-    // FIXME: This could be smarter if the logic currently in GlyphPage::fill() got to make the decision about what kind of GlyphPage to construct.
+#if USE(APPKIT)
+    // FIXME: This is only really needed for composite font references.
     return shouldUseCoreText(buffer, bufferLength, fontData);
+#else
+    return false;
+#endif
 }
 
@@ -155 +159 @@
                         }
                     }
-#if !PLATFORM(IOS)
+#if USE(APPKIT)
                 } else {
-                    const SimpleFontData* runSimple = fontData->getCompositeFontReferenceFontData((NSFont *)runFont);
+                    const SimpleFontData* runSimple = fontData->compositeFontReferenceFontData((NSFont *)runFont);
                     if (runSimple) {
                         for (CFIndex i = 0; i < glyphCount; ++i) {
@@ -170 +174 @@
                         }
                     }
-#endif // !PLATFORM(IOS)
+#endif
                 }
             }

trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

@@ -86 +86 @@
 }
 
-const SimpleFontData* SimpleFontData::getCompositeFontReferenceFontData(NSFont *key) const
-{
-    if (key && !CFEqual(adoptCF(CTFontCopyPostScriptName(CTFontRef(key))).get(), CFSTR("LastResort"))) {
-        if (!m_derivedFontData)
-            m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
-        if (!m_derivedFontData->compositeFontReferences)
-            m_derivedFontData->compositeFontReferences = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, NULL));
-        else {
-            const SimpleFontData* found = static_cast<const SimpleFontData*>(CFDictionaryGetValue(m_derivedFontData->compositeFontReferences.get(), static_cast<const void *>(key)));
-            if (found)
-                return found;
-        }
-        if (CFMutableDictionaryRef dictionary = m_derivedFontData->compositeFontReferences.get()) {
-            bool isUsingPrinterFont = platformData().isPrinterFont();
-            NSFont *substituteFont = isUsingPrinterFont ? [key printerFont] : [key screenFont];
-
-            CTFontSymbolicTraits traits = CTFontGetSymbolicTraits((CTFontRef)substituteFont);
-            bool syntheticBold = platformData().syntheticBold() && !(traits & kCTFontBoldTrait);
-            bool syntheticOblique = platformData().syntheticOblique() && !(traits & kCTFontItalicTrait);
-
-            FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().widthVariant());
-            if (RefPtr<SimpleFontData> value = adoptRef(new SimpleFontData(substitutePlatform, isCustomFont()))) {
-                SimpleFontData* valuePtr = value.get();
-                CFDictionaryAddValue(dictionary, key, value.release().leakRef());
-                return valuePtr;
-            }
-        }
-    }
-    return 0;
+const SimpleFontData* SimpleFontData::compositeFontReferenceFontData(NSFont *key) const
+{
+    if (!key || CFEqual(adoptCF(CTFontCopyPostScriptName(CTFontRef(key))).get(), CFSTR("LastResort")))
+        return nullptr;
+
+    if (!m_derivedFontData)
+        m_derivedFontData = std::make_unique<DerivedFontData>(isCustomFont());
+
+    auto addResult = m_derivedFontData->compositeFontReferences.add(key, nullptr);
+    if (addResult.isNewEntry) {
+        bool isUsingPrinterFont = platformData().isPrinterFont();
+        NSFont *substituteFont = isUsingPrinterFont ? [key printerFont] : [key screenFont];
+
+        CTFontSymbolicTraits traits = CTFontGetSymbolicTraits((CTFontRef)substituteFont);
+        bool syntheticBold = platformData().syntheticBold() && !(traits & kCTFontBoldTrait);
+        bool syntheticOblique = platformData().syntheticOblique() && !(traits & kCTFontItalicTrait);
+
+        FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().widthVariant());
+        addResult.iterator->value = SimpleFontData::create(substitutePlatform, isCustomFont());
+    }
+    return addResult.iterator->value.get();
 }