<!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>[196831] 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/196831">196831</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-02-19 13:04:56 -0800 (Fri, 19 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adopt CachedRawResourceClient::shouldCacheResponse() in MediaResourceLoader and WebCoreNSURLSession
https://bugs.webkit.org/show_bug.cgi?id=154466
Reviewed by Alex Christensen.
Adopt the new shouldCacheResponse() callback so that byte-range
requests generated by WebCoreNSURLSession are not cached.
* loader/MediaResourceLoader.cpp:
(WebCore::MediaResource::shouldCacheResponse):
* loader/MediaResourceLoader.h:
* platform/graphics/PlatformMediaResourceLoader.h:
(WebCore::PlatformMediaResourceClient::shouldCacheResponse):
* platform/network/cocoa/WebCoreNSURLSession.mm:
(-[WebCoreNSURLSession downloadTaskWithRequest:]):
(-[WebCoreNSURLSession streamTaskWithHostName:port:]):
(-[WebCoreNSURLSession streamTaskWithNetService:]):
(-[WebCoreNSURLSessionDataTask _timingData]):
(-[WebCoreNSURLSessionDataTask resource:sentBytes:totalBytesToBeSent:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreplatformgraphicsPlatformMediaResourceLoaderh">trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm">trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196830 => 196831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-19 21:02:43 UTC (rev 196830)
+++ trunk/Source/WebCore/ChangeLog 2016-02-19 21:04:56 UTC (rev 196831)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-02-19 Jer Noble <jer.noble@apple.com>
+
+ Adopt CachedRawResourceClient::shouldCacheResponse() in MediaResourceLoader and WebCoreNSURLSession
+ https://bugs.webkit.org/show_bug.cgi?id=154466
+
+ Reviewed by Alex Christensen.
+
+ Adopt the new shouldCacheResponse() callback so that byte-range
+ requests generated by WebCoreNSURLSession are not cached.
+
+ * loader/MediaResourceLoader.cpp:
+ (WebCore::MediaResource::shouldCacheResponse):
+ * loader/MediaResourceLoader.h:
+ * platform/graphics/PlatformMediaResourceLoader.h:
+ (WebCore::PlatformMediaResourceClient::shouldCacheResponse):
+ * platform/network/cocoa/WebCoreNSURLSession.mm:
+ (-[WebCoreNSURLSession downloadTaskWithRequest:]):
+ (-[WebCoreNSURLSession streamTaskWithHostName:port:]):
+ (-[WebCoreNSURLSession streamTaskWithNetService:]):
+ (-[WebCoreNSURLSessionDataTask _timingData]):
+ (-[WebCoreNSURLSessionDataTask resource:sentBytes:totalBytesToBeSent:]):
+
</ins><span class="cx"> 2016-02-12 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] CORS-compliant videos throw security errors when painting to Canvas
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (196830 => 196831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-02-19 21:02:43 UTC (rev 196830)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-02-19 21:04:56 UTC (rev 196831)
</span><span class="lines">@@ -131,6 +131,16 @@
</span><span class="cx"> m_client->responseReceived(*this, response);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaResource::shouldCacheResponse(CachedResource* resource, const ResourceResponse& response)
+{
+ ASSERT_UNUSED(resource, resource == m_resource);
+
+ RefPtr<MediaResource> protect(this);
+ if (m_client)
+ return m_client->shouldCacheResponse(*this, response);
+ return true;
+}
+
</ins><span class="cx"> void MediaResource::redirectReceived(CachedResource* resource, ResourceRequest& request, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(resource, resource == m_resource);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.h (196830 => 196831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.h 2016-02-19 21:02:43 UTC (rev 196830)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.h 2016-02-19 21:04:56 UTC (rev 196831)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx"> // CachedResourceClient
</span><span class="cx"> void responseReceived(CachedResource*, const ResourceResponse&) override;
</span><span class="cx"> void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) override;
</span><ins>+ bool shouldCacheResponse(CachedResource*, const ResourceResponse&) override;
</ins><span class="cx"> void dataSent(CachedResource*, unsigned long long, unsigned long long) override;
</span><span class="cx"> void dataReceived(CachedResource*, const char*, int) override;
</span><span class="cx"> void notifyFinished(CachedResource*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformMediaResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h (196830 => 196831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h 2016-02-19 21:02:43 UTC (rev 196830)
+++ trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h 2016-02-19 21:04:56 UTC (rev 196831)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void responseReceived(PlatformMediaResource&, const ResourceResponse&) { }
</span><span class="cx"> virtual void redirectReceived(PlatformMediaResource&, ResourceRequest&, const ResourceResponse&) { }
</span><ins>+ virtual bool shouldCacheResponse(PlatformMediaResource&, const ResourceResponse&) { return true; }
</ins><span class="cx"> virtual void dataSent(PlatformMediaResource&, unsigned long long, unsigned long long) { }
</span><span class="cx"> virtual void dataReceived(PlatformMediaResource&, const char*, int) { }
</span><span class="cx"> virtual void accessControlCheckFailed(PlatformMediaResource&, const ResourceError&) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (196830 => 196831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-02-19 21:02:43 UTC (rev 196830)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-02-19 21:04:56 UTC (rev 196831)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)resource:(PlatformMediaResource&)resource sentBytes:(unsigned long long)bytesSent totalBytesToBeSent:(unsigned long long)totalBytesToBeSent;
</span><span class="cx"> - (void)resource:(PlatformMediaResource&)resource receivedResponse:(const ResourceResponse&)response;
</span><ins>+- (BOOL)resource:(PlatformMediaResource&)resource shouldCacheResponse:(const ResourceResponse&)response;
</ins><span class="cx"> - (void)resource:(PlatformMediaResource&)resource receivedData:(const char*)data length:(int)length;
</span><span class="cx"> - (void)resource:(PlatformMediaResource&)resource receivedRedirect:(const ResourceResponse&)response request:(ResourceRequest&)request;
</span><span class="cx"> - (void)resource:(PlatformMediaResource&)resource accessControlCheckFailedWithError:(const ResourceError&)error;
</span><span class="lines">@@ -316,6 +317,7 @@
</span><span class="cx">
</span><span class="cx"> void responseReceived(PlatformMediaResource&, const ResourceResponse&) override;
</span><span class="cx"> void redirectReceived(PlatformMediaResource&, ResourceRequest&, const ResourceResponse&) override;
</span><ins>+ bool shouldCacheResponse(PlatformMediaResource&, const ResourceResponse&) override;
</ins><span class="cx"> void dataSent(PlatformMediaResource&, unsigned long long, unsigned long long) override;
</span><span class="cx"> void dataReceived(PlatformMediaResource&, const char* /* data */, int /* length */) override;
</span><span class="cx"> void accessControlCheckFailed(PlatformMediaResource&, const ResourceError&) override;
</span><span class="lines">@@ -336,6 +338,11 @@
</span><span class="cx"> [m_task resource:resource receivedResponse:response];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebCoreNSURLSessionDataTaskClient::shouldCacheResponse(PlatformMediaResource& resource, const ResourceResponse& response)
+{
+ return [m_task resource:resource shouldCacheResponse:response];
+}
+
</ins><span class="cx"> void WebCoreNSURLSessionDataTaskClient::dataReceived(PlatformMediaResource& resource, const char* data, int length)
</span><span class="cx"> {
</span><span class="cx"> [m_task resource:resource receivedData:data length:length];
</span><span class="lines">@@ -535,6 +542,17 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)resource:(PlatformMediaResource&)resource shouldCacheResponse:(const ResourceResponse&)response
+{
+ ASSERT_UNUSED(resource, &resource == _resource);
+ UNUSED_PARAM(response);
+
+ ASSERT(isMainThread());
+
+ // FIXME: remove if <rdar://problem/20001985> is ever resolved.
+ return response.httpHeaderField(HTTPHeaderName::ContentRange).isEmpty();
+}
+
</ins><span class="cx"> - (void)resource:(PlatformMediaResource&)resource receivedData:(const char*)data length:(int)length
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(resource, &resource == _resource);
</span></span></pre>
</div>
</div>
</body>
</html>