<!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>[167145] 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/167145">167145</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-04-11 13:42:14 -0700 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression: media controls and status messages are no longer localized.
https://bugs.webkit.org/show_bug.cgi?id=120956
Reviewed by Jer Noble.
* English.lproj/mediaControlsLocalizedStrings.js: Added.
(mediaControlsLocalizedStrings): Moved from mediaControlsApple.js.
* English.lproj/mediaControlsLocalizedStringsiOS.js: Added.
(mediaControlsLocalizedStringsiOS): Moved from mediaControlsiOS.js.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.UIString): Get strings from external file.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.UIString): Ditto.
* WebCore.vcxproj/copyWebCoreResourceFiles.cmd: Copy to Windows bundle.
* WebCore.xcodeproj/project.pbxproj: Copy new files to bundle.
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::mediaControlsScript): Load the locale-specific
string resource when loading the media controls.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::mediaControlsScript): Ditto.
* rendering/RenderThemeWin.cpp:
(WebCore::RenderThemeWin::mediaControlsScript): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojcopyWebCoreResourceFilescmd">trunk/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWincpp">trunk/Source/WebCore/rendering/RenderThemeWin.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreEnglishlprojmediaControlsLocalizedStringsjs">trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojmediaControlsLocalizedStringsiOSjs">trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStringsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167144 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-11 20:36:20 UTC (rev 167144)
+++ trunk/Source/WebCore/ChangeLog 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-04-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ Regression: media controls and status messages are no longer localized.
+ https://bugs.webkit.org/show_bug.cgi?id=120956
+
+ Reviewed by Jer Noble.
+
+ * English.lproj/mediaControlsLocalizedStrings.js: Added.
+ (mediaControlsLocalizedStrings): Moved from mediaControlsApple.js.
+ * English.lproj/mediaControlsLocalizedStringsiOS.js: Added.
+ (mediaControlsLocalizedStringsiOS): Moved from mediaControlsiOS.js.
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.UIString): Get strings from external file.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.UIString): Ditto.
+ * WebCore.vcxproj/copyWebCoreResourceFiles.cmd: Copy to Windows bundle.
+ * WebCore.xcodeproj/project.pbxproj: Copy new files to bundle.
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::mediaControlsScript): Load the locale-specific
+ string resource when loading the media controls.
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::mediaControlsScript): Ditto.
+ * rendering/RenderThemeWin.cpp:
+ (WebCore::RenderThemeWin::mediaControlsScript): Ditto.
+
+2014-04-11 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Build fix after r167138
</span><span class="cx">
</span><span class="cx"> * platform/graphics/ca/GraphicsLayerCA.h: The TileController is
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojmediaControlsLocalizedStringsjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js (0 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js (rev 0)
+++ trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+function mediaControlsLocalizedStrings() {
+ return {
+ 'Aborted': 'Aborted',
+ 'Audio Playback': 'Audio Playback',
+ 'Captions': 'Captions',
+ 'Display Full Screen': 'Display Full Screen',
+ 'Duration': 'Duration',
+ 'Elapsed': 'Elapsed',
+ 'Error': 'Error',
+ 'Exit Full Screen': 'Exit Full Screen',
+ 'Fast Forward': 'Fast Forward',
+ 'Loading': 'Loading',
+ 'Maximum Volume': 'Maximum Volume',
+ 'Minimum Volume': 'Minimum Volume',
+ 'Mute': 'Mute',
+ 'Pause': 'Pause',
+ 'Play': 'Play',
+ 'Remaining': 'Remaining',
+ 'Rewind': 'Rewind',
+ 'Rewind %%sec%% Seconds': 'Rewind %%sec%% Seconds',
+ 'Stalled': 'Stalled',
+ 'Subtitles': 'Subtitles',
+ 'Suspended': 'Suspended',
+ 'Unmute': 'Unmute',
+ 'Video Playback': 'Video Playback',
+ 'Volume': 'Volume',
+ 'Waiting': 'Waiting'
+ }
+};
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojmediaControlsLocalizedStringsiOSjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStringsiOS.js (0 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStringsiOS.js (rev 0)
+++ trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStringsiOS.js 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+function mediaControlsLocalizedStringsiOS() {
+ return {
+ '##AIRPLAY_DEVICE_TYPE##': 'AirPlay',
+ '##AIRPLAY_DEVICE_NAME##': 'This video is playing on "##DEVICE_NAME##".',
+
+ '##TVOUT_DEVICE_TYPE##': 'TV Connected',
+ '##TVOUT_DEVICE_NAME##': 'This video is playing on the TV.',
+ }
+};
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (167144 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-04-11 20:36:20 UTC (rev 167144)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -108,39 +108,15 @@
</span><span class="cx">
</span><span class="cx"> // Localized string accessor
</span><span class="cx"> UIString: function(s){
</span><ins>+ if (!this.localizedStrings)
+ this.localizedStrings = mediaControlsLocalizedStrings();
+
</ins><span class="cx"> if (this.localizedStrings[s])
</span><span class="cx"> return this.localizedStrings[s];
</span><del>- else
- return s; // FIXME: log something if string not localized.
</del><ins>+
+ console.error("Localized string \"" + s + "\" not found.");
+ return "LOCALIZED STRING NOT FOUND";
</ins><span class="cx"> },
</span><del>- localizedStrings: {
- // FIXME: Move localization to ext strings file <http://webkit.org/b/120956>
- 'Aborted': 'Aborted',
- 'Audio Playback': 'Audio Playback',
- 'Captions': 'Captions',
- 'Display Full Screen': 'Display Full Screen',
- 'Duration': 'Duration',
- 'Elapsed': 'Elapsed',
- 'Error': 'Error',
- 'Exit Full Screen': 'Exit Full Screen',
- 'Fast Forward': 'Fast Forward',
- 'Loading': 'Loading',
- 'Maximum Volume': 'Maximum Volume',
- 'Minimum Volume': 'Minimum Volume',
- 'Mute': 'Mute',
- 'Pause': 'Pause',
- 'Play': 'Play',
- 'Remaining': 'Remaining',
- 'Rewind': 'Rewind',
- 'Rewind %%sec%% Seconds': 'Rewind %%sec%% Seconds',
- 'Stalled': 'Stalled',
- 'Subtitles': 'Subtitles',
- 'Suspended': 'Suspended',
- 'Unmute': 'Unmute',
- 'Video Playback': 'Video Playback',
- 'Volume': 'Volume',
- 'Waiting': 'Waiting'
- },
</del><span class="cx">
</span><span class="cx"> listenFor: function(element, eventName, handler, useCapture)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (167144 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-04-11 20:36:20 UTC (rev 167144)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -67,18 +67,14 @@
</span><span class="cx"> if (string)
</span><span class="cx"> return string;
</span><span class="cx">
</span><ins>+ if (!this.localizedStrings)
+ this.localizedStrings = mediaControlsLocalizedStringsiOS();
+
</ins><span class="cx"> if (this.localizedStrings[s])
</span><span class="cx"> return this.localizedStrings[s];
</span><del>- else
- return s; // FIXME: LOG something if string not localized.
- },
- localizedStrings: {
- // FIXME: Move localization to ext strings file <http://webkit.org/b/120956>
- '##AIRPLAY_DEVICE_TYPE##': 'AirPlay',
- '##AIRPLAY_DEVICE_NAME##': 'This video is playing on "##DEVICE_NAME##".',
</del><span class="cx">
</span><del>- '##TVOUT_DEVICE_TYPE##': 'TV Connected',
- '##TVOUT_DEVICE_NAME##': 'This video is playing on the TV.',
</del><ins>+ console.error("Localized string \"" + s + "\" not found.");
+ return "LOCALIZED STRING NOT FOUND";
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> shouldHaveStartPlaybackButton: function() {
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojcopyWebCoreResourceFilescmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd (167144 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd 2014-04-11 20:36:20 UTC (rev 167144)
+++ trunk/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
</span><span class="cx"> xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
</span><ins>+xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\mediaControlsLocalizedStrings.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\en.lproj"
</ins><span class="cx"> xcopy /y /d /s "%ProjectDir%..\Modules\mediacontrols\mediaControlsApple.css" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
</span><span class="cx"> xcopy /y /d /s "%ProjectDir%..\Modules\mediacontrols\mediaControlsApple.js" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (167144 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-11 20:36:20 UTC (rev 167144)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -2285,6 +2285,8 @@
</span><span class="cx"> 7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E770C10C00A8800A0276E /* InspectorFrontendHost.h */; };
</span><span class="cx"> 7A0E771E10C00DB100A0276E /* JSInspectorFrontendHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */; };
</span><span class="cx"> 7A0E771F10C00DB100A0276E /* JSInspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */; };
</span><ins>+ 7A1D7FCB18F85F0F00C385AD /* mediaControlsLocalizedStrings.js in Resources */ = {isa = PBXBuildFile; fileRef = 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */; };
+ 7A1D7FCE18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js in Resources */ = {isa = PBXBuildFile; fileRef = 7A1D7FCC18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js */; };
</ins><span class="cx"> 7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */; };
</span><span class="cx"> 7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */; };
</span><span class="cx"> 7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -9317,6 +9319,8 @@
</span><span class="cx"> 7A0E770D10C00A8800A0276E /* InspectorFrontendHost.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = InspectorFrontendHost.idl; sourceTree = "<group>"; };
</span><span class="cx"> 7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHost.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInspectorFrontendHost.h; sourceTree = "<group>"; };
</span><ins>+ 7A1D7FCA18F85F0F00C385AD /* English */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = English; path = English.lproj/mediaControlsLocalizedStrings.js; sourceTree = SOURCE_ROOT; };
+ 7A1D7FCD18F86E5600C385AD /* English */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = English; path = English.lproj/mediaControlsLocalizedStringsiOS.js; sourceTree = SOURCE_ROOT; };
</ins><span class="cx"> 7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorClient.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDOMAgent.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14594,6 +14598,8 @@
</span><span class="cx"> 089C1665FE841158C02AAC07 /* Resources */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 7A1D7FCC18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js */,
+ 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */,
</ins><span class="cx"> CD0DBB3E142274E600280263 /* audio */,
</span><span class="cx"> 65998A650E5F5FD3004E097A /* images */,
</span><span class="cx"> 46F9D5DA0B0D60170028EE36 /* aliasCursor.png */,
</span><span class="lines">@@ -26429,6 +26435,7 @@
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><ins>+ 7A1D7FCE18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js in Resources */,
</ins><span class="cx"> 46F9D5DD0B0D60170028EE36 /* aliasCursor.png in Resources */,
</span><span class="cx"> 46D4F2490AF97E810035385A /* cellCursor.png in Resources */,
</span><span class="cx"> 93153BDE141959F400FCF5BE /* deleteButton.png in Resources */,
</span><span class="lines">@@ -26461,6 +26468,7 @@
</span><span class="cx"> 85136CA30AED665900F90A3D /* northWestSouthEastResizeCursor.png in Resources */,
</span><span class="cx"> 46F9D5DF0B0D60170028EE36 /* progressCursor.png in Resources */,
</span><span class="cx"> 85136CA40AED665900F90A3D /* southEastResizeCursor.png in Resources */,
</span><ins>+ 7A1D7FCB18F85F0F00C385AD /* mediaControlsLocalizedStrings.js in Resources */,
</ins><span class="cx"> 85136CA50AED665900F90A3D /* southResizeCursor.png in Resources */,
</span><span class="cx"> 85136CA60AED665900F90A3D /* southWestResizeCursor.png in Resources */,
</span><span class="cx"> BE8C753110681324001E93F5 /* SpellingDot.png in Resources */,
</span><span class="lines">@@ -29562,6 +29570,22 @@
</span><span class="cx"> /* End PBXTargetDependency section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXVariantGroup section */
</span><ins>+ 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 7A1D7FCA18F85F0F00C385AD /* English */,
+ );
+ name = mediaControlsLocalizedStrings.js;
+ sourceTree = "<group>";
+ };
+ 7A1D7FCC18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 7A1D7FCD18F86E5600C385AD /* English */,
+ );
+ name = mediaControlsLocalizedStringsiOS.js;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> BCAD1808131C7A0D00990406 /* Localizable.strings */ = {
</span><span class="cx"> isa = PBXVariantGroup;
</span><span class="cx"> children = (
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (167144 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2014-04-11 20:36:20 UTC (rev 167144)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -1224,7 +1224,9 @@
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> if (m_mediaControlsScript.isEmpty()) {
</span><span class="cx"> StringBuilder scriptBuilder;
</span><ins>+ scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</ins><span class="cx"> scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</span><ins>+ scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsLocalizedStringsiOS" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</ins><span class="cx"> scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsiOS" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</span><span class="cx"> m_mediaControlsScript = scriptBuilder.toString();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (167144 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-04-11 20:36:20 UTC (rev 167144)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -237,8 +237,12 @@
</span><span class="cx"> String RenderThemeMac::mediaControlsScript()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><del>- if (m_mediaControlsScript.isEmpty())
- m_mediaControlsScript = [NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil];
</del><ins>+ if (m_mediaControlsScript.isEmpty()) {
+ StringBuilder scriptBuilder;
+ scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
+ scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
+ m_mediaControlsScript = scriptBuilder.toString();
+ }
</ins><span class="cx"> return m_mediaControlsScript;
</span><span class="cx"> #else
</span><span class="cx"> return emptyString();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (167144 => 167145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2014-04-11 20:36:20 UTC (rev 167144)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2014-04-11 20:42:14 UTC (rev 167145)
</span><span class="lines">@@ -1143,8 +1143,12 @@
</span><span class="cx"> String RenderThemeWin::mediaControlsScript()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><del>- if (m_mediaControlsScript.isEmpty())
- m_mediaControlsScript = stringWithContentsOfFile(CFSTR("mediaControlsApple"), CFSTR("js"));
</del><ins>+ if (m_mediaControlsScript.isEmpty()) {
+ StringBuilder scriptBuilder;
+ scriptBuilder.append(stringWithContentsOfFile(CFSTR("mediaControlsLocalizedStrings"), CFSTR("js")));
+ scriptBuilder.append(stringWithContentsOfFile(CFSTR("mediaControlsApple"), CFSTR("js")));
+ m_mediaControlsScript = scriptBuilder.toString();
+ }
</ins><span class="cx"> return m_mediaControlsScript;
</span><span class="cx"> #else
</span><span class="cx"> return emptyString();
</span></span></pre>
</div>
</div>
</body>
</html>