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

Timestamp:

Jan 24, 2016, 9:23:49 PM (9 years ago)

Author:

[email protected]

Message:

[Font Loading] General cleanup
​https://bugs.webkit.org/show_bug.cgi?id=153403

Reviewed by Darin Adler.

It turns out that CSSFontFaceSource::m_hasExternalSVGFont exactly equals
whether or not CSSFontFaceSource::m_font is a CachedSVGFont. Therefore,
the variable is redundant.

In addition, it was being passed to functions on CSSFontFaceSource::m_font,
which means it was always true inside the CachedSVGFont subclass and
always false for the CachedFont. Therefore, there is no reason pass this
variable to these functions because its value can be determined at
authorship time.

No new tests because there is no behavior change.

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::font):
(WebCore::CSSFontFaceSource::CSSFontFaceSource): Deleted.

• css/CSSFontFaceSource.h:
• css/CSSFontSelector.cpp:

(WebCore::createFontFace):

• loader/cache/CachedFont.cpp:

(WebCore::CachedFont::ensureCustomFontData):
(WebCore::CachedFont::createFont):

• loader/cache/CachedFont.h:
• loader/cache/CachedSVGFont.cpp:

(WebCore::CachedSVGFont::createFont):
(WebCore::CachedSVGFont::ensureCustomFontData):

• loader/cache/CachedSVGFont.h:
• platform/network/HTTPParsers.cpp:

(WebCore::isValidHTTPToken):

• xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::uppercaseKnownHTTPMethod):

File:

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

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -58 +58 @@
     , m_font(font)
     , m_face(0)
-#if ENABLE(SVG_FONTS)
-    , m_hasExternalSVGFont(false)
-#endif
 {
     if (m_font)
@@ -120 +117 @@
     if (!m_font || m_font->isLoaded()) {
         if (m_font) {
-            bool hasExternalSVGFont = false;
-#if ENABLE(SVG_FONTS)
-            hasExternalSVGFont = m_hasExternalSVGFont;
-#endif
-            if (!m_font->ensureCustomFontData(hasExternalSVGFont, m_string))
+            if (!m_font->ensureCustomFontData(m_string))
                 return nullptr;
 
-            font = m_font->createFont(fontDescription, m_string, syntheticBold, syntheticItalic, hasExternalSVGFont, fontFaceFeatures, fontFaceVariantSettings);
+            font = m_font->createFont(fontDescription, m_string, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings);
         } else {
 #if ENABLE(SVG_FONTS)
@@ -165 +158 @@
 }
 
+#if ENABLE(SVG_FONTS)
+bool CSSFontFaceSource::isSVGFontFaceSource() const
+{
+    return m_svgFontFaceElement || is<CachedSVGFont>(m_font.get());
+}
+#endif
+
 #if ENABLE(FONT_LOAD_EVENTS)
 bool CSSFontFaceSource::isDecodeError() const