<!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>[186484] 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/186484">186484</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-07 16:52:29 -0700 (Tue, 07 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: propagate metadata changes to UI clients
https://bugs.webkit.org/show_bug.cgi?id=146660
Reviewed by Tim Horton.
* CMakeLists.txt: Added WebMediaSessionMetadata and WKMediaSessionMetadata.
* Shared/API/APIObject.h: Added a media session metadata type.
* Shared/API/c/WKBase.h:
* Shared/WebMediaSessionMetadata.cpp: Added API adapter for WebCore::MediaSessionMetadata.
(WebKit::WebMediaSessionMetadata::create):
(WebKit::WebMediaSessionMetadata::WebMediaSessionMetadata):
(WebKit::WebMediaSessionMetadata::~WebMediaSessionMetadata):
* Shared/WebMediaSessionMetadata.h: Added API adapter for WebCore::MediaSessionMetadata.
(WebKit::WebMediaSessionMetadata::title):
(WebKit::WebMediaSessionMetadata::artist):
(WebKit::WebMediaSessionMetadata::album):
* UIProcess/API/APIUIClient.h: Added 'mediaSessionMetadataDidChange' interface.
(API::UIClient::mediaSessionMetadataDidChange):
* UIProcess/API/C/WKAPICast.h:
* UIProcess/API/C/WKMediaSessionMetadata.cpp: Added C wrapper for WebMediaSessionMetadata.
(WKMediaSessionMetadataGetTypeID):
(WKMediaSessionMetadataCopyTitle):
(WKMediaSessionMetadataCopyArtist):
(WKMediaSessionMetadataCopyAlbum):
* UIProcess/API/C/WKMediaSessionMetadata.h: Added C wrapper for WebMediaSessionMetadata.
* UIProcess/API/C/WKPage.cpp: Forward 'mediaSessionMetadataDidChange' to client.
(WKPageSetPageUIClient):
* UIProcess/API/C/WKPageUIClient.h: Added 'mediaSessionMetadataDidChange' callback.
* UIProcess/WebPageProxy.cpp: Forward 'mediaSessionMetadataDidChange' to UI client.
(WebKit::WebPageProxy::mediaSessionMetadataDidChange):
* WebKit2.xcodeproj/project.pbxproj: Added WebMediaSessionMetadata and WKMediaSessionMetadata.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKBaseh">trunk/Source/WebKit2/Shared/API/c/WKBase.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageUIClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebMediaSessionMetadatacpp">trunk/Source/WebKit2/Shared/WebMediaSessionMetadata.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebMediaSessionMetadatah">trunk/Source/WebKit2/Shared/WebMediaSessionMetadata.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKMediaSessionMetadatacpp">trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionMetadata.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKMediaSessionMetadatah">trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionMetadata.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -251,6 +251,7 @@
</span><span class="cx"> Shared/WebImage.cpp
</span><span class="cx"> Shared/WebKeyboardEvent.cpp
</span><span class="cx"> Shared/WebKit2Initialize.cpp
</span><ins>+ Shared/WebMediaSessionMetadata.cpp
</ins><span class="cx"> Shared/WebMemorySampler.cpp
</span><span class="cx"> Shared/WebMouseEvent.cpp
</span><span class="cx"> Shared/WebOpenPanelParameters.cpp
</span><span class="lines">@@ -425,6 +426,7 @@
</span><span class="cx"> UIProcess/API/C/WKInspector.cpp
</span><span class="cx"> UIProcess/API/C/WKKeyValueStorageManager.cpp
</span><span class="cx"> UIProcess/API/C/WKMediaCacheManager.cpp
</span><ins>+ UIProcess/API/C/WKMediaSessionMetadata.cpp
</ins><span class="cx"> UIProcess/API/C/WKNavigationActionRef.cpp
</span><span class="cx"> UIProcess/API/C/WKNavigationDataRef.cpp
</span><span class="cx"> UIProcess/API/C/WKNavigationRef.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-07-06 Matt Rajca <mrajca@apple.com>
+
+ Media Session: propagate metadata changes to UI clients
+ https://bugs.webkit.org/show_bug.cgi?id=146660
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt: Added WebMediaSessionMetadata and WKMediaSessionMetadata.
+ * Shared/API/APIObject.h: Added a media session metadata type.
+ * Shared/API/c/WKBase.h:
+ * Shared/WebMediaSessionMetadata.cpp: Added API adapter for WebCore::MediaSessionMetadata.
+ (WebKit::WebMediaSessionMetadata::create):
+ (WebKit::WebMediaSessionMetadata::WebMediaSessionMetadata):
+ (WebKit::WebMediaSessionMetadata::~WebMediaSessionMetadata):
+ * Shared/WebMediaSessionMetadata.h: Added API adapter for WebCore::MediaSessionMetadata.
+ (WebKit::WebMediaSessionMetadata::title):
+ (WebKit::WebMediaSessionMetadata::artist):
+ (WebKit::WebMediaSessionMetadata::album):
+ * UIProcess/API/APIUIClient.h: Added 'mediaSessionMetadataDidChange' interface.
+ (API::UIClient::mediaSessionMetadataDidChange):
+ * UIProcess/API/C/WKAPICast.h:
+ * UIProcess/API/C/WKMediaSessionMetadata.cpp: Added C wrapper for WebMediaSessionMetadata.
+ (WKMediaSessionMetadataGetTypeID):
+ (WKMediaSessionMetadataCopyTitle):
+ (WKMediaSessionMetadataCopyArtist):
+ (WKMediaSessionMetadataCopyAlbum):
+ * UIProcess/API/C/WKMediaSessionMetadata.h: Added C wrapper for WebMediaSessionMetadata.
+ * UIProcess/API/C/WKPage.cpp: Forward 'mediaSessionMetadataDidChange' to client.
+ (WKPageSetPageUIClient):
+ * UIProcess/API/C/WKPageUIClient.h: Added 'mediaSessionMetadataDidChange' callback.
+ * UIProcess/WebPageProxy.cpp: Forward 'mediaSessionMetadataDidChange' to UI client.
+ (WebKit::WebPageProxy::mediaSessionMetadataDidChange):
+ * WebKit2.xcodeproj/project.pbxproj: Added WebMediaSessionMetadata and WKMediaSessionMetadata.
+
</ins><span class="cx"> 2015-07-07 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> HTTP Auth cached after disabling private browsing/reset.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -149,6 +149,10 @@
</span><span class="cx"> WebsiteDataRecord,
</span><span class="cx"> WebsiteDataStore,
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+ MediaSessionMetadata,
+#endif
+
</ins><span class="cx"> // Bundle types
</span><span class="cx"> Bundle,
</span><span class="cx"> BundleBackForwardList,
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx"> typedef const struct OpaqueWKInspector* WKInspectorRef;
</span><span class="cx"> typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
</span><span class="cx"> typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
</span><ins>+typedef const struct OpaqueWKMediaSessionMetadata* WKMediaSessionMetadataRef;
</ins><span class="cx"> typedef const struct OpaqueWKNavigationAction* WKNavigationActionRef;
</span><span class="cx"> typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
</span><span class="cx"> typedef const struct OpaqueWKNavigation* WKNavigationRef;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebMediaSessionMetadatacpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/WebMediaSessionMetadata.cpp (0 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebMediaSessionMetadata.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/WebMediaSessionMetadata.cpp 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebMediaSessionMetadata.h"
+
+#if ENABLE(MEDIA_SESSION)
+
+using namespace WebCore;
+
+namespace WebKit {
+
+Ref<WebMediaSessionMetadata> WebMediaSessionMetadata::create(const MediaSessionMetadata& metadata)
+{
+ return adoptRef(*new WebMediaSessionMetadata(metadata));
+}
+
+WebMediaSessionMetadata::WebMediaSessionMetadata(const MediaSessionMetadata& metadata)
+ : m_metadata(metadata)
+{
+}
+
+WebMediaSessionMetadata::~WebMediaSessionMetadata()
+{
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(MEDIA_SESSION)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebMediaSessionMetadatah"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/WebMediaSessionMetadata.h (0 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebMediaSessionMetadata.h (rev 0)
+++ trunk/Source/WebKit2/Shared/WebMediaSessionMetadata.h 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebMediaSessionMetadata_h
+#define WebMediaSessionMetadata_h
+
+#if ENABLE(MEDIA_SESSION)
+
+#include "APIObject.h"
+#include <WebCore/MediaSessionMetadata.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+class WebMediaSessionMetadata : public API::ObjectImpl<API::Object::Type::MediaSessionMetadata> {
+public:
+ static Ref<WebMediaSessionMetadata> create(const WebCore::MediaSessionMetadata&);
+ ~WebMediaSessionMetadata();
+
+ String title() const { return m_metadata.title(); }
+ String artist() const { return m_metadata.artist(); }
+ String album() const { return m_metadata.album(); }
+
+private:
+ explicit WebMediaSessionMetadata(const WebCore::MediaSessionMetadata&);
+
+ WebCore::MediaSessionMetadata m_metadata;
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(MEDIA_SESSION)
+
+#endif // WebMediaSessionMetadata_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -57,6 +57,10 @@
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> struct NavigationActionData;
</span><span class="cx"> struct SecurityOriginData;
</span><ins>+
+#if ENABLE(MEDIA_SESSION)
+class WebMediaSessionMetadata;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -150,6 +154,10 @@
</span><span class="cx">
</span><span class="cx"> virtual void isPlayingAudioDidChange(WebKit::WebPageProxy&) { }
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+ virtual void mediaSessionMetadataDidChange(WebKit::WebPageProxy&, WebKit::WebMediaSessionMetadata*) { }
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) { return WTF::move(defaultActions); }
</span><span class="cx"> virtual void didNotHandleTapAsClick(const WebCore::IntPoint&) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> class WebIconDatabase;
</span><span class="cx"> class WebInspectorProxy;
</span><span class="cx"> class WebMediaCacheManagerProxy;
</span><ins>+class WebMediaSessionMetadata;
</ins><span class="cx"> class WebNotification;
</span><span class="cx"> class WebNotificationManagerProxy;
</span><span class="cx"> class WebNotificationProvider;
</span><span class="lines">@@ -135,6 +136,7 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase)
</span><span class="cx"> WK_ADD_API_MAPPING(WKInspectorRef, WebInspectorProxy)
</span><span class="cx"> WK_ADD_API_MAPPING(WKMediaCacheManagerRef, WebMediaCacheManagerProxy)
</span><ins>+WK_ADD_API_MAPPING(WKMediaSessionMetadataRef, WebMediaSessionMetadata)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKNavigationActionRef, API::NavigationAction)
</span><span class="cx"> WK_ADD_API_MAPPING(WKNavigationDataRef, API::NavigationData)
</span><span class="cx"> WK_ADD_API_MAPPING(WKNavigationRef, API::Navigation)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKMediaSessionMetadatacpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionMetadata.cpp (0 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionMetadata.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionMetadata.cpp 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WKMediaSessionMetadata.h"
+
+#include "WKAPICast.h"
+#include "WebMediaSessionMetadata.h"
+
+using namespace WebKit;
+
+WKTypeID WKMediaSessionMetadataGetTypeID()
+{
+#if ENABLE(MEDIA_SESSION)
+ return toAPI(WebMediaSessionMetadata::APIType);
+#else
+ return toAPI(API::Object::Type::Null);
+#endif
+}
+
+WKStringRef WKMediaSessionMetadataCopyTitle(WKMediaSessionMetadataRef metadata)
+{
+#if ENABLE(MEDIA_SESSION)
+ return toCopiedAPI(toImpl(metadata)->title());
+#else
+ UNUSED_PARAM(metadata);
+ return nullptr;
+#endif
+}
+
+WKStringRef WKMediaSessionMetadataCopyArtist(WKMediaSessionMetadataRef metadata)
+{
+#if ENABLE(MEDIA_SESSION)
+ return toCopiedAPI(toImpl(metadata)->artist());
+#else
+ UNUSED_PARAM(metadata);
+ return nullptr;
+#endif
+}
+
+WKStringRef WKMediaSessionMetadataCopyAlbum(WKMediaSessionMetadataRef metadata)
+{
+#if ENABLE(MEDIA_SESSION)
+ return toCopiedAPI(toImpl(metadata)->album());
+#else
+ UNUSED_PARAM(metadata);
+ return nullptr;
+#endif
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKMediaSessionMetadatah"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionMetadata.h (0 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionMetadata.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionMetadata.h 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKMediaSessionMetadata_h
+#define WKMediaSessionMetadata_h
+
+#include <WebKit/WKBase.h>
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKMediaSessionMetadataGetTypeID();
+
+WK_EXPORT WKStringRef WKMediaSessionMetadataCopyTitle(WKMediaSessionMetadataRef metadata);
+WK_EXPORT WKStringRef WKMediaSessionMetadataCopyArtist(WKMediaSessionMetadataRef metadata);
+WK_EXPORT WKStringRef WKMediaSessionMetadataCopyAlbum(WKMediaSessionMetadataRef metadata);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKMediaSessionMetadata_h */
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><ins>+#include "WebMediaSessionMetadata.h"
</ins><span class="cx"> #include <WebCore/MediaEventTypes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1800,6 +1801,16 @@
</span><span class="cx">
</span><span class="cx"> m_client.didClickAutoFillButton(toAPI(&page), toAPI(userInfo), m_client.base.clientInfo);
</span><span class="cx"> }
</span><ins>+
+#if ENABLE(MEDIA_SESSION)
+ virtual void mediaSessionMetadataDidChange(WebPageProxy& page, WebMediaSessionMetadata* metadata) override
+ {
+ if (!m_client.mediaSessionMetadataDidChange)
+ return;
+
+ m_client.mediaSessionMetadataDidChange(toAPI(&page), toAPI(metadata), m_client.base.clientInfo);
+ }
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> toImpl(pageRef)->setUIClient(std::make_unique<UIClient>(wkClient));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> typedef void (*WKPageIsPlayingAudioDidChangeCallback)(WKPageRef page, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageDecidePolicyForUserMediaPermissionRequestCallback)(WKPageRef page, WKFrameRef frame, WKSecurityOriginRef origin, WKUserMediaPermissionRequestRef permissionRequest, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageDidClickAutoFillButtonCallback)(WKPageRef page, WKTypeRef userData, const void *clientInfo);
</span><ins>+typedef void (*WKPageMediaSessionMetadataDidChangeCallback)(WKPageRef page, WKMediaSessionMetadataRef metadata, const void* clientInfo);
</ins><span class="cx">
</span><span class="cx"> // Deprecated
</span><span class="cx"> typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV0)(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
</span><span class="lines">@@ -452,6 +453,7 @@
</span><span class="cx"> WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
</span><span class="cx"> WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
</span><span class="cx"> WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
</span><ins>+ WKPageMediaSessionMetadataDidChangeCallback mediaSessionMetadataDidChange;
</ins><span class="cx"> } WKPageUIClientV5;
</span><span class="cx">
</span><span class="cx"> enum { kWKPageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -159,6 +159,11 @@
</span><span class="cx"> #include <WebCore/WebMediaSessionManager.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+#include "WebMediaSessionMetadata.h"
+#include <WebCore/MediaSessionMetadata.h>
+#endif
+
</ins><span class="cx"> // This controls what strategy we use for mouse wheel coalescing.
</span><span class="cx"> #define MERGE_WHEEL_EVENTS 1
</span><span class="cx">
</span><span class="lines">@@ -5806,6 +5811,8 @@
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> void WebPageProxy::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata)
</span><span class="cx"> {
</span><ins>+ Ref<WebMediaSessionMetadata> webMetadata = WebMediaSessionMetadata::create(metadata);
+ m_uiClient->mediaSessionMetadataDidChange(*this, webMetadata.ptr());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -1659,6 +1659,10 @@
</span><span class="cx"> C5E1AFEF16B21029006CC1F2 /* APIWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9F16ACD47800316DE2 /* APIWebArchiveResource.h */; };
</span><span class="cx"> C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = C5FA1ED118E1062200B3F402 /* WKAirPlayRoutePicker.h */; };
</span><span class="cx"> C5FA1ED418E1062200B3F402 /* WKAirPlayRoutePicker.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5FA1ED218E1062200B3F402 /* WKAirPlayRoutePicker.mm */; };
</span><ins>+ C9CD43971B4B001900239E33 /* WebMediaSessionMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9CD43931B4B000E00239E33 /* WebMediaSessionMetadata.cpp */; };
+ C9CD43981B4B001D00239E33 /* WebMediaSessionMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = C9CD43941B4B000E00239E33 /* WebMediaSessionMetadata.h */; };
+ C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = C9CD439A1B4B024200239E33 /* WKMediaSessionMetadata.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ C9CD439E1B4B025300239E33 /* WKMediaSessionMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9CD43991B4B024200239E33 /* WKMediaSessionMetadata.cpp */; };
</ins><span class="cx"> CD003A5219D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD003A5019D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp */; };
</span><span class="cx"> CD003A5319D49B5D005ABCE0 /* WebMediaKeyStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CD003A5119D49B5D005ABCE0 /* WebMediaKeyStorageManager.h */; };
</span><span class="cx"> CD19A26D1A13E82A008D650E /* WebDiagnosticLoggingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD19A2691A13E820008D650E /* WebDiagnosticLoggingClient.cpp */; };
</span><span class="lines">@@ -3879,6 +3883,10 @@
</span><span class="cx"> C59C4A5718B81174007BDCB6 /* AssistedNodeInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssistedNodeInformation.h; sourceTree = "<group>"; };
</span><span class="cx"> C5FA1ED118E1062200B3F402 /* WKAirPlayRoutePicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKAirPlayRoutePicker.h; path = ios/forms/WKAirPlayRoutePicker.h; sourceTree = "<group>"; };
</span><span class="cx"> C5FA1ED218E1062200B3F402 /* WKAirPlayRoutePicker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKAirPlayRoutePicker.mm; path = ios/forms/WKAirPlayRoutePicker.mm; sourceTree = "<group>"; };
</span><ins>+ C9CD43931B4B000E00239E33 /* WebMediaSessionMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaSessionMetadata.cpp; sourceTree = "<group>"; };
+ C9CD43941B4B000E00239E33 /* WebMediaSessionMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaSessionMetadata.h; sourceTree = "<group>"; };
+ C9CD43991B4B024200239E33 /* WKMediaSessionMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMediaSessionMetadata.cpp; sourceTree = "<group>"; };
+ C9CD439A1B4B024200239E33 /* WKMediaSessionMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMediaSessionMetadata.h; sourceTree = "<group>"; };
</ins><span class="cx"> CD003A5019D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebMediaKeyStorageManager.cpp; path = MediaCache/WebMediaKeyStorageManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CD003A5119D49B5D005ABCE0 /* WebMediaKeyStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebMediaKeyStorageManager.h; path = MediaCache/WebMediaKeyStorageManager.h; sourceTree = "<group>"; };
</span><span class="cx"> CD19A2691A13E820008D650E /* WebDiagnosticLoggingClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDiagnosticLoggingClient.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4763,6 +4771,8 @@
</span><span class="cx"> C0337DD2127A2A0E008FF4F4 /* WebKeyboardEvent.cpp */,
</span><span class="cx"> BC9BA5021697C45300E44616 /* WebKit2Initialize.cpp */,
</span><span class="cx"> BC9BA5031697C45300E44616 /* WebKit2Initialize.h */,
</span><ins>+ C9CD43931B4B000E00239E33 /* WebMediaSessionMetadata.cpp */,
+ C9CD43941B4B000E00239E33 /* WebMediaSessionMetadata.h */,
</ins><span class="cx"> 905620E812BC248B000799B6 /* WebMemorySampler.cpp */,
</span><span class="cx"> 905620E912BC248B000799B6 /* WebMemorySampler.h */,
</span><span class="cx"> C0337DAF127A28D0008FF4F4 /* WebMouseEvent.cpp */,
</span><span class="lines">@@ -6302,6 +6312,8 @@
</span><span class="cx"> 2D790A9E1AD7164900AB90B3 /* WKLayoutMode.h */,
</span><span class="cx"> 33D3A3B31339600B00709BE4 /* WKMediaCacheManager.cpp */,
</span><span class="cx"> 33D3A3B41339600B00709BE4 /* WKMediaCacheManager.h */,
</span><ins>+ C9CD43991B4B024200239E33 /* WKMediaSessionMetadata.cpp */,
+ C9CD439A1B4B024200239E33 /* WKMediaSessionMetadata.h */,
</ins><span class="cx"> C09AE5E8125257C20025825D /* WKNativeEvent.h */,
</span><span class="cx"> 2D3A65D81A7C3A1F00CAC637 /* WKNavigationActionRef.cpp */,
</span><span class="cx"> 2D3A65D91A7C3A1F00CAC637 /* WKNavigationActionRef.h */,
</span><span class="lines">@@ -7967,6 +7979,7 @@
</span><span class="cx"> 33D3A3BB1339606200709BE4 /* WebMediaCacheManagerProxy.h in Headers */,
</span><span class="cx"> 33D3A3CB1339617900709BE4 /* WebMediaCacheManagerProxyMessages.h in Headers */,
</span><span class="cx"> CD003A5319D49B5D005ABCE0 /* WebMediaKeyStorageManager.h in Headers */,
</span><ins>+ C9CD43981B4B001D00239E33 /* WebMediaSessionMetadata.h in Headers */,
</ins><span class="cx"> 2D3EF4431917646300034184 /* WebMemoryPressureHandlerIOS.h in Headers */,
</span><span class="cx"> 909854ED12BC4E18000AD080 /* WebMemorySampler.h in Headers */,
</span><span class="cx"> BCF69F9A1176CED600471A52 /* WebNavigationDataStore.h in Headers */,
</span><span class="lines">@@ -8184,6 +8197,7 @@
</span><span class="cx"> 51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */,
</span><span class="cx"> 2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
</span><span class="cx"> 33D3A3B61339600B00709BE4 /* WKMediaCacheManager.h in Headers */,
</span><ins>+ C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
</ins><span class="cx"> BC4075FE124FF0270068F20A /* WKMutableArray.h in Headers */,
</span><span class="cx"> BC407600124FF0270068F20A /* WKMutableDictionary.h in Headers */,
</span><span class="cx"> C09AE5E9125257C20025825D /* WKNativeEvent.h in Headers */,
</span><span class="lines">@@ -9782,6 +9796,7 @@
</span><span class="cx"> 33D3A3BA1339606200709BE4 /* WebMediaCacheManagerProxy.cpp in Sources */,
</span><span class="cx"> 33D3A3CA1339617900709BE4 /* WebMediaCacheManagerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> CD003A5219D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp in Sources */,
</span><ins>+ C9CD43971B4B001900239E33 /* WebMediaSessionMetadata.cpp in Sources */,
</ins><span class="cx"> 2D3EF4421917646300034184 /* WebMemoryPressureHandlerIOS.mm in Sources */,
</span><span class="cx"> 909854EC12BC4E17000AD080 /* WebMemorySampler.cpp in Sources */,
</span><span class="cx"> 909854EE12BC4E18000AD080 /* WebMemorySampler.mac.mm in Sources */,
</span><span class="lines">@@ -9968,6 +9983,7 @@
</span><span class="cx"> A54293A5195A43DD002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm in Sources */,
</span><span class="cx"> 51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */,
</span><span class="cx"> 33D3A3B51339600B00709BE4 /* WKMediaCacheManager.cpp in Sources */,
</span><ins>+ C9CD439E1B4B025300239E33 /* WKMediaSessionMetadata.cpp in Sources */,
</ins><span class="cx"> BC4075FD124FF0270068F20A /* WKMutableArray.cpp in Sources */,
</span><span class="cx"> BC4075FF124FF0270068F20A /* WKMutableDictionary.cpp in Sources */,
</span><span class="cx"> 1A5B1C501898606F004FCF9B /* WKNavigation.mm in Sources */,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Tools/ChangeLog 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-07-06 Matt Rajca <mrajca@apple.com>
+
+ Media Session: propagate metadata changes to UI clients
+ https://bugs.webkit.org/show_bug.cgi?id=146660
+
+ Reviewed by Tim Horton.
+
+ * WebKitTestRunner/TestController.cpp: Build fixes for updated PageUIClient.
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::createWebViewWithOptions):
+
</ins><span class="cx"> 2015-07-07 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> HTTP Auth cached after disabling private browsing/reset.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (186483 => 186484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-07-07 23:25:55 UTC (rev 186483)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-07-07 23:52:29 UTC (rev 186484)
</span><span class="lines">@@ -263,6 +263,7 @@
</span><span class="cx"> 0, // runJavaScriptAlert
</span><span class="cx"> 0, // runJavaScriptConfirm
</span><span class="cx"> 0, // runJavaScriptPrompt
</span><ins>+ 0, // mediaSessionMetadataDidChange
</ins><span class="cx"> };
</span><span class="cx"> WKPageSetPageUIClient(newPage, &otherPageUIClient.base);
</span><span class="cx">
</span><span class="lines">@@ -511,6 +512,7 @@
</span><span class="cx"> 0, // runJavaScriptAlert
</span><span class="cx"> 0, // runJavaScriptConfirm
</span><span class="cx"> 0, // runJavaScriptPrompt
</span><ins>+ 0, // mediaSessionMetadataDidChange
</ins><span class="cx"> };
</span><span class="cx"> WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient.base);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>