<!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>[185929] trunk/Source</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/185929">185929</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-24 15:36:07 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaSession: propagate MediaSessionMetadata to WebPageProxy
https://bugs.webkit.org/show_bug.cgi?id=146282
Reviewed by Darin Adler and Tim Horton.
WebCore:
* Modules/mediasession/MediaSession.cpp:
(WebCore::MediaSession::setMetadata):
WebKit2:
* Shared/WebCoreArgumentCoders.cpp: Added ArgumentEncoder support for MediaSessionMetadata so we can send it
through the web page proxy.
(IPC::ArgumentCoder<MediaSessionMetadata>::encode):
(IPC::ArgumentCoder<MediaSessionMetadata>::decode):
* Shared/WebCoreArgumentCoders.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::mediaSessionMetadataDidChange):
* UIProcess/WebPageProxy.h: Receive mediaSessionMetadataDidChange in the web page proxy.
* UIProcess/WebPageProxy.messages.in: Added a new MediaSessionMetadataDidChange message.
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::mediaSessionMetadataDidChange): Push a mediaSessionMetadataDidChange message through the web page proxy.
* WebProcess/WebCoreSupport/WebChromeClient.h:</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="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebCore/ChangeLog 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-24 Matt Rajca <mrajca@apple.com>
+
+ MediaSession: propagate MediaSessionMetadata to WebPageProxy
+ https://bugs.webkit.org/show_bug.cgi?id=146282
+
+ Reviewed by Darin Adler and Tim Horton.
+
+ * Modules/mediasession/MediaSession.cpp:
+ (WebCore::MediaSession::setMetadata):
+
</ins><span class="cx"> 2015-06-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Null dereference in DocumentLoader::areAllLoadersPageCacheAcceptable()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx">
</span><ins>+#include "Chrome.h"
+#include "ChromeClient.h"
</ins><span class="cx"> #include "Dictionary.h"
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="lines">@@ -99,6 +101,9 @@
</span><span class="cx"> artworkURL = m_document.completeURL(artworkPath);
</span><span class="cx">
</span><span class="cx"> m_metadata = MediaSessionMetadata(title, artist, album, artworkURL);
</span><ins>+
+ if (Page *page = m_document.page())
+ page->chrome().client().mediaSessionMetadataDidChange(m_metadata);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSession::releaseSession()
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebCore/page/ChromeClient.h 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -45,6 +45,12 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+namespace WebCore {
+struct MediaSessionMetadata;
+}
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #define NSResponder WAKResponder
</span><span class="lines">@@ -412,6 +418,10 @@
</span><span class="cx">
</span><span class="cx"> virtual void isPlayingMediaDidChange(MediaProducer::MediaStateFlags) { }
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+ virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) { }
+#endif
+
</ins><span class="cx"> virtual void setPageActivityState(PageActivityState::Flags) { }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-24 Matt Rajca <mrajca@apple.com>
+
+ MediaSession: propagate MediaSessionMetadata to WebPageProxy
+ https://bugs.webkit.org/show_bug.cgi?id=146282
+
+ Reviewed by Darin Adler and Tim Horton.
+
+ * Shared/WebCoreArgumentCoders.cpp: Added ArgumentEncoder support for MediaSessionMetadata so we can send it
+ through the web page proxy.
+ (IPC::ArgumentCoder<MediaSessionMetadata>::encode):
+ (IPC::ArgumentCoder<MediaSessionMetadata>::decode):
+ * Shared/WebCoreArgumentCoders.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::mediaSessionMetadataDidChange):
+ * UIProcess/WebPageProxy.h: Receive mediaSessionMetadataDidChange in the web page proxy.
+ * UIProcess/WebPageProxy.messages.in: Added a new MediaSessionMetadataDidChange message.
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::mediaSessionMetadataDidChange): Push a mediaSessionMetadataDidChange message through the web page proxy.
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2015-06-24 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] A checkmark is briefly visible next to the webpage context menu items when they're clicked
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -87,6 +87,10 @@
</span><span class="cx"> #import <WebCore/MediaPlaybackTargetContext.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+#include <WebCore/MediaSessionMetadata.h>
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -1446,6 +1450,32 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+void ArgumentCoder<MediaSessionMetadata>::encode(ArgumentEncoder& encoder, const MediaSessionMetadata& result)
+{
+ encoder << result.artist();
+ encoder << result.album();
+ encoder << result.title();
+ encoder << result.artworkURL();
+}
+
+bool ArgumentCoder<MediaSessionMetadata>::decode(ArgumentDecoder& decoder, MediaSessionMetadata& result)
+{
+ String artist, album, title;
+ URL artworkURL;
+ if (!decoder.decode(artist))
+ return false;
+ if (!decoder.decode(album))
+ return false;
+ if (!decoder.decode(title))
+ return false;
+ if (!decoder.decode(artworkURL))
+ return false;
+ result = MediaSessionMetadata(title, artist, album, artworkURL);
+ return true;
+}
+#endif
+
</ins><span class="cx"> void ArgumentCoder<UserScript>::encode(ArgumentEncoder& encoder, const UserScript& userScript)
</span><span class="cx"> {
</span><span class="cx"> encoder << userScript.source();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -121,6 +121,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+namespace WebCore {
+struct MediaSessionMetadata;
+}
+#endif
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::AffineTransform> {
</span><span class="lines">@@ -455,6 +461,13 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+template<> struct ArgumentCoder<WebCore::MediaSessionMetadata> {
+ static void encode(ArgumentEncoder&, const WebCore::MediaSessionMetadata&);
+ static bool decode(ArgumentDecoder&, WebCore::MediaSessionMetadata&);
+};
+#endif
+
</ins><span class="cx"> template<> struct ArgumentCoder<WebCore::TextIndicatorData> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::TextIndicatorData&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::TextIndicatorData&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -5770,6 +5770,12 @@
</span><span class="cx"> m_uiClient->isPlayingAudioDidChange(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+void WebPageProxy::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata)
+{
+}
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void WebPageProxy::removeNavigationGestureSnapshot()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -119,6 +119,12 @@
</span><span class="cx"> #include <WebCore/WebMediaSessionManagerClient.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+namespace WebCore {
+struct MediaSessionMetadata;
+}
+#endif
+
</ins><span class="cx"> namespace API {
</span><span class="cx"> class ContextMenuClient;
</span><span class="cx"> class FindClient;
</span><span class="lines">@@ -1013,6 +1019,10 @@
</span><span class="cx"> bool isPlayingAudio() const { return !!(m_mediaState & WebCore::MediaProducer::IsPlayingAudio); }
</span><span class="cx"> void isPlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags);
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+ void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&);
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void removeNavigationGestureSnapshot();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -423,6 +423,10 @@
</span><span class="cx">
</span><span class="cx"> IsPlayingMediaDidChange(unsigned state)
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+ MediaSessionMetadataDidChange(WebCore::MediaSessionMetadata metadata);
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> DidPerformImmediateActionHitTest(struct WebKit::WebHitTestResult::Data result, bool contentPreventsDefault, WebKit::UserData userData)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -1061,6 +1061,13 @@
</span><span class="cx"> m_page->send(Messages::WebPageProxy::IsPlayingMediaDidChange(state));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+void WebChromeClient::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata)
+{
+ m_page->send(Messages::WebPageProxy::MediaSessionMetadataDidChange(metadata));
+}
+#endif
+
</ins><span class="cx"> void WebChromeClient::setPageActivityState(PageActivityState::Flags activityState)
</span><span class="cx"> {
</span><span class="cx"> m_page->setPageActivityState(activityState);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (185928 => 185929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-06-24 22:17:42 UTC (rev 185928)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-06-24 22:36:07 UTC (rev 185929)
</span><span class="lines">@@ -294,6 +294,10 @@
</span><span class="cx"> virtual void isPlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags) override;
</span><span class="cx"> virtual void setPageActivityState(WebCore::PageActivityState::Flags) override;
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_SESSION)
+ virtual void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) override;
+#endif
+
</ins><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx"> virtual bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const override;
</span><span class="cx"> virtual bool unwrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const override;
</span></span></pre>
</div>
</div>
</body>
</html>