<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214169] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214169">214169</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2017-03-20 05:02:50 -0700 (Mon, 20 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use CopyFontDescriptorWithStrokeForStyle to get correct stroke width for captions.
https://bugs.webkit.org/show_bug.cgi?id=169674
Reviewed by Eric Carlson.
Use the MediaAccessibility function MACopyFontDescriptorWithStrokeForStyle to get
correct video captions stroke width from a given font size.
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlTextTrackContainerElement::updateTextStrokeStyle):
(WebCore::MediaControlTextTrackContainerElement::updateTimerFired):
* html/shadow/MediaControlElements.h:
* page/CaptionUserPreferences.h:
(WebCore::CaptionUserPreferences::captionStrokeWidth):
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::captionStrokeWidth):
(WebCore::CaptionUserPreferencesMediaAF::captionsTextEdgeCSS):
(WebCore::CaptionUserPreferencesMediaAF::strokeWidth): Deleted.
* page/CaptionUserPreferencesMediaAF.h:
* platform/cf/MediaAccessibilitySoftLink.cpp:
* platform/cf/MediaAccessibilitySoftLink.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementsh">trunk/Source/WebCore/html/shadow/MediaControlElements.h</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesh">trunk/Source/WebCore/page/CaptionUserPreferences.h</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFh">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcfMediaAccessibilitySoftLinkcpp">trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcfMediaAccessibilitySoftLinkh">trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214168 => 214169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-20 10:01:59 UTC (rev 214168)
+++ trunk/Source/WebCore/ChangeLog 2017-03-20 12:02:50 UTC (rev 214169)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-03-20 Per Arne Vollan <pvollan@apple.com>
+
+ Use CopyFontDescriptorWithStrokeForStyle to get correct stroke width for captions.
+ https://bugs.webkit.org/show_bug.cgi?id=169674
+
+ Reviewed by Eric Carlson.
+
+ Use the MediaAccessibility function MACopyFontDescriptorWithStrokeForStyle to get
+ correct video captions stroke width from a given font size.
+
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTextTrackContainerElement::updateTextStrokeStyle):
+ (WebCore::MediaControlTextTrackContainerElement::updateTimerFired):
+ * html/shadow/MediaControlElements.h:
+ * page/CaptionUserPreferences.h:
+ (WebCore::CaptionUserPreferences::captionStrokeWidth):
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::captionStrokeWidth):
+ (WebCore::CaptionUserPreferencesMediaAF::captionsTextEdgeCSS):
+ (WebCore::CaptionUserPreferencesMediaAF::strokeWidth): Deleted.
+ * page/CaptionUserPreferencesMediaAF.h:
+ * platform/cf/MediaAccessibilitySoftLink.cpp:
+ * platform/cf/MediaAccessibilitySoftLink.h:
+
</ins><span class="cx"> 2017-03-20 Emanuele Aina <emanuele.aina@collabora.com>
</span><span class="cx">
</span><span class="cx"> [Cairo] Ensure depth and stencil renderbuffers are created on GLESv2
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (214168 => 214169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2017-03-20 10:01:59 UTC (rev 214168)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2017-03-20 12:02:50 UTC (rev 214169)
</span><span class="lines">@@ -1230,6 +1230,37 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaControlTextTrackContainerElement::updateTextStrokeStyle()
+{
+ if (!document().page())
+ return;
+
+ HTMLMediaElement* mediaElement = parentMediaElement(this);
+ if (!mediaElement)
+ return;
+
+ String language;
+
+ // FIXME: Since it is possible to have more than one text track enabled, the following code may not find the correct language.
+ // The default UI only allows a user to enable one track at a time, so it should be OK for now, but we should consider doing
+ // this differently, see <https://bugs.webkit.org/show_bug.cgi?id=169875>.
+ auto& tracks = mediaElement->textTracks();
+ for (unsigned i = 0; i < tracks.length(); ++i) {
+ auto track = tracks.item(i);
+ if (track && track->mode() == TextTrack::Mode::Showing) {
+ language = track->validBCP47Language();
+ break;
+ }
+ }
+
+ float strokeWidth;
+ bool important;
+
+ // FIXME: find a way to set this property in the stylesheet like the other user style preferences, see <https://bugs.webkit.org/show_bug.cgi?id=169874>.
+ if (document().page()->group().captionPreferences().captionStrokeWidthForFont(m_fontSize, language, strokeWidth, important))
+ setInlineStyleProperty(CSSPropertyStrokeWidth, strokeWidth, CSSPrimitiveValue::CSS_PT, important);
+}
+
</ins><span class="cx"> void MediaControlTextTrackContainerElement::updateTimerFired()
</span><span class="cx"> {
</span><span class="cx"> if (!document().page())
</span><span class="lines">@@ -1240,6 +1271,7 @@
</span><span class="cx">
</span><span class="cx"> updateActiveCuesFontSize();
</span><span class="cx"> updateDisplay();
</span><ins>+ updateTextStrokeStyle();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaControlTextTrackContainerElement::updateTextTrackRepresentation()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (214168 => 214169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.h 2017-03-20 10:01:59 UTC (rev 214168)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h 2017-03-20 12:02:50 UTC (rev 214169)
</span><span class="lines">@@ -453,7 +453,8 @@
</span><span class="cx"> private:
</span><span class="cx"> void updateTimerFired();
</span><span class="cx"> void updateActiveCuesFontSize();
</span><del>-
</del><ins>+ void updateTextStrokeStyle();
+
</ins><span class="cx"> explicit MediaControlTextTrackContainerElement(Document&);
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferences.h (214168 => 214169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferences.h 2017-03-20 10:01:59 UTC (rev 214168)
+++ trunk/Source/WebCore/page/CaptionUserPreferences.h 2017-03-20 12:02:50 UTC (rev 214169)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx">
</span><span class="cx"> virtual float captionFontSizeScaleAndImportance(bool& important) const { important = false; return 0.05f; }
</span><span class="cx">
</span><ins>+ virtual bool captionStrokeWidthForFont(float, const String&, float&, bool&) const { return false; }
+
</ins><span class="cx"> virtual String captionsStyleSheetOverride() const { return m_captionsStyleSheetOverride; }
</span><span class="cx"> virtual void setCaptionsStyleSheetOverride(const String&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (214168 => 214169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2017-03-20 10:01:59 UTC (rev 214168)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2017-03-20 12:02:50 UTC (rev 214169)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "TextTrackList.h"
</span><span class="cx"> #include "UserStyleSheetTypes.h"
</span><span class="cx"> #include "VTTCue.h"
</span><ins>+#include <algorithm>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/PlatformUserPreferredLanguages.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -357,28 +358,28 @@
</span><span class="cx"> return builder.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String CaptionUserPreferencesMediaAF::strokeWidth() const
</del><ins>+bool CaptionUserPreferencesMediaAF::captionStrokeWidthForFont(float fontSize, const String& language, float& strokeWidth, bool& important) const
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<const String> strokeWidthDefault(ASCIILiteral(" .03em "));
</del><ins>+ if (!canLoad_MediaAccessibility_MACaptionAppearanceCopyFontDescriptorWithStrokeForStyle())
+ return false;
</ins><span class="cx">
</span><del>- if (!MACaptionFontAttributeStrokeWidth && !canLoad_MediaAccessibility_MACaptionFontAttributeStrokeWidth())
- return strokeWidthDefault;
</del><ins>+ MACaptionAppearanceBehavior behavior;
+ auto trackLanguage = language.createCFString();
+ CGFloat strokeWidthPt;
</ins><span class="cx">
</span><del>- MACaptionAppearanceBehavior behavior;
</del><ins>+ auto fontDescriptor = adoptCF(MACaptionAppearanceCopyFontDescriptorWithStrokeForStyle(kMACaptionAppearanceDomainUser, &behavior, kMACaptionAppearanceFontStyleDefault, trackLanguage.get(), fontSize, &strokeWidthPt));
</ins><span class="cx">
</span><del>- auto font = adoptCF(MACaptionAppearanceCopyFontDescriptorForStyle(kMACaptionAppearanceDomainUser, &behavior, kMACaptionAppearanceFontStyleDefault));
- if (!font)
- return strokeWidthDefault;
</del><ins>+ if (!fontDescriptor)
+ return false;
+
+ strokeWidth = strokeWidthPt;
+ important = behavior == kMACaptionAppearanceBehaviorUseValue;
</ins><span class="cx">
</span><del>- auto strokeWidthAttribute = adoptCF(CTFontDescriptorCopyAttribute(font.get(), MACaptionFontAttributeStrokeWidth));
- if (!strokeWidthAttribute)
- return strokeWidthDefault;
</del><ins>+ // Currently, MACaptionAppearanceCopyFontDescriptorWithStrokeForStyle is returning very large stroke widths, see <rdar://problem/31126629>.
+ // To avoid stroke widths that are too large, we set a maximum value of 10% of the font size.
+ strokeWidth = std::min(strokeWidth, fontSize / 10.0f);
</ins><span class="cx">
</span><del>- int strokeWidth = 0;
- if (!CFNumberGetValue(static_cast<CFNumberRef>(strokeWidthAttribute.get()), kCFNumberIntType, &strokeWidth))
- return strokeWidthDefault;
-
- return String::format(" %dpx ", strokeWidth);
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CaptionUserPreferencesMediaAF::captionsTextEdgeCSS() const
</span><span class="lines">@@ -403,11 +404,7 @@
</span><span class="cx"> appendCSS(builder, CSSPropertyTextShadow, makeString(edgeStyleDropShadow.get(), " black"), important);
</span><span class="cx">
</span><span class="cx"> if (textEdgeStyle == kMACaptionAppearanceTextEdgeStyleDropShadow || textEdgeStyle == kMACaptionAppearanceTextEdgeStyleUniform) {
</span><del>- if (textEdgeStyle == kMACaptionAppearanceTextEdgeStyleDropShadow)
- appendCSS(builder, CSSPropertyWebkitTextStroke, ".03em black", important);
- else
- appendCSS(builder, CSSPropertyWebkitTextStroke, makeString(strokeWidth(), " black"), important);
-
</del><ins>+ appendCSS(builder, CSSPropertyWebkitTextStrokeColor, "black", important);
</ins><span class="cx"> appendCSS(builder, CSSPropertyPaintOrder, getValueName(CSSValueStroke), important);
</span><span class="cx"> appendCSS(builder, CSSPropertyStrokeLinejoin, getValueName(CSSValueRound), important);
</span><span class="cx"> appendCSS(builder, CSSPropertyStrokeLinecap, getValueName(CSSValueRound), important);
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h (214168 => 214169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h 2017-03-20 10:01:59 UTC (rev 214168)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h 2017-03-20 12:02:50 UTC (rev 214169)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> bool userPrefersSubtitles() const override;
</span><span class="cx">
</span><span class="cx"> float captionFontSizeScaleAndImportance(bool&) const override;
</span><ins>+ bool captionStrokeWidthForFont(float fontSize, const String& language, float& strokeWidth, bool& important) const override;
</ins><span class="cx">
</span><span class="cx"> void setInterestedInCaptionPreferenceChanges() override;
</span><span class="cx">
</span><span class="lines">@@ -80,7 +81,6 @@
</span><span class="cx"> Color captionsTextColor(bool&) const;
</span><span class="cx"> String captionsDefaultFontCSS() const;
</span><span class="cx"> String windowRoundedCornerRadiusCSS() const;
</span><del>- String strokeWidth() const;
</del><span class="cx"> String captionsTextEdgeCSS() const;
</span><span class="cx"> String colorPropertyCSS(CSSPropertyID, const Color&, bool) const;
</span><span class="cx"> Timer m_updateStyleSheetTimer;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfMediaAccessibilitySoftLinkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.cpp (214168 => 214169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.cpp 2017-03-20 10:01:59 UTC (rev 214168)
+++ trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.cpp 2017-03-20 12:02:50 UTC (rev 214169)
</span><span class="lines">@@ -53,9 +53,8 @@
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaAccessibility, MACaptionAppearanceCopySelectedLanguages, CFArrayRef, (MACaptionAppearanceDomain domain), (domain));
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaAccessibility, MACaptionAppearanceCopyPreferredCaptioningMediaCharacteristics, CFArrayRef, (MACaptionAppearanceDomain domain), (domain));
</span><span class="cx"> SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE(WebCore, MediaAccessibility, MAAudibleMediaCopyPreferredCharacteristics, CFArrayRef, (), ());
</span><del>-
</del><ins>+SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE(WebCore, MediaAccessibility, MACaptionAppearanceCopyFontDescriptorWithStrokeForStyle, CTFontDescriptorRef, (MACaptionAppearanceDomain domain, MACaptionAppearanceBehavior *behavior, MACaptionAppearanceFontStyle fontStyle, CFStringRef trackLanguage, CGFloat darwingPointSize, CGFloat *strokeWidthPt), (domain, behavior, fontStyle, trackLanguage, darwingPointSize, strokeWidthPt));
</ins><span class="cx"> SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, MediaAccessibility, kMAXCaptionAppearanceSettingsChangedNotification, CFStringRef)
</span><span class="cx"> SOFT_LINK_CONSTANT_MAY_FAIL_FOR_SOURCE(WebCore, MediaAccessibility, kMAAudibleMediaSettingsChangedNotification, CFStringRef)
</span><del>-SOFT_LINK_CONSTANT_MAY_FAIL_FOR_SOURCE(WebCore, MediaAccessibility, MACaptionFontAttributeStrokeWidth, CFStringRef)
</del><span class="cx">
</span><span class="cx"> #endif // HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfMediaAccessibilitySoftLinkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.h (214168 => 214169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.h 2017-03-20 10:01:59 UTC (rev 214168)
+++ trunk/Source/WebCore/platform/cf/MediaAccessibilitySoftLink.h 2017-03-20 12:02:50 UTC (rev 214169)
</span><span class="lines">@@ -65,13 +65,12 @@
</span><span class="cx"> #define MACaptionAppearanceCopyPreferredCaptioningMediaCharacteristics softLink_MediaAccessibility_MACaptionAppearanceCopyPreferredCaptioningMediaCharacteristics
</span><span class="cx"> SOFT_LINK_FUNCTION_MAY_FAIL_FOR_HEADER(WebCore, MediaAccessibility, MAAudibleMediaCopyPreferredCharacteristics, CFArrayRef, (), ())
</span><span class="cx"> #define MAAudibleMediaCopyPreferredCharacteristics softLink_MediaAccessibility_MAAudibleMediaCopyPreferredCharacteristics
</span><del>-
</del><ins>+SOFT_LINK_FUNCTION_MAY_FAIL_FOR_HEADER(WebCore, MediaAccessibility, MACaptionAppearanceCopyFontDescriptorWithStrokeForStyle, CTFontDescriptorRef, (MACaptionAppearanceDomain domain, MACaptionAppearanceBehavior *behavior, MACaptionAppearanceFontStyle fontStyle, CFStringRef trackLanguage, CGFloat darwingPointSize, CGFloat *strokeWidthPt), (domain, behavior, fontStyle, trackLanguage, darwingPointSize, strokeWidthPt))
+#define MACaptionAppearanceCopyFontDescriptorWithStrokeForStyle softLink_MediaAccessibility_MACaptionAppearanceCopyFontDescriptorWithStrokeForStyle
</ins><span class="cx"> SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, MediaAccessibility, kMAXCaptionAppearanceSettingsChangedNotification, CFStringRef)
</span><span class="cx"> #define kMAXCaptionAppearanceSettingsChangedNotification get_MediaAccessibility_kMAXCaptionAppearanceSettingsChangedNotification()
</span><span class="cx"> SOFT_LINK_CONSTANT_MAY_FAIL_FOR_HEADER(WebCore, MediaAccessibility, kMAAudibleMediaSettingsChangedNotification, CFStringRef)
</span><span class="cx"> #define kMAAudibleMediaSettingsChangedNotification get_MediaAccessibility_kMAAudibleMediaSettingsChangedNotification()
</span><del>-SOFT_LINK_CONSTANT_MAY_FAIL_FOR_HEADER(WebCore, MediaAccessibility, MACaptionFontAttributeStrokeWidth, CFStringRef)
-#define MACaptionFontAttributeStrokeWidth get_MediaAccessibility_MACaptionFontAttributeStrokeWidth()
</del><span class="cx">
</span><span class="cx"> #endif // HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>