<!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>[209116] trunk</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/209116">209116</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-29 20:26:20 -0800 (Tue, 29 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Localization
https://bugs.webkit.org/show_bug.cgi?id=165176
Patch by Antoine Quint <graouts@apple.com> on 2016-11-29
Reviewed by Dean Jackson.
Source/WebCore:
We add a new localization file for the purpose of modern media controls, since we may
require different strings than the legacy one.
* English.lproj/modern-media-controls-localized-strings.js: Added.
* Modules/modern-media-controls/controls/airplay-placard.js:
(AirplayPlacard):
* Modules/modern-media-controls/controls/pip-placard.js:
(PiPPlacard):
* Modules/modern-media-controls/main.js:
(UIString):
* Modules/modern-media-controls/media/status-support.js:
(StatusSupport.prototype.syncControl):
(StatusSupport):
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::mediaControlsScript):
LayoutTests:
Using the modern media controls module loader to ensure we pick up main.js,
and also because it's the right thing to do.
* media/modern-media-controls/airplay-placard/airplay-placard.html:
* media/modern-media-controls/pip-placard/pip-placard.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsairplayplacardairplayplacardhtml">trunk/LayoutTests/media/modern-media-controls/airplay-placard/airplay-placard.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolspipplacardpipplacardhtml">trunk/LayoutTests/media/modern-media-controls/pip-placard/pip-placard.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsairplayplacardjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolspipplacardjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmainjs">trunk/Source/WebCore/Modules/modern-media-controls/main.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediastatussupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreEnglishlprojmodernmediacontrolslocalizedstringsjs">trunk/Source/WebCore/English.lproj/modern-media-controls-localized-strings.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/LayoutTests/ChangeLog 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-29 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Localization
+ https://bugs.webkit.org/show_bug.cgi?id=165176
+
+ Reviewed by Dean Jackson.
+
+ Using the modern media controls module loader to ensure we pick up main.js,
+ and also because it's the right thing to do.
+
+ * media/modern-media-controls/airplay-placard/airplay-placard.html:
+ * media/modern-media-controls/pip-placard/pip-placard.html:
+
</ins><span class="cx"> 2016-11-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r209104): storage/indexeddb/modern/gc-closes-database(-private).html timeout.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsairplayplacardairplayplacardhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/airplay-placard/airplay-placard.html (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/airplay-placard/airplay-placard.html 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/LayoutTests/media/modern-media-controls/airplay-placard/airplay-placard.html 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -1,22 +1,10 @@
</span><del>-<link rel="stylesheet" href="../../../../Source/WebCore/Modules/modern-media-controls/controls/button.css" type="text/css" media="screen">
-<link rel="stylesheet" href="../../../../Source/WebCore/Modules/modern-media-controls/controls/icon-button.css" type="text/css" media="screen">
-<link rel="stylesheet" href="../../../../Source/WebCore/Modules/modern-media-controls/controls/placard.css" type="text/css" media="screen">
</del><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><del>-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/scheduler.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/layout-node.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/layout-item.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/icon-service.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/button.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/icon-button.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/placard.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js" type="text/javascript"></script>
</del><ins>+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
</ins><span class="cx"> <body>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx">
</span><span class="cx"> description("Testing the <code>AirplayPlacard</code> class.");
</span><span class="cx">
</span><del>-iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
-
</del><span class="cx"> debug("Placard with all parameters");
</span><span class="cx"> const placard = new AirplayPlacard({ layoutTraits: LayoutTraits.macOS });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolspipplacardpipplacardhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/pip-placard/pip-placard.html (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/pip-placard/pip-placard.html 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/LayoutTests/media/modern-media-controls/pip-placard/pip-placard.html 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -1,22 +1,10 @@
</span><del>-<link rel="stylesheet" href="../../../../Source/WebCore/Modules/modern-media-controls/controls/button.css" type="text/css" media="screen">
-<link rel="stylesheet" href="../../../../Source/WebCore/Modules/modern-media-controls/controls/icon-button.css" type="text/css" media="screen">
-<link rel="stylesheet" href="../../../../Source/WebCore/Modules/modern-media-controls/controls/placard.css" type="text/css" media="screen">
</del><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><del>-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/scheduler.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/layout-node.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/layout-item.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/icon-service.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/button.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/icon-button.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/placard.js" type="text/javascript"></script>
-<script src="../../../../Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js" type="text/javascript"></script>
</del><ins>+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
</ins><span class="cx"> <body>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx">
</span><span class="cx"> description("Testing the <code>PiPPlacard</code> class.");
</span><span class="cx">
</span><del>-iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
-
</del><span class="cx"> debug("Placard with all parameters");
</span><span class="cx"> const placard = new PiPPlacard({ layoutTraits: LayoutTraits.macOS });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-11-29 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Localization
+ https://bugs.webkit.org/show_bug.cgi?id=165176
+
+ Reviewed by Dean Jackson.
+
+ We add a new localization file for the purpose of modern media controls, since we may
+ require different strings than the legacy one.
+
+ * English.lproj/modern-media-controls-localized-strings.js: Added.
+ * Modules/modern-media-controls/controls/airplay-placard.js:
+ (AirplayPlacard):
+ * Modules/modern-media-controls/controls/pip-placard.js:
+ (PiPPlacard):
+ * Modules/modern-media-controls/main.js:
+ (UIString):
+ * Modules/modern-media-controls/media/status-support.js:
+ (StatusSupport.prototype.syncControl):
+ (StatusSupport):
+ * WebCore.xcodeproj/project.pbxproj:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::mediaControlsScript):
+
+2016-11-29 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Show an invalid placard when we fail to load a media file
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165180
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojmodernmediacontrolslocalizedstringsjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/English.lproj/modern-media-controls-localized-strings.js (0 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/modern-media-controls-localized-strings.js (rev 0)
+++ trunk/Source/WebCore/English.lproj/modern-media-controls-localized-strings.js 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+const UIStrings = {
+ "AirPlay": "AirPlay",
+ "Audio": "Audio",
+ "Error": "Error",
+ "Live Broadcast": "Live Broadcast",
+ "Loading": "Loading",
+ "Subtitles": "Subtitles",
+ "This video is playing in Picture in Picture": "This video is playing in Picture in Picture",
+ "This video is playing on your Apple TV": "This video is playing on your Apple TV"
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsairplayplacardjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> {
</span><span class="cx"> super({
</span><span class="cx"> iconName: Icons.AirplayPlacard,
</span><del>- title: "AirPlay",
- description: "This video is playing on your Apple TV",
</del><ins>+ title: UIString("AirPlay"),
+ description: UIString("This video is playing on your Apple TV"),
</ins><span class="cx"> layoutDelegate
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolspipplacardjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> {
</span><span class="cx"> super({
</span><span class="cx"> iconName: Icons.PiPPlacard,
</span><del>- description: "This video is playing in Picture in Picture",
</del><ins>+ description: UIString("This video is playing in Picture in Picture"),
</ins><span class="cx"> layoutDelegate
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/main.js (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/main.js 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/Modules/modern-media-controls/main.js 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -33,3 +33,15 @@
</span><span class="cx">
</span><span class="cx"> return new MediaController(shadowRoot, media, host);
</span><span class="cx"> }
</span><ins>+
+function UIString(string)
+{
+ if (!("UIStrings" in window))
+ return string;
+
+ if (string in UIStrings)
+ return UIStrings[string];
+
+ console.error(`Localization for "${string}" not found.`);
+ return "LOCALIZED STRING NOT FOUND";
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediastatussupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -43,11 +43,11 @@
</span><span class="cx"> const media = this.mediaController.media;
</span><span class="cx">
</span><span class="cx"> if (!!media.error)
</span><del>- this.control.text = "Error";
</del><ins>+ this.control.text = UIString("Error");
</ins><span class="cx"> else if (media.duration === Number.POSITIVE_INFINITY && media.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA)
</span><del>- this.control.text = "Live Broadcast";
</del><ins>+ this.control.text = UIString("Live Broadcast");
</ins><span class="cx"> else if (media.readyState <= HTMLMediaElement.HAVE_NOTHING && media.networkState === HTMLMediaElement.NETWORK_LOADING)
</span><del>- this.control.text = "Loading";
</del><ins>+ this.control.text = UIString("Loading");
</ins><span class="cx"> else
</span><span class="cx"> this.control.text = "";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -2724,6 +2724,7 @@
</span><span class="cx"> 7134496E146941B300720312 /* SVGLengthContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 7134496C146941B300720312 /* SVGLengthContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 71537A01146BD9D7008BD615 /* SVGPathData.h in Headers */ = {isa = PBXBuildFile; fileRef = 715379FF146BD9D6008BD615 /* SVGPathData.h */; };
</span><span class="cx"> 7157F062150B6564006EAABD /* SVGAnimatedTransformList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7157F061150B6564006EAABD /* SVGAnimatedTransformList.cpp */; };
</span><ins>+ 71A1B6081DEE5AD70073BCFB /* modern-media-controls-localized-strings.js in Resources */ = {isa = PBXBuildFile; fileRef = 71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */; };
</ins><span class="cx"> 71A57DF1154BE25C0009D120 /* SVGPathUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */; };
</span><span class="cx"> 71A57DF2154BE25C0009D120 /* SVGPathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */; };
</span><span class="cx"> 71B1E125164048F700B1880A /* InspectorLayerTreeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 71B1E124164048CC00B1880A /* InspectorLayerTreeAgent.h */; };
</span><span class="lines">@@ -10095,6 +10096,7 @@
</span><span class="cx"> 717F90581DC4BB600006F520 /* airplay-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "airplay-support.js"; sourceTree = "<group>"; };
</span><span class="cx"> 718C7F561DD385C500B733C8 /* status-label.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "status-label.css"; sourceTree = "<group>"; };
</span><span class="cx"> 718C7F571DD385C500B733C8 /* status-label.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "status-label.js"; sourceTree = "<group>"; };
</span><ins>+ 71A1B6071DEE5A820073BCFB /* English */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = English; path = "English.lproj/modern-media-controls-localized-strings.js"; sourceTree = SOURCE_ROOT; };
</ins><span class="cx"> 71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathUtilities.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> 71B0460A1DD3C2EE00EE19CF /* status-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "status-support.js"; sourceTree = "<group>"; };
</span><span class="lines">@@ -15561,6 +15563,7 @@
</span><span class="cx"> 93153BE114195A5700FCF5BE /* missingImage.png */,
</span><span class="cx"> 93153BD914181F7A00FCF5BE /* missingImage@2x.png */,
</span><span class="cx"> CDF419991AB0DA14004E64E1 /* missingImage@3x.png */,
</span><ins>+ 71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */,
</ins><span class="cx"> A11E8C011B1E28BE0003A7C7 /* moveCursor.png */,
</span><span class="cx"> A11E8C021B1E28BE0003A7C7 /* northEastSouthWestResizeCursor.png */,
</span><span class="cx"> A11E8C031B1E28BE0003A7C7 /* northSouthResizeCursor.png */,
</span><span class="lines">@@ -28472,6 +28475,7 @@
</span><span class="cx"> 93153BE214195A5700FCF5BE /* missingImage.png in Resources */,
</span><span class="cx"> 93153BDA14181F7A00FCF5BE /* missingImage@2x.png in Resources */,
</span><span class="cx"> 318891611AB7EEA100EA627B /* missingImage@3x.png in Resources */,
</span><ins>+ 71A1B6081DEE5AD70073BCFB /* modern-media-controls-localized-strings.js in Resources */,
</ins><span class="cx"> A11E8C061B1E28FA0003A7C7 /* moveCursor.png in Resources */,
</span><span class="cx"> A11E8C071B1E28FE0003A7C7 /* northEastSouthWestResizeCursor.png in Resources */,
</span><span class="cx"> A11E8C081B1E29020003A7C7 /* northSouthResizeCursor.png in Resources */,
</span><span class="lines">@@ -31864,6 +31868,14 @@
</span><span class="cx"> /* End PBXTargetDependency section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXVariantGroup section */
</span><ins>+ 71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 71A1B6071DEE5A820073BCFB /* English */,
+ );
+ name = "modern-media-controls-localized-strings.js";
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */ = {
</span><span class="cx"> isa = PBXVariantGroup;
</span><span class="cx"> children = (
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (209115 => 209116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-11-30 04:26:20 UTC (rev 209116)
</span><span class="lines">@@ -252,9 +252,10 @@
</span><span class="cx"> if (m_mediaControlsScript.isEmpty()) {
</span><span class="cx"> StringBuilder scriptBuilder;
</span><span class="cx"> NSBundle *bundle = [NSBundle bundleForClass:[WebCoreRenderThemeBundle class]];
</span><del>- if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled())
</del><ins>+ if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled()) {
+ scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"modern-media-controls-localized-strings.js" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</ins><span class="cx"> scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"modern-media-controls" ofType:@"js" inDirectory:@"modern-media-controls"] encoding:NSUTF8StringEncoding error:nil]);
</span><del>- else {
</del><ins>+ } else {
</ins><span class="cx"> scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</span><span class="cx"> scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>