<!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>[168512] 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/168512">168512</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-05-08 18:06:28 -0700 (Thu, 08 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac, iOS] Add source application accounting to AVURLAsset.
https://bugs.webkit.org/show_bug.cgi?id=132637
Reviewed by Eric Carlson.
Source/WebCore:
Properly account for the application responisble for data loading by passing the source
application identifier through to AVFoundation through AVURLAsset options.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* html/HTMLMediaElement.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::sourceApplicationIdentifier):
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerSourceApplicationIdentifier):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
* platform/network/NetworkingContext.h:
Source/WebKit/mac:
Add accessor for sourceApplicationIdentifier.
* WebCoreSupport/WebFrameNetworkingContext.h:
* WebCoreSupport/WebFrameNetworkingContext.mm:
(WebFrameNetworkingContext::sourceApplicationIdentifier):
Source/WebKit2:
Add accessor for sourceApplicationIdentifier.
* NetworkProcess/RemoteNetworkingContext.h:
* NetworkProcess/mac/RemoteNetworkingContext.mm:
(WebKit::RemoteNetworkingContext::sourceApplicationIdentifier):
* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
(WebKit::WebFrameNetworkingContext::sourceApplicationIdentifier):</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>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkingContexth">trunk/Source/WebCore/platform/network/NetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContexth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContextmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessRemoteNetworkingContexth">trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacRemoteNetworkingContextmm">trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContexth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebCore/ChangeLog 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-05-08 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><ins>+ [Mac, iOS] Add source application accounting to AVURLAsset.
+ https://bugs.webkit.org/show_bug.cgi?id=132637
+
+ Reviewed by Eric Carlson.
+
+ Properly account for the application responisble for data loading by passing the source
+ application identifier through to AVFoundation through AVURLAsset options.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * html/HTMLMediaElement.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::sourceApplicationIdentifier):
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::mediaPlayerSourceApplicationIdentifier):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+ * platform/network/NetworkingContext.h:
+
+2014-05-08 Jer Noble <jer.noble@apple.com>
+
</ins><span class="cx"> [MSE][Mac] Move AVStreamDataParser off-main-thread.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132698
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> #include "MediaList.h"
</span><span class="cx"> #include "MediaQueryEvaluator.h"
</span><span class="cx"> #include "MediaSessionManager.h"
</span><ins>+#include "NetworkingContext.h"
</ins><span class="cx"> #include "PageActivityAssertionToken.h"
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "PageThrottler.h"
</span><span class="lines">@@ -5628,6 +5629,15 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String HTMLMediaElement::mediaPlayerSourceApplicationIdentifier() const
+{
+ if (Frame* frame = document().frame()) {
+ if (NetworkingContext* networkingContext = frame->loader().networkingContext())
+ return networkingContext->sourceApplicationIdentifier();
+ }
+ return emptyString();
+}
+
</ins><span class="cx"> void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
</span><span class="cx"> {
</span><span class="cx"> m_mediaSession->removeBehaviorRestriction(HTMLMediaSession::RequireUserGestureForLoad);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -566,6 +566,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&) override;
</span><span class="cx"> virtual void mediaPlayerHandlePlaybackCommand(MediaSession::RemoteControlCommandType command) override { didReceiveRemoteControlCommand(command); }
</span><ins>+ virtual String mediaPlayerSourceApplicationIdentifier() const;
</ins><span class="cx">
</span><span class="cx"> void loadTimerFired(Timer<HTMLMediaElement>&);
</span><span class="cx"> void progressEventTimerFired(Timer<HTMLMediaElement>&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -1389,6 +1389,14 @@
</span><span class="cx"> m_mediaPlayerClient->mediaPlayerHandlePlaybackCommand(command);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String MediaPlayer::sourceApplicationIdentifier() const
+{
+ if (!m_mediaPlayerClient)
+ return emptyString();
+
+ return m_mediaPlayerClient->mediaPlayerSourceApplicationIdentifier();
+}
+
</ins><span class="cx"> void MediaPlayerFactorySupport::callRegisterMediaEngine(MediaEngineRegister registerMediaEngine)
</span><span class="cx"> {
</span><span class="cx"> registerMediaEngine(addMediaEngine);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -264,6 +264,8 @@
</span><span class="cx">
</span><span class="cx"> virtual bool mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&) { return false; }
</span><span class="cx"> virtual void mediaPlayerHandlePlaybackCommand(MediaSession::RemoteControlCommandType) { }
</span><ins>+
+ virtual String mediaPlayerSourceApplicationIdentifier() const { return emptyString(); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class MediaPlayerSupportsTypeClient {
</span><span class="lines">@@ -575,6 +577,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&);
</span><span class="cx"> void handlePlaybackCommand(MediaSession::RemoteControlCommandType);
</span><ins>+ String sourceApplicationIdentifier() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaPlayer(MediaPlayerClient*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -158,6 +158,8 @@
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResize, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(CoreVideo, kCVPixelBufferPixelFormatTypeKey, NSString *)
</span><span class="cx">
</span><ins>+SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetClientBundleIdentifierKey, NSString *)
+
</ins><span class="cx"> SOFT_LINK_CONSTANT(CoreMedia, kCMTimeZero, CMTime)
</span><span class="cx">
</span><span class="cx"> #define AVPlayer getAVPlayerClass()
</span><span class="lines">@@ -175,6 +177,7 @@
</span><span class="cx"> #define AVMediaTypeMetadata getAVMediaTypeMetadata()
</span><span class="cx"> #define AVPlayerItemDidPlayToEndTimeNotification getAVPlayerItemDidPlayToEndTimeNotification()
</span><span class="cx"> #define AVURLAssetInheritURIQueryComponentFromReferencingURIKey getAVURLAssetInheritURIQueryComponentFromReferencingURIKey()
</span><ins>+#define AVURLAssetClientBundleIdentifierKey getAVURLAssetClientBundleIdentifierKey()
</ins><span class="cx"> #define AVAssetImageGeneratorApertureModeCleanAperture getAVAssetImageGeneratorApertureModeCleanAperture()
</span><span class="cx"> #define AVURLAssetReferenceRestrictionsKey getAVURLAssetReferenceRestrictionsKey()
</span><span class="cx"> #define AVLayerVideoGravityResizeAspect getAVLayerVideoGravityResizeAspect()
</span><span class="lines">@@ -660,6 +663,10 @@
</span><span class="cx"> if (player()->doesHaveAttribute("x-itunes-inherit-uri-query-component"))
</span><span class="cx"> [options.get() setObject: [NSNumber numberWithBool: TRUE] forKey: AVURLAssetInheritURIQueryComponentFromReferencingURIKey];
</span><span class="cx">
</span><ins>+ String identifier = player()->sourceApplicationIdentifier();
+ if (!identifier.isEmpty() && AVURLAssetClientBundleIdentifierKey)
+ [options setObject:identifier forKey:AVURLAssetClientBundleIdentifierKey];
+
</ins><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><span class="cx"> const Vector<RefPtr<PlatformTextTrack>>& outOfBandTrackSources = player()->outOfBandTrackSources();
</span><span class="cx"> if (!outOfBandTrackSources.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkingContext.h (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkingContext.h 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebCore/platform/network/NetworkingContext.h 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx"> virtual ResourceError blockedError(const ResourceRequest&) const = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ virtual String sourceApplicationIdentifier() const { return emptyString(); }
+
</ins><span class="cx"> #if PLATFORM(COCOA) || USE(CFNETWORK) || USE(SOUP)
</span><span class="cx"> virtual NetworkStorageSession& storageSession() const = 0;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-08 Jer Noble <jer.noble@apple.com>
+
+ [Mac, iOS] Add source application accounting to AVURLAsset.
+ https://bugs.webkit.org/show_bug.cgi?id=132637
+
+ Reviewed by Eric Carlson.
+
+ Add accessor for sourceApplicationIdentifier.
+
+ * WebCoreSupport/WebFrameNetworkingContext.h:
+ * WebCoreSupport/WebFrameNetworkingContext.mm:
+ (WebFrameNetworkingContext::sourceApplicationIdentifier):
+
</ins><span class="cx"> 2014-05-08 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Use a different install name for WebKitLegacy.framework for staged framework builds
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> virtual bool localFileContentSniffingEnabled() const override;
</span><span class="cx"> virtual SchedulePairHashSet* scheduledRunLoopPairs() const override;
</span><span class="cx"> virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const override;
</span><ins>+ virtual String sourceApplicationIdentifier() const override;
</ins><span class="cx"> virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
</span><span class="cx"> virtual WebCore::NetworkStorageSession& storageSession() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -104,6 +104,11 @@
</span><span class="cx"> return reinterpret_cast<CFDataRef>(webview._sourceApplicationAuditData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebFrameNetworkingContext::sourceApplicationIdentifier() const
+{
+ return [[NSBundle mainBundle] bundleIdentifier];
+}
+
</ins><span class="cx"> ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest& request) const
</span><span class="cx"> {
</span><span class="cx"> return frame()->loader().client().blockedError(request);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-08 Jer Noble <jer.noble@apple.com>
+
+ [Mac, iOS] Add source application accounting to AVURLAsset.
+ https://bugs.webkit.org/show_bug.cgi?id=132637
+
+ Reviewed by Eric Carlson.
+
+ Add accessor for sourceApplicationIdentifier.
+
+ * NetworkProcess/RemoteNetworkingContext.h:
+ * NetworkProcess/mac/RemoteNetworkingContext.mm:
+ (WebKit::RemoteNetworkingContext::sourceApplicationIdentifier):
+ * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
+ * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+ (WebKit::WebFrameNetworkingContext::sourceApplicationIdentifier):
+
</ins><span class="cx"> 2014-05-08 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] Flush RemoteLayerBackingStore contexts on a secondary queue
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessRemoteNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> void setLocalFileContentSniffingEnabled(bool value) { m_localFileContentSniffingEnabled = value; }
</span><span class="cx"> virtual bool localFileContentSniffingEnabled() const override;
</span><span class="cx"> virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const override;
</span><ins>+ virtual String sourceApplicationIdentifier() const override;
</ins><span class="cx"> virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacRemoteNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -80,6 +80,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String RemoteNetworkingContext::sourceApplicationIdentifier() const
+{
+ return SessionTracker::getIdentifierBase();
+}
+
</ins><span class="cx"> ResourceError RemoteNetworkingContext::blockedError(const ResourceRequest& request) const
</span><span class="cx"> {
</span><span class="cx"> return WebKit::blockedError(request);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> virtual bool localFileContentSniffingEnabled() const override;
</span><span class="cx"> virtual SchedulePairHashSet* scheduledRunLoopPairs() const override;
</span><span class="cx"> virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const override;
</span><ins>+ virtual String sourceApplicationIdentifier() const override;
</ins><span class="cx"> virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
</span><span class="cx"> virtual WebCore::NetworkStorageSession& storageSession() const override;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (168511 => 168512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2014-05-09 00:30:50 UTC (rev 168511)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2014-05-09 01:06:28 UTC (rev 168512)
</span><span class="lines">@@ -101,6 +101,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebFrameNetworkingContext::sourceApplicationIdentifier() const
+{
+ return SessionTracker::getIdentifierBase();
+}
+
</ins><span class="cx"> ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest& request) const
</span><span class="cx"> {
</span><span class="cx"> return frame()->loader().client().blockedError(request);
</span></span></pre>
</div>
</div>
</body>
</html>