<!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>[207423] 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/207423">207423</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-17 12:54:04 -0700 (Mon, 17 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Add a MediaControlsHost API to retrieve images as base64
https://bugs.webkit.org/show_bug.cgi?id=163502
<rdar://problem/28792017>
Patch by Antoine Quint <graouts@apple.com> on 2016-10-17
Reviewed by Darin Adler.
Add a new `base64StringForIconAndPlatform()` method to MediaControlsHost such that we
may load images from the modern-media-controls directory in the WebCore.framework bundle.
We use this new method in the iconService singleton when a `mediaControlsHost` is set,
which will be set in a later patch.
* Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::base64StringForIconAndPlatform):
* Modules/mediacontrols/MediaControlsHost.h:
* Modules/mediacontrols/MediaControlsHost.idl:
* Modules/modern-media-controls/controls/icon-service.js:
(const.iconService.new.IconService.prototype.urlForIconNameAndLayoutTraits):
(const.iconService.new.IconService):
* rendering/RenderTheme.h:
(WebCore::RenderTheme::mediaControlsBase64StringForIconAndPlatform):
(WebCore::RenderTheme::mediaControlsScript): Deleted.
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::mediaControlsBase64StringForIconAndPlatform):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsiconserviceiconserviceexpectedtxt">trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsiconserviceiconservicehtml">trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconservicejs">trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsstartbuttonjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/start-button.js</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeh">trunk/Source/WebCore/rendering/RenderTheme.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMach">trunk/Source/WebCore/rendering/RenderThemeMac.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsmediamodernmediacontrolsiconserviceiconserviceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service-expected.txt (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service-expected.txt 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service-expected.txt 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> Checking path to images is computed according to traits
</span><del>-PASS iconService.urlForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS).includes("macOS/pause") is true
-PASS iconService.urlForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS).includes("iOS/pause") is true
-PASS iconService.urlForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS | LayoutTraits.Fullscreen).includes("macOS/pause-fullscreen") is true
</del><ins>+PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS).src.includes("macOS/pause@") is true
+PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS).src.includes("iOS/pause@") is true
+PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS | LayoutTraits.Fullscreen).src.includes("macOS/pause-fullscreen@") is true
</ins><span class="cx">
</span><span class="cx"> Checking requested images are cached
</span><span class="cx"> PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS) is true
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsiconserviceiconservicehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service.html (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service.html 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service.html 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -10,9 +10,9 @@
</span><span class="cx"> iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
</span><span class="cx">
</span><span class="cx"> debug("Checking path to images is computed according to traits");
</span><del>-shouldBeTrue('iconService.urlForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS).includes("macOS/pause")');
-shouldBeTrue('iconService.urlForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS).includes("iOS/pause")');
-shouldBeTrue('iconService.urlForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS | LayoutTraits.Fullscreen).includes("macOS/pause-fullscreen")');
</del><ins>+shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS).src.includes("macOS/pause@")');
+shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS).src.includes("iOS/pause@")');
+shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS | LayoutTraits.Fullscreen).src.includes("macOS/pause-fullscreen@")');
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Checking requested images are cached");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/Source/WebCore/ChangeLog 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-10-17 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Add a MediaControlsHost API to retrieve images as base64
+ https://bugs.webkit.org/show_bug.cgi?id=163502
+ <rdar://problem/28792017>
+
+ Reviewed by Darin Adler.
+
+ Add a new `base64StringForIconAndPlatform()` method to MediaControlsHost such that we
+ may load images from the modern-media-controls directory in the WebCore.framework bundle.
+ We use this new method in the iconService singleton when a `mediaControlsHost` is set,
+ which will be set in a later patch.
+
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::base64StringForIconAndPlatform):
+ * Modules/mediacontrols/MediaControlsHost.h:
+ * Modules/mediacontrols/MediaControlsHost.idl:
+ * Modules/modern-media-controls/controls/icon-service.js:
+ (const.iconService.new.IconService.prototype.urlForIconNameAndLayoutTraits):
+ (const.iconService.new.IconService):
+ * rendering/RenderTheme.h:
+ (WebCore::RenderTheme::mediaControlsBase64StringForIconAndPlatform):
+ (WebCore::RenderTheme::mediaControlsScript): Deleted.
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::mediaControlsBase64StringForIconAndPlatform):
+
+2016-10-17 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Add a MediaControlsHost API to retrieve the shadow root CSS
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163501
</span><span class="cx"> <rdar://problem/28792014>
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -292,6 +292,14 @@
</span><span class="cx"> return RenderTheme::themeForPage(page)->mediaControlsStyleSheet();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String MediaControlsHost::base64StringForIconAndPlatform(const String& iconName, const String& platform) const
+{
+ Page* page = m_mediaElement->document().page();
+ if (!page)
+ return emptyString();
+ return RenderTheme::themeForPage(page)->mediaControlsBase64StringForIconAndPlatform(iconName, platform);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> String generateUUID() const;
</span><span class="cx">
</span><span class="cx"> String shadowRootCSSText() const;
</span><ins>+ String base64StringForIconAndPlatform(const String& iconName, const String& platform) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaControlsHost(HTMLMediaElement*);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -61,4 +61,5 @@
</span><span class="cx"> DOMString generateUUID();
</span><span class="cx">
</span><span class="cx"> [EnabledAtRuntime=ModernMediaControls] readonly attribute DOMString shadowRootCSSText;
</span><ins>+ [EnabledAtRuntime=ModernMediaControls] DOMString base64StringForIconAndPlatform(DOMString iconName, DOMString platform);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconservicejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -52,20 +52,30 @@
</span><span class="cx"> this.images = {};
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Public
+
</ins><span class="cx"> imageForIconNameAndLayoutTraits(iconName, layoutTraits)
</span><span class="cx"> {
</span><del>- const path = this.urlForIconNameAndLayoutTraits(iconName, layoutTraits);
-
</del><ins>+ const [fileName, platform] = this._fileNameAndPlatformForIconNameAndLayoutTraits(iconName, layoutTraits);
+ const path = `${platform}/${fileName}.png`;
+
</ins><span class="cx"> let image = this.images[path];
</span><span class="cx"> if (image)
</span><span class="cx"> return image;
</span><span class="cx">
</span><span class="cx"> image = this.images[path] = new Image;
</span><del>- image.src = path;
</del><ins>+
+ if (this.mediaControlsHost)
+ image.src = "data:image/png;base64," + this.mediaControlsHost.base64StringForIconAndPlatform(fileName, platform);
+ else
+ image.src = `${this.directoryPath}/${path}`;
+
</ins><span class="cx"> return image;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- urlForIconNameAndLayoutTraits(iconName, layoutTraits)
</del><ins>+ // Private
+
+ _fileNameAndPlatformForIconNameAndLayoutTraits(iconName, layoutTraits)
</ins><span class="cx"> {
</span><span class="cx"> let platform;
</span><span class="cx"> if (layoutTraits & LayoutTraits.macOS)
</span><span class="lines">@@ -78,7 +88,9 @@
</span><span class="cx"> if (layoutTraits & LayoutTraits.Fullscreen && IconsWithFullScreenVariants.includes(iconName))
</span><span class="cx"> iconName += "-fullscreen";
</span><span class="cx">
</span><del>- return `${this.directoryPath}/${platform}/${iconName}@${window.devicePixelRatio}x.png`;
</del><ins>+ const fileName = `${iconName}@${window.devicePixelRatio}x`;
+
+ return [fileName, platform];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsstartbuttonjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/start-button.js (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/start-button.js 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/start-button.js 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> background.className = "background";
</span><span class="cx">
</span><span class="cx"> const image = this.element.appendChild(new Image);
</span><del>- image.src = iconService.urlForIconNameAndLayoutTraits(Icons.Start, this.layoutTraits);
</del><ins>+ image.src = iconService.imageForIconNameAndLayoutTraits(Icons.Start, this.layoutTraits).src;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> virtual String mediaControlsStyleSheet() { return String(); }
</span><span class="cx"> virtual String extraMediaControlsStyleSheet() { return String(); }
</span><span class="cx"> virtual String mediaControlsScript() { return String(); }
</span><ins>+ virtual String mediaControlsBase64StringForIconAndPlatform(const String&, const String&) { return String(); }
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> virtual String extraFullScreenStyleSheet() { return String(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx"> // Media controls
</span><span class="cx"> String mediaControlsStyleSheet() override;
</span><span class="cx"> String mediaControlsScript() override;
</span><ins>+ String mediaControlsBase64StringForIconAndPlatform(const String&, const String&) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (207422 => 207423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-10-17 19:17:36 UTC (rev 207422)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-10-17 19:54:04 UTC (rev 207423)
</span><span class="lines">@@ -272,6 +272,20 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String RenderThemeMac::mediaControlsBase64StringForIconAndPlatform(const String& iconName, const String& platform)
+{
+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ if (!RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled())
+ return emptyString();
+
+ String directory = "modern-media-controls/images/" + platform;
+ NSBundle *bundle = [NSBundle bundleForClass:[WebCoreRenderThemeBundle class]];
+ return [[NSData dataWithContentsOfFile:[bundle pathForResource:iconName ofType:@"png" inDirectory:directory]] base64EncodedStringWithOptions:0];
+#else
+ return emptyString();
+#endif
+}
+
</ins><span class="cx"> #endif // ENABLE(VIDEO)
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>