Changeset 215175 in webkit

Timestamp:

Apr 10, 2017 3:01:46 AM (7 years ago)

Author:

pvollan@apple.com

Message:

Add fallback fonts to video captions stylesheet.
​https://bugs.webkit.org/show_bug.cgi?id=170495

Reviewed by Myles C. Maxfield.

The kCTFontCascadeListAttribute key is used to obtain the cascade list for a font reference.

I have not added a test, since CaptionUserPreferences::testingMode() returns true when running tests,
preventing this code path from being executed.

• page/CaptionUserPreferencesMediaAF.cpp:

(WebCore::CaptionUserPreferencesMediaAF::captionsDefaultFontCSS):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/CaptionUserPreferencesMediaAF.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-10  Per Arne Vollan  <pvollan@apple.com>
+
+        Add fallback fonts to video captions stylesheet.
+        https://bugs.webkit.org/show_bug.cgi?id=170495
+
+        Reviewed by Myles C. Maxfield.
+
+        The kCTFontCascadeListAttribute key is used to obtain the cascade list for a font reference.
+
+        I have not added a test, since CaptionUserPreferences::testingMode() returns true when running tests,
+        preventing this code path from being executed.
+
+        * page/CaptionUserPreferencesMediaAF.cpp:
+        (WebCore::CaptionUserPreferencesMediaAF::captionsDefaultFontCSS):
+
 2017-04-10  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp

@@ -84 +84 @@
 SOFT_LINK_AVF_POINTER(CoreText, kCTFontNameAttribute, CFStringRef)
 #define kCTFontNameAttribute getkCTFontNameAttribute()
+SOFT_LINK_AVF_POINTER(CoreText, kCTFontCascadeListAttribute, CFStringRef)
+#define kCTFontCascadeListAttribute getkCTFontCascadeListAttribute()
 
 #define CTFontDescriptorCopyAttribute softLink_CTFontDescriptorCopyAttribute
@@ -425 +427 @@
     if (!name)
         return emptyString();
-    
+
     StringBuilder builder;
     
@@ -432 +434 @@
     builder.append(static_cast<CFStringRef>(name.get()));
     builder.append('"');
+
+    auto cascadeList = adoptCF(static_cast<CFArrayRef>(CTFontDescriptorCopyAttribute(font.get(), kCTFontCascadeListAttribute)));
+
+    for (CFIndex i = 0; i < CFArrayGetCount(cascadeList.get()); i++) {
+        auto fontCascade = static_cast<CTFontDescriptorRef>(CFArrayGetValueAtIndex(cascadeList.get(), i));
+        auto fontCascadeName = adoptCF(CTFontDescriptorCopyAttribute(fontCascade, kCTFontNameAttribute));
+        builder.append(", \"");
+        builder.append(static_cast<CFStringRef>(fontCascadeName.get()));
+        builder.append('"');
+    }
+    
     if (behavior == kMACaptionAppearanceBehaviorUseValue)
         builder.appendLiteral(" !important");