<!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>[212994] 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/212994">212994</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-24 23:50:08 -0800 (Fri, 24 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Resource Timing] Media elements initiated loads should set the initiatorType to their element name (video/audio)
https://bugs.webkit.org/show_bug.cgi?id=168680
Reviewed by Youenn Fablet.
LayoutTests/imported/w3c:
* web-platform-tests/resource-timing/rt-initiatorType-media-expected.txt:
Progression on the initiatorType.
Source/WebCore:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerCreateResourceLoader):
Pass in the element so it may be used as the initiator.
* html/HTMLVideoElement.h:
Export create() for TestWebKitAPI to use.
* loader/MediaResourceLoader.cpp:
(WebCore::MediaResourceLoader::MediaResourceLoader):
(WebCore::MediaResourceLoader::contextDestroyed):
(WebCore::MediaResourceLoader::requestResource):
* loader/MediaResourceLoader.h:
Include the HTMLMediaElement as the initiator.
Tools:
* TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm:
(TestWebKitAPI::WebCoreNSURLSessionTest::SetUp):
Include a dummy HTMLVideoElement.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsresourcetimingrtinitiatorTypemediaexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media-expected.txt</a></li>
<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="#trunkSourceWebCorehtmlHTMLVideoElementh">trunk/Source/WebCore/html/HTMLVideoElement.h</a></li>
<li><a href="#trunkSourceWebCoreloaderMediaResourceLoadercpp">trunk/Source/WebCore/loader/MediaResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderMediaResourceLoaderh">trunk/Source/WebCore/loader/MediaResourceLoader.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCorecocoaWebCoreNSURLSessionmm">trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (212993 => 212994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-02-25 05:48:51 UTC (rev 212993)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-02-25 07:50:08 UTC (rev 212994)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2017-02-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ [Resource Timing] Media elements initiated loads should set the initiatorType to their element name (video/audio)
+ https://bugs.webkit.org/show_bug.cgi?id=168680
+
+ Reviewed by Youenn Fablet.
+
+ * web-platform-tests/resource-timing/rt-initiatorType-media-expected.txt:
+ Progression on the initiatorType.
+
+2017-02-24 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> [Resource Timing] Gather timing information with reliable responseEnd time
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168351
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsresourcetimingrtinitiatorTypemediaexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media-expected.txt (212993 => 212994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media-expected.txt 2017-02-25 05:48:51 UTC (rev 212993)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media-expected.txt 2017-02-25 07:50:08 UTC (rev 212994)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> Resource Timing: Element localName initiatorType
</span><span class="cx">
</span><span class="cx">
</span><del>-FAIL Type: video - <video src> assert_equals: initiatorType should be 'video' expected "video" but got "other"
</del><ins>+PASS Type: video - <video src>
</ins><span class="cx"> PASS Timing: video - <video src>
</span><del>-FAIL Type: audio - <audio src> assert_equals: name should be the url expected "http://localhost:8800/resource-timing/resources/data.json?audio&0.7734679755996403" but got "http://localhost:8800/resource-timing/resources/data.json?video&0.5872075656484804"
</del><ins>+FAIL Type: audio - <audio src> assert_equals: name should be the url expected "http://localhost:8800/resource-timing/resources/data.json?audio&0.033975899379337426" but got "http://localhost:8800/resource-timing/resources/data.json?video&0.019321360269903165"
</ins><span class="cx"> PASS Timing: audio - <audio src>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212993 => 212994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-25 05:48:51 UTC (rev 212993)
+++ trunk/Source/WebCore/ChangeLog 2017-02-25 07:50:08 UTC (rev 212994)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2017-02-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ [Resource Timing] Media elements initiated loads should set the initiatorType to their element name (video/audio)
+ https://bugs.webkit.org/show_bug.cgi?id=168680
+
+ Reviewed by Youenn Fablet.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaPlayerCreateResourceLoader):
+ Pass in the element so it may be used as the initiator.
+
+ * html/HTMLVideoElement.h:
+ Export create() for TestWebKitAPI to use.
+
+ * loader/MediaResourceLoader.cpp:
+ (WebCore::MediaResourceLoader::MediaResourceLoader):
+ (WebCore::MediaResourceLoader::contextDestroyed):
+ (WebCore::MediaResourceLoader::requestResource):
+ * loader/MediaResourceLoader.h:
+ Include the HTMLMediaElement as the initiator.
+
+2017-02-24 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> [Resource Timing] Gather timing information with reliable responseEnd time
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168351
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (212993 => 212994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-02-25 05:48:51 UTC (rev 212993)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-02-25 07:50:08 UTC (rev 212994)
</span><span class="lines">@@ -6433,7 +6433,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<PlatformMediaResourceLoader> HTMLMediaElement::mediaPlayerCreateResourceLoader()
</span><span class="cx"> {
</span><del>- return adoptRef(*new MediaResourceLoader(document(), crossOrigin()));
</del><ins>+ return adoptRef(*new MediaResourceLoader(document(), *this, crossOrigin()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::mediaPlayerShouldUsePersistentCache() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.h (212993 => 212994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.h 2017-02-25 05:48:51 UTC (rev 212993)
+++ trunk/Source/WebCore/html/HTMLVideoElement.h 2017-02-25 07:50:08 UTC (rev 212994)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class HTMLVideoElement final : public HTMLMediaElement {
</span><span class="cx"> public:
</span><del>- static Ref<HTMLVideoElement> create(Document&);
</del><ins>+ WEBCORE_EXPORT static Ref<HTMLVideoElement> create(Document&);
</ins><span class="cx"> static Ref<HTMLVideoElement> create(const QualifiedName&, Document&, bool createdByParser);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT unsigned videoWidth() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (212993 => 212994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2017-02-25 05:48:51 UTC (rev 212993)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2017-02-25 07:50:08 UTC (rev 212994)
</span><span class="lines">@@ -34,14 +34,16 @@
</span><span class="cx"> #include "CachedResourceRequest.h"
</span><span class="cx"> #include "CrossOriginAccessControl.h"
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "HTMLMediaElement.h"
</ins><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-MediaResourceLoader::MediaResourceLoader(Document& document, const String& crossOriginMode)
</del><ins>+MediaResourceLoader::MediaResourceLoader(Document& document, HTMLMediaElement& mediaElement, const String& crossOriginMode)
</ins><span class="cx"> : ContextDestructionObserver(&document)
</span><span class="cx"> , m_document(&document)
</span><ins>+ , m_mediaElement(&mediaElement)
</ins><span class="cx"> , m_crossOriginMode(crossOriginMode)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -55,6 +57,7 @@
</span><span class="cx"> {
</span><span class="cx"> ContextDestructionObserver::contextDestroyed();
</span><span class="cx"> m_document = nullptr;
</span><ins>+ m_mediaElement = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<PlatformMediaResource> MediaResourceLoader::requestResource(ResourceRequest&& request, LoadOptions options)
</span><span class="lines">@@ -75,6 +78,7 @@
</span><span class="cx"> // FIXME: Skip Content Security Policy check if the element that initiated this request is in a user-agent shadow tree. See <https://bugs.webkit.org/show_bug.cgi?id=155505>.
</span><span class="cx"> CachedResourceRequest cacheRequest(WTFMove(request), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, AllowStoredCredentials, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, DoSecurityCheck, FetchOptions::Mode::NoCors, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, cachingPolicy));
</span><span class="cx"> cacheRequest.setAsPotentiallyCrossOrigin(m_crossOriginMode, *m_document);
</span><ins>+ cacheRequest.setInitiator(*m_mediaElement);
</ins><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedRawResource> resource = m_document->cachedResourceLoader().requestMedia(WTFMove(cacheRequest));
</span><span class="cx"> if (!resource)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.h (212993 => 212994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.h 2017-02-25 05:48:51 UTC (rev 212993)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.h 2017-02-25 07:50:08 UTC (rev 212994)
</span><span class="lines">@@ -39,11 +39,12 @@
</span><span class="cx">
</span><span class="cx"> class CachedRawResource;
</span><span class="cx"> class Document;
</span><ins>+class HTMLMediaElement;
</ins><span class="cx"> class MediaResource;
</span><span class="cx">
</span><span class="cx"> class MediaResourceLoader final : public PlatformMediaResourceLoader, public ContextDestructionObserver {
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT MediaResourceLoader(Document&, const String& crossOriginMode);
</del><ins>+ WEBCORE_EXPORT MediaResourceLoader(Document&, HTMLMediaElement&, const String& crossOriginMode);
</ins><span class="cx"> WEBCORE_EXPORT virtual ~MediaResourceLoader();
</span><span class="cx">
</span><span class="cx"> RefPtr<PlatformMediaResource> requestResource(ResourceRequest&&, LoadOptions) final;
</span><span class="lines">@@ -56,6 +57,7 @@
</span><span class="cx"> void contextDestroyed() override;
</span><span class="cx">
</span><span class="cx"> Document* m_document;
</span><ins>+ RefPtr<HTMLMediaElement> m_mediaElement;
</ins><span class="cx"> String m_crossOriginMode;
</span><span class="cx"> HashSet<MediaResource*> m_resources;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (212993 => 212994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-25 05:48:51 UTC (rev 212993)
+++ trunk/Tools/ChangeLog 2017-02-25 07:50:08 UTC (rev 212994)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-24 Joseph Pecoraro <pecoraro@apple.com>
+
+ [Resource Timing] Media elements initiated loads should set the initiatorType to their element name (video/audio)
+ https://bugs.webkit.org/show_bug.cgi?id=168680
+
+ Reviewed by Youenn Fablet.
+
+ * TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm:
+ (TestWebKitAPI::WebCoreNSURLSessionTest::SetUp):
+ Include a dummy HTMLVideoElement.
+
</ins><span class="cx"> 2017-02-24 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, temporarily disable all data interaction tests.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCorecocoaWebCoreNSURLSessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm (212993 => 212994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm 2017-02-25 05:48:51 UTC (rev 212993)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/WebCoreNSURLSession.mm 2017-02-25 07:50:08 UTC (rev 212994)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import <WebCore/PageConfiguration.h>
</span><span class="cx"> #import <WebCore/Document.h>
</span><span class="cx"> #import <WebCore/DocumentLoader.h>
</span><ins>+#import <WebCore/HTMLVideoElement.h>
</ins><span class="cx"> #import <WebCore/MediaResourceLoader.h>
</span><span class="cx"> #import <WebCore/Settings.h>
</span><span class="cx"> #import <WebCore/SubresourceLoader.h>
</span><span class="lines">@@ -108,6 +109,7 @@
</span><span class="cx"> Frame* frame { nullptr };
</span><span class="cx"> TestNSURLSessionDataDelegate *delegate { nil };
</span><span class="cx"> RefPtr<MediaResourceLoader> loader;
</span><ins>+ RefPtr<HTMLMediaElement> mediaElement;
</ins><span class="cx">
</span><span class="cx"> virtual void SetUp()
</span><span class="cx"> {
</span><span class="lines">@@ -123,7 +125,8 @@
</span><span class="cx">
</span><span class="cx"> delegate = [[TestNSURLSessionDataDelegate alloc] init];
</span><span class="cx"> frame = [view _mainCoreFrame];
</span><del>- loader = adoptRef(new MediaResourceLoader(*frame->document(), emptyString()));
</del><ins>+ mediaElement = HTMLVideoElement::create(*frame->document());
+ loader = adoptRef(new MediaResourceLoader(*frame->document(), *mediaElement.get(), emptyString()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void TearDown()
</span></span></pre>
</div>
</div>
</body>
</html>