<!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>[213285] 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/213285">213285</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2017-03-02 10:08:41 -0800 (Thu, 02 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve consistency of captions rendering on Mac
https://bugs.webkit.org/show_bug.cgi?id=169071
Reviewed by Eric Carlson.
* page/CaptionUserPreferencesMediaAF.h:
(WebCore::CaptionUserPreferencesMediaAF::captionsEdgeColorForTextColor): Deleted.
(WebCore::CaptionUserPreferencesMediaAF::cssPropertyWithTextEdgeColor): Deleted.
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::appendCSS): Helper function to add a CSS rule with a provided StringBuilder.
(WebCore::CaptionUserPreferencesMediaAF::windowRoundedCornerRadiusCSS): Refactor to use
appendCSS.
(WebCore::CaptionUserPreferencesMediaAF::colorPropertyCSS): Ditto.
(WebCore::CaptionUserPreferencesMediaAF::captionsTextEdgeCSS): Update text edge styles.
- Add a blur to the shadow
- Drop shadow style includes 1px text border
- Always use black for the text edge color
Also convert the stroke rules to using the CSS property and values instead of straight strings.
(WebCore::CaptionUserPreferencesMediaAF::captionsStyleSheetOverride): Fly-by fix of a typo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213284 => 213285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-02 17:55:13 UTC (rev 213284)
+++ trunk/Source/WebCore/ChangeLog 2017-03-02 18:08:41 UTC (rev 213285)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-03-02 Jon Lee <jonlee@apple.com>
+
+ Improve consistency of captions rendering on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=169071
+
+ Reviewed by Eric Carlson.
+
+ * page/CaptionUserPreferencesMediaAF.h:
+ (WebCore::CaptionUserPreferencesMediaAF::captionsEdgeColorForTextColor): Deleted.
+ (WebCore::CaptionUserPreferencesMediaAF::cssPropertyWithTextEdgeColor): Deleted.
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::appendCSS): Helper function to add a CSS rule with a provided StringBuilder.
+ (WebCore::CaptionUserPreferencesMediaAF::windowRoundedCornerRadiusCSS): Refactor to use
+ appendCSS.
+ (WebCore::CaptionUserPreferencesMediaAF::colorPropertyCSS): Ditto.
+ (WebCore::CaptionUserPreferencesMediaAF::captionsTextEdgeCSS): Update text edge styles.
+ - Add a blur to the shadow
+ - Drop shadow style includes 1px text border
+ - Always use black for the text edge color
+ Also convert the stroke rules to using the CSS property and values instead of straight strings.
+ (WebCore::CaptionUserPreferencesMediaAF::captionsStyleSheetOverride): Fly-by fix of a typo.
+
</ins><span class="cx"> 2017-03-02 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Download attribute set to "*\" save file with name "example.com"
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (213284 => 213285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2017-03-02 17:55:13 UTC (rev 213284)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2017-03-02 18:08:41 UTC (rev 213285)
</span><span class="lines">@@ -327,6 +327,16 @@
</span><span class="cx">
</span><span class="cx"> return colorPropertyCSS(CSSPropertyColor, textColor, important);
</span><span class="cx"> }
</span><ins>+
+static void appendCSS(StringBuilder& builder, CSSPropertyID id, const String& value, bool important)
+{
+ builder.append(getPropertyNameString(id));
+ builder.append(':');
+ builder.append(value);
+ if (important)
+ builder.appendLiteral(" !important");
+ builder.append(';');
+}
</ins><span class="cx">
</span><span class="cx"> String CaptionUserPreferencesMediaAF::windowRoundedCornerRadiusCSS() const
</span><span class="cx"> {
</span><span class="lines">@@ -336,58 +346,14 @@
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><span class="cx"> StringBuilder builder;
</span><del>- builder.append(getPropertyNameString(CSSPropertyBorderRadius));
- builder.append(String::format(":%.02fpx", radius));
- if (behavior == kMACaptionAppearanceBehaviorUseValue)
- builder.appendLiteral(" !important");
- builder.append(';');
-
</del><ins>+ appendCSS(builder, CSSPropertyBorderRadius, String::format("%.02fpx", radius), behavior == kMACaptionAppearanceBehaviorUseValue);
</ins><span class="cx"> return builder.toString();
</span><span class="cx"> }
</span><del>-
-Color CaptionUserPreferencesMediaAF::captionsEdgeColorForTextColor(const Color& textColor) const
-{
- int distanceFromWhite = differenceSquared(textColor, Color::white);
- int distanceFromBlack = differenceSquared(textColor, Color::black);
-
- if (distanceFromWhite < distanceFromBlack)
- return textColor.dark();
-
- return textColor.light();
-}
</del><span class="cx">
</span><del>-String CaptionUserPreferencesMediaAF::cssPropertyWithTextEdgeColor(CSSPropertyID id, const String& value, const Color& textColor, bool important) const
-{
- StringBuilder builder;
-
- builder.append(getPropertyNameString(id));
- builder.append(':');
- builder.append(value);
- builder.append(' ');
- builder.append(captionsEdgeColorForTextColor(textColor).serialized());
- if (important)
- builder.appendLiteral(" !important");
- builder.append(';');
- if (id == CSSPropertyWebkitTextStroke) {
- builder.append(" paint-order: stroke;");
- builder.append(" stroke-linejoin: round;");
- builder.append(" stroke-linecap: round;");
- }
-
- return builder.toString();
-}
-
</del><span class="cx"> String CaptionUserPreferencesMediaAF::colorPropertyCSS(CSSPropertyID id, const Color& color, bool important) const
</span><span class="cx"> {
</span><span class="cx"> StringBuilder builder;
</span><del>-
- builder.append(getPropertyNameString(id));
- builder.append(':');
- builder.append(color.serialized());
- if (important)
- builder.appendLiteral(" !important");
- builder.append(';');
-
</del><ins>+ appendCSS(builder, id, color.serialized(), important);
</ins><span class="cx"> return builder.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -417,38 +383,37 @@
</span><span class="cx">
</span><span class="cx"> String CaptionUserPreferencesMediaAF::captionsTextEdgeCSS() const
</span><span class="cx"> {
</span><del>- static NeverDestroyed<const String> edgeStyleRaised(ASCIILiteral(" -.05em -.05em 0 "));
- static NeverDestroyed<const String> edgeStyleDepressed(ASCIILiteral(" .05em .05em 0 "));
- static NeverDestroyed<const String> edgeStyleDropShadow(ASCIILiteral(" .075em .075em 0 "));
</del><ins>+ static NeverDestroyed<const String> edgeStyleRaised(ASCIILiteral(" -.1em -.1em .16em "));
+ static NeverDestroyed<const String> edgeStyleDepressed(ASCIILiteral(" .1em .1em .16em "));
+ static NeverDestroyed<const String> edgeStyleDropShadow(ASCIILiteral(" 0 .1em .16em "));
</ins><span class="cx">
</span><del>- bool unused;
- Color color = captionsTextColor(unused);
- if (!color.isValid())
- color = Color { Color::black };
- color = captionsEdgeColorForTextColor(color);
-
</del><span class="cx"> MACaptionAppearanceBehavior behavior;
</span><span class="cx"> MACaptionAppearanceTextEdgeStyle textEdgeStyle = MACaptionAppearanceGetTextEdgeStyle(kMACaptionAppearanceDomainUser, &behavior);
</span><del>- switch (textEdgeStyle) {
- case kMACaptionAppearanceTextEdgeStyleUndefined:
- case kMACaptionAppearanceTextEdgeStyleNone:
</del><ins>+
+ if (textEdgeStyle == kMACaptionAppearanceTextEdgeStyleUndefined || textEdgeStyle == kMACaptionAppearanceTextEdgeStyleNone)
</ins><span class="cx"> return emptyString();
</span><del>-
- case kMACaptionAppearanceTextEdgeStyleRaised:
- return cssPropertyWithTextEdgeColor(CSSPropertyTextShadow, edgeStyleRaised, color, behavior == kMACaptionAppearanceBehaviorUseValue);
- case kMACaptionAppearanceTextEdgeStyleDepressed:
- return cssPropertyWithTextEdgeColor(CSSPropertyTextShadow, edgeStyleDepressed, color, behavior == kMACaptionAppearanceBehaviorUseValue);
- case kMACaptionAppearanceTextEdgeStyleDropShadow:
- return cssPropertyWithTextEdgeColor(CSSPropertyTextShadow, edgeStyleDropShadow, color, behavior == kMACaptionAppearanceBehaviorUseValue);
- case kMACaptionAppearanceTextEdgeStyleUniform:
- return cssPropertyWithTextEdgeColor(CSSPropertyWebkitTextStroke, strokeWidth(), color, behavior == kMACaptionAppearanceBehaviorUseValue);
-
- default:
- ASSERT_NOT_REACHED();
- break;
</del><ins>+
+ StringBuilder builder;
+ bool important = behavior == kMACaptionAppearanceBehaviorUseValue;
+ if (textEdgeStyle == kMACaptionAppearanceTextEdgeStyleRaised)
+ appendCSS(builder, CSSPropertyTextShadow, makeString(edgeStyleRaised.get(), " black"), important);
+ else if (textEdgeStyle == kMACaptionAppearanceTextEdgeStyleDepressed)
+ appendCSS(builder, CSSPropertyTextShadow, makeString(edgeStyleDepressed.get(), " black"), important);
+ else if (textEdgeStyle == kMACaptionAppearanceTextEdgeStyleDropShadow)
+ appendCSS(builder, CSSPropertyTextShadow, makeString(edgeStyleDropShadow.get(), " black"), important);
+
+ if (textEdgeStyle == kMACaptionAppearanceTextEdgeStyleDropShadow || textEdgeStyle == kMACaptionAppearanceTextEdgeStyleUniform) {
+ if (textEdgeStyle == kMACaptionAppearanceTextEdgeStyleDropShadow)
+ appendCSS(builder, CSSPropertyWebkitTextStroke, ".03em black", important);
+ else
+ appendCSS(builder, CSSPropertyWebkitTextStroke, makeString(strokeWidth(), " black"), important);
+
+ appendCSS(builder, CSSPropertyPaintOrder, getValueName(CSSValueStroke), important);
+ appendCSS(builder, CSSPropertyStrokeLinejoin, getValueName(CSSValueRound), important);
+ appendCSS(builder, CSSPropertyStrokeLinecap, getValueName(CSSValueRound), important);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return emptyString();
</del><ins>+ return builder.toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CaptionUserPreferencesMediaAF::captionsDefaultFontCSS() const
</span><span class="lines">@@ -620,7 +585,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</span><span class="cx">
</span><del>- LOG(Media, "CaptionUserPreferencesMediaAF::captionsStyleSheetOverrideSetting sytle to:\n%s", captionsOverrideStyleSheet.toString().utf8().data());
</del><ins>+ LOG(Media, "CaptionUserPreferencesMediaAF::captionsStyleSheetOverrideSetting style to:\n%s", captionsOverrideStyleSheet.toString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> return captionsOverrideStyleSheet.toString();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h (213284 => 213285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h 2017-03-02 17:55:13 UTC (rev 213284)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h 2017-03-02 18:08:41 UTC (rev 213285)
</span><span class="lines">@@ -79,11 +79,9 @@
</span><span class="cx"> String captionsTextColorCSS() const;
</span><span class="cx"> Color captionsTextColor(bool&) const;
</span><span class="cx"> String captionsDefaultFontCSS() const;
</span><del>- Color captionsEdgeColorForTextColor(const Color&) const;
</del><span class="cx"> String windowRoundedCornerRadiusCSS() const;
</span><span class="cx"> String strokeWidth() const;
</span><span class="cx"> String captionsTextEdgeCSS() const;
</span><del>- String cssPropertyWithTextEdgeColor(CSSPropertyID, const String&, const Color&, bool) const;
</del><span class="cx"> String colorPropertyCSS(CSSPropertyID, const Color&, bool) const;
</span><span class="cx"> Timer m_updateStyleSheetTimer;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>