<!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>[184775] 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/184775">184775</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-22 10:24:04 -0700 (Fri, 22 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rework how the ResourceRequest user initiated property key is used.
Followup to https://bugs.webkit.org/show_bug.cgi?id=145281
Source/WebCore:
Reviewed by NOBODY (OOPS!).
* platform/mac/WebCoreSystemInterface.h:
* platform/network/cf/ResourceRequest.h:
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::isUserInitiatedKey):
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::doUpdatePlatformRequest):
Source/WebKit/mac:
Reviewed by NOBODY (OOPS!).
* WebCoreSupport/WebSystemInterface.mm:
(WKResourceRequestIsUserInitiatedKey): Deleted.
(InitWebCoreSystemInterface): Deleted.
Source/WebKit2:
Reviewed by NOBODY (OOPS!).
* Shared/API/Cocoa/_WKNSURLRequestExtras.mm:
(-[NSURLRequest _web_isUserInitiated]):
(-[NSMutableURLRequest _web_setIsUserInitiated:]):
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(WKResourceRequestIsUserInitiatedKey): Deleted.
(InitWebCoreSystemInterface): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequesth">trunk/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm">trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoa_WKNSURLRequestExtrasmm">trunk/Source/WebKit2/Shared/API/Cocoa/_WKNSURLRequestExtras.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebCore/ChangeLog 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-05-22 Brady Eidson <beidson@apple.com>
+
+ Rework how the ResourceRequest user initiated property key is used.
+ Followup to https://bugs.webkit.org/show_bug.cgi?id=145281
+
+ Reviewed by Dan Bernstein.
+
+ * platform/mac/WebCoreSystemInterface.h:
+
+ * platform/network/cf/ResourceRequest.h:
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ (WebCore::ResourceRequest::isUserInitiatedKey):
+
+ * platform/network/cocoa/ResourceRequestCocoa.mm:
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+
</ins><span class="cx"> 2015-05-22 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for ENABLE(TREE_DEBUGGING)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -318,8 +318,6 @@
</span><span class="cx"> extern CFStringRef (*wkCachePartitionKey)(void);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-extern CFStringRef (*wkResourceRequestIsUserInitiatedKey)(void);
-
</del><span class="cx"> typedef enum {
</span><span class="cx"> wkExternalPlaybackTypeNone,
</span><span class="cx"> wkExternalPlaybackTypeAirPlay,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -95,6 +95,8 @@
</span><span class="cx"> bool encodingRequiresPlatformData() const { return m_httpBody || m_nsRequest; }
</span><span class="cx"> #endif
</span><span class="cx"> WEBCORE_EXPORT NSURLRequest *nsURLRequest(HTTPBodyUpdatePolicy) const;
</span><ins>+
+ WEBCORE_EXPORT static CFStringRef isUserInitiatedKey();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(WIN)
</span><span class="cx"> if (initiatedByUserGesture())
</span><del>- _CFURLRequestSetProtocolProperty(cfRequest, wkResourceRequestIsUserInitiatedKey(), kCFBooleanTrue);
</del><ins>+ _CFURLRequestSetProtocolProperty(cfRequest, ResourceRequest::isUserInitiatedKey(), kCFBooleanTrue);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_cfRequest = adoptCF(cfRequest);
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(WIN)
</span><del>- RetainPtr<CFBooleanRef> initiatedByUserGesture = adoptCF(static_cast<CFBooleanRef>(_CFURLRequestCopyProtocolPropertyForKey(m_cfRequest.get(), wkResourceRequestIsUserInitiatedKey())));
</del><ins>+ RetainPtr<CFBooleanRef> initiatedByUserGesture = adoptCF(static_cast<CFBooleanRef>(_CFURLRequestCopyProtocolPropertyForKey(m_cfRequest.get(), ResourceRequest::isUserInitiatedKey())));
</ins><span class="cx"> if (initiatedByUserGesture)
</span><span class="cx"> setInitiatedByUserGesture(CFBooleanGetValue(initiatedByUserGesture.get()));
</span><span class="cx"> #endif
</span><span class="lines">@@ -438,4 +438,10 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+CFStringRef ResourceRequest::isUserInitiatedKey()
+{
+ static CFStringRef key = CFSTR("ResourceRequestIsUserInitiatedKey");
+ return key;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- NSNumber *initiatedByUserGesture = [NSURLProtocol propertyForKey:(NSString *)wkResourceRequestIsUserInitiatedKey() inRequest:m_nsRequest.get()];
</del><ins>+ NSNumber *initiatedByUserGesture = [NSURLProtocol propertyForKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:m_nsRequest.get()];
</ins><span class="cx"> if (initiatedByUserGesture)
</span><span class="cx"> setInitiatedByUserGesture(initiatedByUserGesture.boolValue);
</span><span class="cx"> }
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (initiatedByUserGesture())
</span><del>- [NSURLProtocol setProperty:@YES forKey:(NSString *)wkResourceRequestIsUserInitiatedKey() inRequest:nsRequest];
</del><ins>+ [NSURLProtocol setProperty:@YES forKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:nsRequest];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::doUpdatePlatformHTTPBody()
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-22 Brady Eidson <beidson@apple.com>
+
+ Rework how the ResourceRequest user initiated property key is used.
+ Followup to https://bugs.webkit.org/show_bug.cgi?id=145281
+
+ Reviewed by Dan Bernstein.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (WKResourceRequestIsUserInitiatedKey): Deleted.
+ (InitWebCoreSystemInterface): Deleted.
+
</ins><span class="cx"> 2015-05-21 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add an "initiated by user gesture" flag to ResourceRequest.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -36,12 +36,6 @@
</span><span class="cx">
</span><span class="cx"> #define INIT(function) wk##function = WK##function
</span><span class="cx">
</span><del>-static CFStringRef WKResourceRequestIsUserInitiatedKey()
-{
- static CFStringRef key = CFSTR("WKResourceRequestIsUserInitiatedKey");
- return key;
-}
-
</del><span class="cx"> void InitWebCoreSystemInterface(void)
</span><span class="cx"> {
</span><span class="cx"> static bool didInit;
</span><span class="lines">@@ -216,7 +210,6 @@
</span><span class="cx"> INIT(CachePartitionKey);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- INIT(ResourceRequestIsUserInitiatedKey);
</del><span class="cx"> INIT(ExernalDeviceTypeForPlayer);
</span><span class="cx"> INIT(ExernalDeviceDisplayNameForPlayer);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-22 Brady Eidson <beidson@apple.com>
+
+ Rework how the ResourceRequest user initiated property key is used.
+ Followup to https://bugs.webkit.org/show_bug.cgi?id=145281
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/Cocoa/_WKNSURLRequestExtras.mm:
+ (-[NSURLRequest _web_isUserInitiated]):
+ (-[NSMutableURLRequest _web_setIsUserInitiated:]):
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (WKResourceRequestIsUserInitiatedKey): Deleted.
+ (InitWebCoreSystemInterface): Deleted.
+
</ins><span class="cx"> 2015-05-21 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Networking process sometimes suspended while WebContent runnable
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoa_WKNSURLRequestExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKNSURLRequestExtras.mm (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKNSURLRequestExtras.mm 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKNSURLRequestExtras.mm 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "_WKNSURLRequestExtras.h"
</span><span class="cx">
</span><del>-#import <WebCore/WebCoreSystemInterface.h>
</del><ins>+#import <WebCore/ResourceRequest.h>
</ins><span class="cx">
</span><span class="cx"> @implementation NSURLRequest (WKExtras)
</span><span class="cx">
</span><span class="cx"> - (BOOL)_web_isUserInitiated
</span><span class="cx"> {
</span><del>- NSNumber *userInitiated = [NSURLProtocol propertyForKey:(NSString *)wkResourceRequestIsUserInitiatedKey() inRequest:self];
</del><ins>+ NSNumber *userInitiated = [NSURLProtocol propertyForKey:(NSString *)WebCore::ResourceRequest::isUserInitiatedKey() inRequest:self];
</ins><span class="cx"> return userInitiated.boolValue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_web_setIsUserInitiated:(BOOL)userInitiated
</span><span class="cx"> {
</span><del>- [NSURLProtocol setProperty:userInitiated ? @YES : @NO forKey:(NSString *)wkResourceRequestIsUserInitiatedKey() inRequest:self];
</del><ins>+ [NSURLProtocol setProperty:userInitiated ? @YES : @NO forKey:(NSString *)WebCore::ResourceRequest::isUserInitiatedKey() inRequest:self];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (184774 => 184775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-05-22 17:19:39 UTC (rev 184774)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-05-22 17:24:04 UTC (rev 184775)
</span><span class="lines">@@ -31,12 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #define INIT(function) wk##function = WK##function
</span><span class="cx">
</span><del>-static CFStringRef WKResourceRequestIsUserInitiatedKey()
-{
- static CFStringRef key = CFSTR("WKResourceRequestIsUserInitiatedKey");
- return key;
-}
-
</del><span class="cx"> void InitWebCoreSystemInterface(void)
</span><span class="cx"> {
</span><span class="cx"> static dispatch_once_t initOnce;
</span><span class="lines">@@ -208,7 +202,6 @@
</span><span class="cx"> INIT(CachePartitionKey);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- INIT(ResourceRequestIsUserInitiatedKey);
</del><span class="cx"> INIT(ExernalDeviceTypeForPlayer);
</span><span class="cx"> INIT(ExernalDeviceDisplayNameForPlayer);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>