<!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>[167596] 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/167596">167596</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 11:06:20 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Media] Clean up localized strings in controls
https://bugs.webkit.org/show_bug.cgi?id=131857
<rdar://problem/16663005>
Reviewed by Eric Carlson.
There is no need for separate localization files
on OS X and iOS. Move the small number of iOS-specific
localizations into a shared file.
We also don't need a function to return a static table.
Ultimately I think we want a top-level WebKit object that
hold the table, but for now use a global variable
called UIStringTable. Since we're in an isolated world, we
won't clash with anything.
I noticed a few cases were we grab a localized string and
then instantly run a replacement on it. This should be
supported directly in the UIString() accessor.
* English.lproj/mediaControlsLocalizedStrings.js: Add iOS strings. Just
use a static table.
(mediaControlsLocalizedStrings): Deleted.
* English.lproj/mediaControlsLocalizedStringsiOS.js: Removed.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.extend): Fix braces.
(Controller.prototype.UIString): Use the string table, and allow replacement.
(Controller.prototype.createControls): Use new UIString replacement.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.updateWirelessPlaybackStatus): Use new UIString.
(ControllerIOS.prototype.UIString): Deleted. Use the parent class version.
* WebCore.xcodeproj/project.pbxproj: Remove file from Resources.
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::mediaControlsScript): No need to include the iOS
specific localization file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojmediaControlsLocalizedStringsjs">trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js</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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<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 (167595 => 167596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-21 17:31:13 UTC (rev 167595)
+++ trunk/Source/WebCore/ChangeLog 2014-04-21 18:06:20 UTC (rev 167596)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-04-18 Dean Jackson <dino@apple.com>
+
+ [Media] Clean up localized strings in controls
+ https://bugs.webkit.org/show_bug.cgi?id=131857
+ <rdar://problem/16663005>
+
+ Reviewed by Eric Carlson.
+
+ There is no need for separate localization files
+ on OS X and iOS. Move the small number of iOS-specific
+ localizations into a shared file.
+
+ We also don't need a function to return a static table.
+ Ultimately I think we want a top-level WebKit object that
+ hold the table, but for now use a global variable
+ called UIStringTable. Since we're in an isolated world, we
+ won't clash with anything.
+
+ I noticed a few cases were we grab a localized string and
+ then instantly run a replacement on it. This should be
+ supported directly in the UIString() accessor.
+
+ * English.lproj/mediaControlsLocalizedStrings.js: Add iOS strings. Just
+ use a static table.
+ (mediaControlsLocalizedStrings): Deleted.
+ * English.lproj/mediaControlsLocalizedStringsiOS.js: Removed.
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.extend): Fix braces.
+ (Controller.prototype.UIString): Use the string table, and allow replacement.
+ (Controller.prototype.createControls): Use new UIString replacement.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.updateWirelessPlaybackStatus): Use new UIString.
+ (ControllerIOS.prototype.UIString): Deleted. Use the parent class version.
+ * WebCore.xcodeproj/project.pbxproj: Remove file from Resources.
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::mediaControlsScript): No need to include the iOS
+ specific localization file.
+
</ins><span class="cx"> 2014-04-21 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojmediaControlsLocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js (167595 => 167596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js 2014-04-21 17:31:13 UTC (rev 167595)
+++ trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js 2014-04-21 18:06:20 UTC (rev 167596)
</span><span class="lines">@@ -1,29 +1,33 @@
</span><del>-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'
- }
</del><ins>+var UIStringTable = {
+ '##WIRELESS_PLAYBACK_DEVICE_TYPE##': 'AirPlay',
+ '##WIRELESS_PLAYBACK_DEVICE_NAME##': 'This video is playing on “##DEVICE_NAME##”.',
+
+ '##TVOUT_DEVICE_TYPE##': 'TV Connected',
+ '##TVOUT_DEVICE_NAME##': 'This video is playing on the TV.',
+
+ '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"> };
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojmediaControlsLocalizedStringsiOSjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStringsiOS.js (167595 => 167596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStringsiOS.js 2014-04-21 17:31:13 UTC (rev 167595)
+++ trunk/Source/WebCore/English.lproj/mediaControlsLocalizedStringsiOS.js 2014-04-21 18:06:20 UTC (rev 167596)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-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.',
- }
-};
</del><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 (167595 => 167596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-04-21 17:31:13 UTC (rev 167595)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-04-21 18:06:20 UTC (rev 167596)
</span><span class="lines">@@ -99,22 +99,24 @@
</span><span class="cx"> down: 40
</span><span class="cx"> },
</span><span class="cx">
</span><del>- extend: function(child) {
</del><ins>+ extend: function(child)
+ {
</ins><span class="cx"> for (var property in this) {
</span><span class="cx"> if (!child.hasOwnProperty(property))
</span><span class="cx"> child[property] = this[property];
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- // Localized string accessor
- UIString: function(s){
- if (!this.localizedStrings)
- this.localizedStrings = mediaControlsLocalizedStrings();
</del><ins>+ UIString: function(developmentString, replaceString, replacementString)
+ {
+ var localized = UIStringTable[developmentString];
+ if (replaceString && replacementString)
+ return localized.replace(replaceString, replacementString);
</ins><span class="cx">
</span><del>- if (this.localizedStrings[s])
- return this.localizedStrings[s];
</del><ins>+ if (localized)
+ return localized;
</ins><span class="cx">
</span><del>- console.error("Localized string \"" + s + "\" not found.");
</del><ins>+ console.error("Localization for string \"" + developmentString + "\" not found.");
</ins><span class="cx"> return "LOCALIZED STRING NOT FOUND";
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -264,7 +266,7 @@
</span><span class="cx">
</span><span class="cx"> var rewindButton = this.controls.rewindButton = document.createElement('button');
</span><span class="cx"> rewindButton.setAttribute('pseudo', '-webkit-media-controls-rewind-button');
</span><del>- rewindButton.setAttribute('aria-label', this.UIString('Rewind %%sec%% Seconds').replace('%%sec%%', this.RewindAmount));
</del><ins>+ rewindButton.setAttribute('aria-label', this.UIString('Rewind ##sec## Seconds', '##sec##', this.RewindAmount));
</ins><span class="cx"> this.listenFor(rewindButton, 'click', this.handleRewindButtonClicked);
</span><span class="cx">
</span><span class="cx"> var seekBackButton = this.controls.seekBackButton = document.createElement('button');
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (167595 => 167596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-04-21 17:31:13 UTC (rev 167595)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-04-21 18:06:20 UTC (rev 167596)
</span><span class="lines">@@ -62,21 +62,6 @@
</span><span class="cx"> this.stopListeningFor(this.base, 'mouseout', this.handleWrapperMouseOut);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- UIString: function(s){
- var string = Controller.prototype.UIString.call(this, s);
- if (string)
- return string;
-
- if (!this.localizedStrings)
- this.localizedStrings = mediaControlsLocalizedStringsiOS();
-
- if (this.localizedStrings[s])
- return this.localizedStrings[s];
-
- console.error("Localized string \"" + s + "\" not found.");
- return "LOCALIZED STRING NOT FOUND";
- },
-
</del><span class="cx"> shouldHaveStartPlaybackButton: function() {
</span><span class="cx"> var allowsInline = this.host.mediaPlaybackAllowsInline;
</span><span class="cx">
</span><span class="lines">@@ -121,8 +106,8 @@
</span><span class="cx"> var deviceType = "";
</span><span class="cx"> var type = this.host.externalDeviceType;
</span><span class="cx"> if (type == "airplay") {
</span><del>- deviceType = this.UIString('##AIRPLAY_DEVICE_TYPE##');
- deviceName = this.UIString('##AIRPLAY_DEVICE_NAME##').replace('##DEVICE_NAME##', this.host.externalDeviceDisplayName);
</del><ins>+ deviceType = this.UIString('##WIRELESS_PLAYBACK_DEVICE_TYPE##');
+ deviceName = this.UIString('##WIRELESS_PLAYBACK_DEVICE_NAME##', '##DEVICE_NAME##', this.host.externalDeviceDisplayName);
</ins><span class="cx"> } else if (type == "tvout") {
</span><span class="cx"> deviceType = this.UIString('##TVOUT_DEVICE_TYPE##');
</span><span class="cx"> deviceName = this.UIString('##TVOUT_DEVICE_NAME##');
</span><span class="lines">@@ -424,4 +409,4 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Object.create(Controller.prototype).extend(ControllerIOS.prototype);
</span><del>-Object.defineProperty(ControllerIOS.prototype, 'constructor', { enumerable:false, value:ControllerIOS });
</del><ins>+Object.defineProperty(ControllerIOS.prototype, 'constructor', { enumerable: false, value: ControllerIOS });
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (167595 => 167596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-21 17:31:13 UTC (rev 167595)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-21 18:06:20 UTC (rev 167596)
</span><span class="lines">@@ -2290,7 +2290,6 @@
</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><span class="cx"> 7A1D7FCB18F85F0F00C385AD /* mediaControlsLocalizedStrings.js in Resources */ = {isa = PBXBuildFile; fileRef = 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */; };
</span><del>- 7A1D7FCE18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js in Resources */ = {isa = PBXBuildFile; fileRef = 7A1D7FCC18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js */; };
</del><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">@@ -9327,7 +9326,6 @@
</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><span class="cx"> 7A1D7FCA18F85F0F00C385AD /* English */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = English; path = English.lproj/mediaControlsLocalizedStrings.js; sourceTree = SOURCE_ROOT; };
</span><del>- 7A1D7FCD18F86E5600C385AD /* English */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = English; path = English.lproj/mediaControlsLocalizedStringsiOS.js; sourceTree = SOURCE_ROOT; };
</del><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">@@ -14604,8 +14602,6 @@
</span><span class="cx"> 089C1665FE841158C02AAC07 /* Resources */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 7A1D7FCC18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js */,
- 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */,
</del><span class="cx"> CD0DBB3E142274E600280263 /* audio */,
</span><span class="cx"> 65998A650E5F5FD3004E097A /* images */,
</span><span class="cx"> 46F9D5DA0B0D60170028EE36 /* aliasCursor.png */,
</span><span class="lines">@@ -14622,6 +14618,7 @@
</span><span class="cx"> 2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */,
</span><span class="cx"> 85136C8C0AED665800F90A3D /* linkCursor.png */,
</span><span class="cx"> BCAD1808131C7A0D00990406 /* Localizable.strings */,
</span><ins>+ 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */,
</ins><span class="cx"> 93153BE114195A5700FCF5BE /* missingImage.png */,
</span><span class="cx"> 93153BD914181F7A00FCF5BE /* missingImage@2x.png */,
</span><span class="cx"> 85136C8D0AED665800F90A3D /* moveCursor.png */,
</span><span class="lines">@@ -26447,7 +26444,6 @@
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 7A1D7FCE18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js in Resources */,
</del><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">@@ -29590,14 +29586,6 @@
</span><span class="cx"> name = mediaControlsLocalizedStrings.js;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 7A1D7FCC18F86E5600C385AD /* mediaControlsLocalizedStringsiOS.js */ = {
- isa = PBXVariantGroup;
- children = (
- 7A1D7FCD18F86E5600C385AD /* English */,
- );
- name = mediaControlsLocalizedStringsiOS.js;
- sourceTree = "<group>";
- };
</del><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 (167595 => 167596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2014-04-21 17:31:13 UTC (rev 167595)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2014-04-21 18:06:20 UTC (rev 167596)
</span><span class="lines">@@ -1226,7 +1226,6 @@
</span><span class="cx"> StringBuilder scriptBuilder;
</span><span class="cx"> scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</span><span class="cx"> scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</span><del>- scriptBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsLocalizedStringsiOS" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</del><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>
</div>
</body>
</html>