Title: [215185] trunk/Source/WebCore
- Revision
- 215185
- Author
- [email protected]
- Date
- 2017-04-10 10:28:02 -0700 (Mon, 10 Apr 2017)
Log Message
Unreviewed, rolling out r215175.
This change caused a flaky crash in existing media tests.
Reverted changeset:
"Add fallback fonts to video captions stylesheet."
https://bugs.webkit.org/show_bug.cgi?id=170495
http://trac.webkit.org/changeset/215175
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215184 => 215185)
--- trunk/Source/WebCore/ChangeLog 2017-04-10 17:07:44 UTC (rev 215184)
+++ trunk/Source/WebCore/ChangeLog 2017-04-10 17:28:02 UTC (rev 215185)
@@ -1,3 +1,15 @@
+2017-04-10 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r215175.
+
+ This change caused a flaky crash in existing media tests.
+
+ Reverted changeset:
+
+ "Add fallback fonts to video captions stylesheet."
+ https://bugs.webkit.org/show_bug.cgi?id=170495
+ http://trac.webkit.org/changeset/215175
+
2017-04-10 Wenson Hsieh <[email protected]>
Data interaction on an image enclosed by an anchor should vend the anchor's URL
Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (215184 => 215185)
--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2017-04-10 17:07:44 UTC (rev 215184)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2017-04-10 17:28:02 UTC (rev 215185)
@@ -83,8 +83,6 @@
SOFT_LINK_AVF_FRAMEWORK_IMPORT(CoreText, CTFontDescriptorCopyAttribute, CFTypeRef, (CTFontDescriptorRef descriptor, CFStringRef attribute), (descriptor, attribute));
SOFT_LINK_AVF_POINTER(CoreText, kCTFontNameAttribute, CFStringRef)
#define kCTFontNameAttribute getkCTFontNameAttribute()
-SOFT_LINK_AVF_POINTER(CoreText, kCTFontCascadeListAttribute, CFStringRef)
-#define kCTFontCascadeListAttribute getkCTFontCascadeListAttribute()
#define CTFontDescriptorCopyAttribute softLink_CTFontDescriptorCopyAttribute
@@ -426,7 +424,7 @@
RetainPtr<CFTypeRef> name = adoptCF(CTFontDescriptorCopyAttribute(font.get(), kCTFontNameAttribute));
if (!name)
return emptyString();
-
+
StringBuilder builder;
builder.append(getPropertyNameString(CSSPropertyFontFamily));
@@ -433,17 +431,6 @@
builder.appendLiteral(": \"");
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");
builder.append(';');
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
