<!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>[178977] branches/safari-600.5-branch/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/178977">178977</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 18:21:34 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/178967">r178967</a>. <rdar://19572776></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessioncpp">branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessionh">branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsCDMSessionh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/CDMSession.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCmm">branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178976 => 178977)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-23 02:17:32 UTC (rev 178976)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-23 02:21:34 UTC (rev 178977)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-01-22 Dana Burkart <dburkart@apple.com>
+
+ Merged r178967. <rdar://problem/19572776>
+
+ 2015-01-22 Jer Noble <jer.noble@apple.com>
+
+ [Mac][EME] Adopt changes to AVStreamSession class methods
+ https://bugs.webkit.org/show_bug.cgi?id=140778
+ rdar://problem/19458200
+
+ Reviewed by Eric Carlson.
+
+ AVStreamSession class methods have added a "storageDirectoryAtURL:" parameter so as to be able to
+ read and modify records stored at non-default storage locations.
+
+ * Modules/encryptedmedia/MediaKeySession.cpp:
+ (WebCore::MediaKeySession::mediaKeysStorageDirectory): Implement client method by querying document and settings.
+ * Modules/encryptedmedia/MediaKeySession.h:
+ * platform/graphics/CDMSession.h:
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+ (WebCore::CDMSessionMediaSourceAVFObjC::releaseKeys): Check whether the AVStreamSession class responds to new selector before calling.
+ (WebCore::CDMSessionMediaSourceAVFObjC::update): Ditto.
+ (WebCore::CDMSessionMediaSourceAVFObjC::generateKeyReleaseMessage): Ditto.
+ (WebCore::CDMSessionMediaSourceAVFObjC::storagePath): Fetch the storage path from the client.
+
+ 2015-01-22 Michael Saboff <msaboff@apple.com>
+
+ REGRESSION (174847): can't view NHK(Japan's national public broadcasting organization)’s news pages
+ https://bugs.webkit.org/show_bug.cgi?id=140794
+
+ Reviewed by Anders Carlsson.
+
+ If a document.open has been set, return it instead of always returning a new,
+ non-cached instance of jsHTMLDocumentPrototypeFunctionOpen.
+
+ Test: js/dom/document-overwrite-open.html
+
+ * bindings/js/JSHTMLDocumentCustom.cpp:
+ (WebCore::JSHTMLDocument::getOwnPropertySlot):
+
</ins><span class="cx"> 2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r178426. rdar://problem/19526069
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (178976 => 178977)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2015-01-23 02:17:32 UTC (rev 178976)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2015-01-23 02:21:34 UTC (rev 178977)
</span><span class="lines">@@ -30,11 +30,13 @@
</span><span class="cx">
</span><span class="cx"> #include "CDM.h"
</span><span class="cx"> #include "CDMSession.h"
</span><ins>+#include "Document.h"
</ins><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "GenericEventQueue.h"
</span><span class="cx"> #include "MediaKeyError.h"
</span><span class="cx"> #include "MediaKeyMessageEvent.h"
</span><span class="cx"> #include "MediaKeys.h"
</span><ins>+#include "Settings.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -220,6 +222,27 @@
</span><span class="cx"> m_asyncEventQueue.enqueueEvent(keyerrorEvent.release());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String MediaKeySession::mediaKeysStorageDirectory() const
+{
+ Document* document = toDocument(scriptExecutionContext());
+ if (!document)
+ return emptyString();
+
+ Settings* settings = document->settings();
+ if (!settings)
+ return emptyString();
+
+ String storageDirectory = settings->mediaKeysStorageDirectory();
+ if (storageDirectory.isEmpty())
+ return emptyString();
+
+ SecurityOrigin* origin = document->securityOrigin();
+ if (!origin)
+ return emptyString();
+
+ return pathByAppendingComponent(storageDirectory, origin->databaseIdentifier());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h (178976 => 178977)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-01-23 02:17:32 UTC (rev 178976)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-01-23 02:21:34 UTC (rev 178977)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> // CDMSessionClient
</span><span class="cx"> virtual void sendMessage(Uint8Array*, String destinationURL);
</span><span class="cx"> virtual void sendError(MediaKeyErrorCode, unsigned long systemCode);
</span><ins>+ virtual String mediaKeysStorageDirectory() const;
</ins><span class="cx">
</span><span class="cx"> MediaKeys* m_keys;
</span><span class="cx"> String m_keySystem;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsCDMSessionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/CDMSession.h (178976 => 178977)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/CDMSession.h 2015-01-23 02:17:32 UTC (rev 178976)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/CDMSession.h 2015-01-23 02:21:34 UTC (rev 178977)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> };
</span><span class="cx"> typedef unsigned short MediaKeyErrorCode;
</span><span class="cx"> virtual void sendError(MediaKeyErrorCode, unsigned long systemCode) = 0;
</span><ins>+
+ virtual String mediaKeysStorageDirectory() const = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum CDMSessionType {
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h (178976 => 178977)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-01-23 02:17:32 UTC (rev 178976)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-01-23 02:21:34 UTC (rev 178977)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> void setSessionId(const String& sessionId) { m_sessionId = sessionId; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><ins>+ String storagePath() const;
</ins><span class="cx"> PassRefPtr<Uint8Array> generateKeyReleaseMessage(unsigned short& errorCode, unsigned long& systemCode);
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<SourceBufferPrivateAVFObjC>> m_sourceBuffers;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (178976 => 178977)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-01-23 02:17:32 UTC (rev 178976)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-01-23 02:21:34 UTC (rev 178977)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "CDM.h"
</span><span class="cx"> #import "CDMSession.h"
</span><span class="cx"> #import "ExceptionCode.h"
</span><ins>+#import "FileSystem.h"
</ins><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaPlayer.h"
</span><span class="cx"> #import "SourceBufferPrivateAVFObjC.h"
</span><span class="lines">@@ -60,8 +61,8 @@
</span><span class="cx"> - (void)removeStreamDataParser:(AVStreamDataParser *)streamDataParser;
</span><span class="cx"> - (void)expire;
</span><span class="cx"> - (NSData *)contentProtectionSessionIdentifier;
</span><del>-+ (NSArray *)pendingExpiredSessionReportsWithAppIdentifier:(NSData *)appIdentifier;
-+ (void)removePendingExpiredSessionReports:(NSArray *)expiredSessionReports withAppIdentifier:(NSData *)appIdentifier;
</del><ins>++ (NSArray *)pendingExpiredSessionReportsWithAppIdentifier:(NSData *)appIdentifier storageDirectoryAtURL:(NSURL *)storageURL;
++ (void)removePendingExpiredSessionReports:(NSArray *)expiredSessionReports withAppIdentifier:(NSData *)appIdentifier storageDirectoryAtURL:(NSURL *)storageURL;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface CDMSessionMediaSourceAVFObjCObserver : NSObject {
</span><span class="lines">@@ -142,8 +143,11 @@
</span><span class="cx"> LOG(Media, "CDMSessionMediaSourceAVFObjC::releaseKeys(%p) - expiring stream session", this);
</span><span class="cx"> [m_streamSession expire];
</span><span class="cx">
</span><ins>+ if (![getAVStreamSessionClass() respondsToSelector:@selector(pendingExpiredSessionReportsWithAppIdentifier:storageDirectoryAtURL:)])
+ return;
+
</ins><span class="cx"> RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
</span><del>- NSArray* expiredSessions = [getAVStreamSessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get()];
</del><ins>+ NSArray* expiredSessions = [getAVStreamSessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:storagePath()]];
</ins><span class="cx"> for (NSData* expiredSessionData in expiredSessions) {
</span><span class="cx"> NSDictionary *expiredSession = [NSPropertyListSerialization propertyListWithData:expiredSessionData options:kCFPropertyListImmutable format:nullptr error:nullptr];
</span><span class="cx"> NSString *playbackSessionIdValue = (NSString *)[expiredSession objectForKey:PlaybackSessionIdKey];
</span><span class="lines">@@ -207,7 +211,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
</span><del>- [getAVStreamSessionClass() removePendingExpiredSessionReports:@[m_expiredSession.get()] withAppIdentifier:certificateData.get()];
</del><ins>+
+ if ([getAVStreamSessionClass() respondsToSelector:@selector(removePendingExpiredSessionReports:withAppIdentifier:storageDirectoryAtURL:)])
+ [getAVStreamSessionClass() removePendingExpiredSessionReports:@[m_expiredSession.get()] withAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:storagePath()]];
</ins><span class="cx"> m_expiredSession = nullptr;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -330,13 +336,24 @@
</span><span class="cx"> m_sourceBuffers.remove(m_sourceBuffers.find(sourceBuffer));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String CDMSessionMediaSourceAVFObjC::storagePath() const
+{
+ return m_client ? pathByAppendingComponent(m_client->mediaKeysStorageDirectory(), "SecureStop.plist") : emptyString();
+}
+
</ins><span class="cx"> PassRefPtr<Uint8Array> CDMSessionMediaSourceAVFObjC::generateKeyReleaseMessage(unsigned short& errorCode, unsigned long& systemCode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_mode == KeyRelease);
</span><span class="cx"> m_certificate = m_initData;
</span><span class="cx"> RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
</span><span class="cx">
</span><del>- NSArray* expiredSessions = [getAVStreamSessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get()];
</del><ins>+ if (![getAVStreamSessionClass() respondsToSelector:@selector(pendingExpiredSessionReportsWithAppIdentifier:storageDirectoryAtURL:)]) {
+ errorCode = MediaPlayer::KeySystemNotSupported;
+ systemCode = '!mor';
+ return nullptr;
+ }
+
+ NSArray* expiredSessions = [getAVStreamSessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:storagePath()]];
</ins><span class="cx"> if (![expiredSessions count]) {
</span><span class="cx"> LOG(Media, "CDMSessionMediaSourceAVFObjC::generateKeyReleaseMessage(%p) - no expired sessions found", this);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>