<!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>[200927] 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/200927">200927</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-15 08:36:57 -0700 (Sun, 15 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/200925">r200925</a>.
https://bugs.webkit.org/show_bug.cgi?id=157725
Does not build if MEDIA_SESSION is enabled (Requested by
cdumez_ on #webkit).
Reverted changeset:
"Use new Web IDL dictionary support for
MediaSession.setMetadata()"
https://bugs.webkit.org/show_bug.cgi?id=157711
http://trac.webkit.org/changeset/200925</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessioncpp">trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessionh">trunk/Source/WebCore/Modules/mediasession/MediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessionidl">trunk/Source/WebCore/Modules/mediasession/MediaSession.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200926 => 200927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-15 10:34:51 UTC (rev 200926)
+++ trunk/Source/WebCore/ChangeLog 2016-05-15 15:36:57 UTC (rev 200927)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-15 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r200925.
+ https://bugs.webkit.org/show_bug.cgi?id=157725
+
+ Does not build if MEDIA_SESSION is enabled (Requested by
+ cdumez_ on #webkit).
+
+ Reverted changeset:
+
+ "Use new Web IDL dictionary support for
+ MediaSession.setMetadata()"
+ https://bugs.webkit.org/show_bug.cgi?id=157711
+ http://trac.webkit.org/changeset/200925
+
</ins><span class="cx"> 2016-05-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use new Web IDL dictionary support for MediaSession.setMetadata()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (200926 => 200927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2016-05-15 10:34:51 UTC (rev 200926)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2016-05-15 15:36:57 UTC (rev 200927)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><ins>+#include "Dictionary.h"
</ins><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="cx"> #include "MediaSessionManager.h"
</span><span class="lines">@@ -112,15 +113,31 @@
</span><span class="cx"> return !m_activeParticipatingElements.isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaSession::setMetadata(const MediaMetadataInit& metadata)
</del><ins>+void MediaSession::setMetadata(const Dictionary& metadata)
</ins><span class="cx"> {
</span><del>- // If metadata's artwork is present, parse it using baseURL, and if that does not return failure, set media
- // session's artwork URL to the return value.
</del><ins>+ // 5.1.3
+ // 1. Let media session be the current media session.
+ // 2. Let baseURL be the API base URL specified by the entry settings object.
+ // 3. Set media session's title to metadata's title.
+ String title;
+ metadata.get("title", title);
+
+ // 4. Set media session's artist name to metadata's artist.
+ String artist;
+ metadata.get("artist", artist);
+
+ // 5. Set media session's album name to metadata's album.
+ String album;
+ metadata.get("album", album);
+
+ // 6. If metadata's artwork is present, parse it using baseURL, and if that does not return failure, set media
+ // session's artwork URL to the return value.
</ins><span class="cx"> URL artworkURL;
</span><del>- if (!metadata.artwork.isNull())
- artworkURL = m_document.completeURL(metadata.artwork);
</del><ins>+ String artworkPath;
+ if (metadata.get("artwork", artworkPath))
+ artworkURL = m_document.completeURL(artworkPath);
</ins><span class="cx">
</span><del>- m_metadata = MediaSessionMetadata(metadata.title, metadata.artist, metadata.album, artworkURL);
</del><ins>+ m_metadata = MediaSessionMetadata(title, artist, album, artworkURL);
</ins><span class="cx">
</span><span class="cx"> if (Page *page = m_document.page())
</span><span class="cx"> page->chrome().client().mediaSessionMetadataDidChange(m_metadata);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (200926 => 200927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2016-05-15 10:34:51 UTC (rev 200926)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.h 2016-05-15 15:36:57 UTC (rev 200927)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Dictionary;
</ins><span class="cx"> class Document;
</span><span class="cx"> class HTMLMediaElement;
</span><span class="cx">
</span><span class="lines">@@ -53,15 +54,8 @@
</span><span class="cx"> WEBCORE_EXPORT State currentState() const { return m_currentState; }
</span><span class="cx"> bool hasActiveMediaElements() const;
</span><span class="cx">
</span><del>- struct MediaMetadataInit {
- String title;
- String artist;
- String album;
- String artwork;
- };
</del><ins>+ void setMetadata(const Dictionary&);
</ins><span class="cx">
</span><del>- void setMetadata(const MediaMetadataInit&);
-
</del><span class="cx"> void deactivate();
</span><span class="cx">
</span><span class="cx"> // Runs the media session invocation algorithm and returns true on success.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.idl (200926 => 200927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.idl 2016-05-15 10:34:51 UTC (rev 200926)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.idl 2016-05-15 15:36:57 UTC (rev 200927)
</span><span class="lines">@@ -33,9 +33,7 @@
</span><span class="cx"> readonly attribute MediaSessionKind kind;
</span><span class="cx"> readonly attribute MediaRemoteControls? controls;
</span><span class="cx">
</span><del>- // FIXME: The latest specification says this should be:
- // attribute MediaMetadata? metadata;
- void setMetadata(MediaMetadataInit metadata);
</del><ins>+ void setMetadata(Dictionary metadata);
</ins><span class="cx">
</span><span class="cx"> void deactivate();
</span><span class="cx"> };
</span><span class="lines">@@ -46,10 +44,3 @@
</span><span class="cx"> "transient-solo",
</span><span class="cx"> "ambient"
</span><span class="cx"> };
</span><del>-
-dictionary MediaMetadataInit {
- DOMString title;
- DOMString artist;
- DOMString album;
- DOMString artwork;
-};
</del></span></pre>
</div>
</div>
</body>
</html>