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

Timestamp:

May 14, 2016, 12:18:34 PM (9 years ago)

Author:

[email protected]

Message:

Support ArrayBufferViews in the CSS Font Loading API
​https://bugs.webkit.org/show_bug.cgi?id=157694
<rdar://problem/25554267>

Source/WebCore:

This patch adds a new mode to CSSFontFaceSource for immediate (ArrayBuffer) data.
Then, FontFace can simply be hooked up to this new mode.

Reviewed by Darin Adler.

Test: fast/text/css-font-loading-arraybuffer.html

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::CSSFontFaceSource):
(WebCore::CSSFontFaceSource::font):

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

(WebCore::FontFace::create):

• loader/cache/CachedFont.cpp:

(WebCore::CachedFont::ensureCustomFontData):
(WebCore::CachedFont::createCustomFontData):
(WebCore::CachedFont::createFont):
(WebCore::CachedFont::platformDataFromCustomData):

• loader/cache/CachedFont.h:

LayoutTests:

Reviewed by Darin Adler.

• fast/text/css-font-loading-arraybuffer-expected.txt: Added.
• fast/text/css-font-loading-arraybuffer.html: Added.

File:

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

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -35 +35 @@
 #include "Font.h"
 #include "FontCache.h"
+#include "FontCustomPlatformData.h"
 #include "FontDescription.h"
-
-#include "FontCustomPlatformData.h"
 #include "SVGToOTFFontConversion.h"
 
@@ -70 +69 @@
 }
 
-CSSFontFaceSource::CSSFontFaceSource(CSSFontFace& owner, const String& familyNameOrURI, CachedFont* font, SVGFontFaceElement* fontFace)
+CSSFontFaceSource::CSSFontFaceSource(CSSFontFace& owner, const String& familyNameOrURI, CachedFont* font, SVGFontFaceElement* fontFace, RefPtr<JSC::ArrayBufferView>&& arrayBufferView)
     : m_familyNameOrURI(familyNameOrURI)
     , m_font(font)
     , m_face(owner)
+    , m_immediateSource(WTFMove(arrayBufferView))
 #if ENABLE(SVG_FONTS)
     , m_svgFontFaceElement(fontFace)
@@ -138 +138 @@
 
     if (!m_font && !fontFaceElement) {
+        if (m_immediateSource) {
+            if (!m_immediateFontCustomPlatformData) {
+                bool wrapping;
+                RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<const char*>(m_immediateSource->baseAddress()), m_immediateSource->byteLength());
+                ASSERT(buffer);
+                m_immediateFontCustomPlatformData = CachedFont::createCustomFontData(*buffer, wrapping);
+            } if (!m_immediateFontCustomPlatformData)
+                return nullptr;
+            return Font::create(CachedFont::platformDataFromCustomData(*m_immediateFontCustomPlatformData, fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings), true);
+        }
+
         // We're local. Just return a Font from the normal cache.
         // We don't want to check alternate font family names here, so pass true as the checkingAlternateName parameter.