Changeset 218264 in webkit for trunk/Source/WebCore/css/CSSFontFaceSource.cpp

Timestamp:

Jun 14, 2017, 9:40:27 AM (8 years ago)

Author:

Matt Lewis

Message:

Unreviewed, rolling out r218157.

This patch caused multiple API failures on iOS Simulator.

Reverted changeset:

"@font-face rules with invalid primary fonts never download
their secondary fonts"
​https://bugs.webkit.org/show_bug.cgi?id=173138
​http://trac.webkit.org/changeset/218157

File:

• trunk/Source/WebCore/css/CSSFontFaceSource.cpp (modified) (2 diffs)

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -121 +121 @@
         return;
 
-    if (m_font->errorOccurred() || !m_font->ensureCustomFontData(m_familyNameOrURI))
+    if (m_font->errorOccurred())
         setStatus(Status::Failure);
     else
@@ -194 +194 @@
 
     if (m_font) {
-        auto success = m_font->ensureCustomFontData(m_familyNameOrURI);
-        ASSERT_UNUSED(success, success);
-            
-        ASSERT(status() == Status::Success);
-        auto result = m_font->createFont(fontDescription, m_familyNameOrURI, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities);
-        ASSERT(result);
-        return result;
+        if (!m_font->ensureCustomFontData(m_familyNameOrURI))
+            return nullptr;
+
+        return m_font->createFont(fontDescription, m_familyNameOrURI, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities);
     }