<!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>[172422] 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/172422">172422</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-08-11 17:36:33 -0700 (Mon, 11 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] <video> element requests are missing session cookies; sometimes persistant cookies.
https://bugs.webkit.org/show_bug.cgi?id=135816
Reviewed by Alexey Proskuryakov.
On iOS, the AVFoundation framework will copy appropriate cookies for the requested URL across to the
mediaserverd process. For WebKit2, the WebProcess does not have access to session cookies for the
current browsing session. When creating an AVURLAsset, fetch the appropriate cookies for the requested
URL, and pass them into AVURLAsset in the options dictionary.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerGetRawCookies): Call CookieJar's equivalent method.
* html/HTMLMediaElement.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::getRawCookies): Pass to HTMLMediaElement.
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerGetRawCookies):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::toNSHTTPCookie): Convert a WebCore Cookie -> NSHTTPCookie.
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL): Fetch cookies for the requested
URL, and if successful, add them to the AVURLAsset options dictionary.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172421 => 172422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-12 00:13:35 UTC (rev 172421)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 00:36:33 UTC (rev 172422)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-08-11 Jer Noble <jer.noble@apple.com>
+
+ [iOS] <video> element requests are missing session cookies; sometimes persistant cookies.
+ https://bugs.webkit.org/show_bug.cgi?id=135816
+
+ Reviewed by Alexey Proskuryakov.
+
+ On iOS, the AVFoundation framework will copy appropriate cookies for the requested URL across to the
+ mediaserverd process. For WebKit2, the WebProcess does not have access to session cookies for the
+ current browsing session. When creating an AVURLAsset, fetch the appropriate cookies for the requested
+ URL, and pass them into AVURLAsset in the options dictionary.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaPlayerGetRawCookies): Call CookieJar's equivalent method.
+ * html/HTMLMediaElement.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::getRawCookies): Pass to HTMLMediaElement.
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::mediaPlayerGetRawCookies):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::toNSHTTPCookie): Convert a WebCore Cookie -> NSHTTPCookie.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL): Fetch cookies for the requested
+ URL, and if successful, add them to the AVURLAsset options dictionary.
+
</ins><span class="cx"> 2014-08-11 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Adjustments to CueBox CSS Width calculations Part 2.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (172421 => 172422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-08-12 00:13:35 UTC (rev 172421)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-08-12 00:36:33 UTC (rev 172422)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "ClientRectList.h"
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "ContentType.h"
</span><ins>+#include "CookieJar.h"
</ins><span class="cx"> #include "DiagnosticLoggingKeys.h"
</span><span class="cx"> #include "DisplaySleepDisabler.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="lines">@@ -5744,6 +5745,11 @@
</span><span class="cx">
</span><span class="cx"> return settings->networkInterfaceName();
</span><span class="cx"> }
</span><ins>+
+bool HTMLMediaElement::mediaPlayerGetRawCookies(const URL& url, Vector<Cookie>& cookies) const
+{
+ return getRawCookies(&document(), url, cookies);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (172421 => 172422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-08-12 00:13:35 UTC (rev 172421)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-08-12 00:36:33 UTC (rev 172422)
</span><span class="lines">@@ -572,6 +572,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual String mediaPlayerNetworkInterfaceName() const;
</span><ins>+ virtual bool mediaPlayerGetRawCookies(const URL&, Vector<Cookie>&) const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void loadTimerFired(Timer<HTMLMediaElement>&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (172421 => 172422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-08-12 00:13:35 UTC (rev 172421)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-08-12 00:36:33 UTC (rev 172422)
</span><span class="lines">@@ -1428,6 +1428,14 @@
</span><span class="cx">
</span><span class="cx"> return m_mediaPlayerClient->mediaPlayerNetworkInterfaceName();
</span><span class="cx"> }
</span><ins>+
+bool MediaPlayer::getRawCookies(const URL& url, Vector<Cookie>& cookies) const
+{
+ if (!m_mediaPlayerClient)
+ return false;
+
+ return m_mediaPlayerClient->mediaPlayerGetRawCookies(url, cookies);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (172421 => 172422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-08-12 00:13:35 UTC (rev 172421)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-08-12 00:36:33 UTC (rev 172422)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> class MediaPlayerPrivateInterface;
</span><span class="cx"> class TextTrackRepresentation;
</span><ins>+struct Cookie;
</ins><span class="cx">
</span><span class="cx"> // Structure that will hold every native
</span><span class="cx"> // types supported by the current media player.
</span><span class="lines">@@ -264,6 +265,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual String mediaPlayerNetworkInterfaceName() const { return String(); }
</span><ins>+ virtual bool mediaPlayerGetRawCookies(const URL&, Vector<Cookie>&) const { return false; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual bool mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&) { return false; }
</span><span class="lines">@@ -560,6 +562,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> String mediaPlayerNetworkInterfaceName() const;
</span><ins>+ bool getRawCookies(const URL&, Vector<Cookie>&) const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static void resetMediaEngines();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (172421 => 172422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-12 00:13:35 UTC (rev 172421)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-08-12 00:36:33 UTC (rev 172422)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "AuthenticationChallenge.h"
</span><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "CDMSessionAVFoundationObjC.h"
</span><ins>+#import "Cookie.h"
</ins><span class="cx"> #import "ExceptionCodePlaceholder.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><span class="lines">@@ -228,6 +229,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><ins>+SOFT_LINK_POINTER(AVFoundation, AVURLAssetHTTPCookiesKey, NSString*)
</ins><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVURLAssetOutOfBandAlternateTracksKey, NSString*)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVOutOfBandAlternateTrackDisplayNameKey, NSString*)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVOutOfBandAlternateTrackExtendedLanguageTagKey, NSString*)
</span><span class="lines">@@ -238,6 +240,7 @@
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicDescribesMusicAndSoundForAccessibility, NSString*)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicTranscribesSpokenDialogForAccessibility, NSString*)
</span><span class="cx">
</span><ins>+#define AVURLAssetHTTPCookiesKey getAVURLAssetHTTPCookiesKey()
</ins><span class="cx"> #define AVURLAssetOutOfBandAlternateTracksKey getAVURLAssetOutOfBandAlternateTracksKey()
</span><span class="cx"> #define AVOutOfBandAlternateTrackDisplayNameKey getAVOutOfBandAlternateTrackDisplayNameKey()
</span><span class="cx"> #define AVOutOfBandAlternateTrackExtendedLanguageTagKey getAVOutOfBandAlternateTrackExtendedLanguageTagKey()
</span><span class="lines">@@ -712,6 +715,24 @@
</span><span class="cx"> return [canonicalRequest URL];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static NSHTTPCookie* toNSHTTPCookie(const Cookie& cookie)
+{
+ RetainPtr<NSMutableDictionary> properties = adoptNS([[NSMutableDictionary alloc] init]);
+ [properties setDictionary:@{
+ NSHTTPCookieName: cookie.name,
+ NSHTTPCookieValue: cookie.value,
+ NSHTTPCookieDomain: cookie.domain,
+ NSHTTPCookiePath: cookie.path,
+ NSHTTPCookieExpires: [NSDate dateWithTimeIntervalSince1970:(cookie.expires / 1000)],
+ }];
+ if (cookie.secure)
+ [properties setObject:@YES forKey:NSHTTPCookieSecure];
+ if (cookie.session)
+ [properties setObject:@YES forKey:NSHTTPCookieDiscard];
+
+ return [NSHTTPCookie cookieWithProperties:properties.get()];
+}
+
</ins><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL(const String& url)
</span><span class="cx"> {
</span><span class="cx"> if (m_avAsset)
</span><span class="lines">@@ -774,6 +795,17 @@
</span><span class="cx"> [options setObject:networkInterfaceName forKey:AVURLAssetBoundNetworkInterfaceName];
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ Vector<Cookie> cookies;
+ if (player()->getRawCookies(URL(ParsedURLString, url), cookies)) {
+ RetainPtr<NSMutableArray> nsCookies = adoptNS([[NSMutableArray alloc] initWithCapacity:cookies.size()]);
+ for (auto& cookie : cookies)
+ [nsCookies addObject:toNSHTTPCookie(cookie)];
+
+ [options setObject:nsCookies.get() forKey:AVURLAssetHTTPCookiesKey];
+ }
+#endif
+
</ins><span class="cx"> NSURL *cocoaURL = canonicalURL(url);
</span><span class="cx"> m_avAsset = adoptNS([[AVURLAsset alloc] initWithURL:cocoaURL options:options.get()]);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>