<!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>[184945] 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/184945">184945</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-27 23:14:50 -0700 (Wed, 27 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused ResourceRequest "user initiated" flag.
https://bugs.webkit.org/show_bug.cgi?id=145428
Reviewed by Alexey Proskuryakov.
No new tests (No change in behavior).
* platform/ios/WebCoreSystemInterfaceIOS.mm:
* platform/mac/WebCoreSystemInterface.mm:
* platform/network/ResourceRequestBase.h:
(WebCore::ResourceRequestBase::initiatedByUserGesture): Deleted.
(WebCore::ResourceRequestBase::setInitiatedByUserGesture): Deleted.
(WebCore::ResourceRequestBase::encodeWithoutPlatformData): Deleted.
(WebCore::ResourceRequestBase::decodeWithoutPlatformData): Deleted.
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformRequest): Deleted.
(WebCore::ResourceRequest::doUpdateResourceRequest): Deleted.
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::doUpdateResourceRequest): Deleted.
(WebCore::ResourceRequest::doUpdatePlatformRequest): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm">trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184944 => 184945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-28 06:12:46 UTC (rev 184944)
+++ trunk/Source/WebCore/ChangeLog 2015-05-28 06:14:50 UTC (rev 184945)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-05-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Remove unused ResourceRequest "user initiated" flag.
+ https://bugs.webkit.org/show_bug.cgi?id=145428
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests (No change in behavior).
+
+ * platform/ios/WebCoreSystemInterfaceIOS.mm:
+ * platform/mac/WebCoreSystemInterface.mm:
+
+ * platform/network/ResourceRequestBase.h:
+ (WebCore::ResourceRequestBase::initiatedByUserGesture): Deleted.
+ (WebCore::ResourceRequestBase::setInitiatedByUserGesture): Deleted.
+ (WebCore::ResourceRequestBase::encodeWithoutPlatformData): Deleted.
+ (WebCore::ResourceRequestBase::decodeWithoutPlatformData): Deleted.
+
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformRequest): Deleted.
+ (WebCore::ResourceRequest::doUpdateResourceRequest): Deleted.
+
+ * platform/network/cocoa/ResourceRequestCocoa.mm:
+ (WebCore::ResourceRequest::doUpdateResourceRequest): Deleted.
+ (WebCore::ResourceRequest::doUpdatePlatformRequest): Deleted.
+
+2015-05-27 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Add a "should open urls externally" flag to DocumentLoader.
</span><span class="cx"> rdar://problem/21025301 and https://bugs.webkit.org/show_bug.cgi?id=145417
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (184944 => 184945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2015-05-28 06:12:46 UTC (rev 184944)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2015-05-28 06:14:50 UTC (rev 184945)
</span><span class="lines">@@ -123,6 +123,3 @@
</span><span class="cx"> WEBCORE_EXPORT NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool (*wkQueryDecoderAvailability)(void);
</span><del>-
-WEBCORE_EXPORT CFStringRef (*wkResourceRequestIsUserInitiatedKey)(void);
-
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (184944 => 184945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-05-28 06:12:46 UTC (rev 184944)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-05-28 06:14:50 UTC (rev 184945)
</span><span class="lines">@@ -170,8 +170,6 @@
</span><span class="cx"> CFStringRef (*wkCachePartitionKey)(void);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-CFStringRef (*wkResourceRequestIsUserInitiatedKey)(void);
-
</del><span class="cx"> int (*wkExernalDeviceTypeForPlayer)(AVPlayer *);
</span><span class="cx"> NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (184944 => 184945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2015-05-28 06:12:46 UTC (rev 184944)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2015-05-28 06:14:50 UTC (rev 184945)
</span><span class="lines">@@ -147,9 +147,6 @@
</span><span class="cx"> bool hiddenFromInspector() const { return m_hiddenFromInspector; }
</span><span class="cx"> void setHiddenFromInspector(bool hiddenFromInspector) { m_hiddenFromInspector = hiddenFromInspector; }
</span><span class="cx">
</span><del>- bool initiatedByUserGesture() const { return m_initiatedByUserGesture; }
- void setInitiatedByUserGesture(bool initiatedByUserGesture) { m_initiatedByUserGesture = initiatedByUserGesture; }
-
</del><span class="cx"> enum class Requester { Unspecified, Main, XHR };
</span><span class="cx"> Requester requester() const { return m_requester; }
</span><span class="cx"> void setRequester(Requester requester) { m_requester = requester; }
</span><span class="lines">@@ -216,7 +213,6 @@
</span><span class="cx"> bool m_reportLoadTiming { false };
</span><span class="cx"> bool m_reportRawHeaders { false };
</span><span class="cx"> bool m_hiddenFromInspector { false };
</span><del>- bool m_initiatedByUserGesture { false };
</del><span class="cx"> ResourceLoadPriority m_priority { ResourceLoadPriority::Low };
</span><span class="cx"> Requester m_requester { Requester::Unspecified };
</span><span class="cx">
</span><span class="lines">@@ -268,7 +264,6 @@
</span><span class="cx"> encoder << m_allowCookies;
</span><span class="cx"> encoder.encodeEnum(m_priority);
</span><span class="cx"> encoder.encodeEnum(m_requester);
</span><del>- encoder << m_initiatedByUserGesture;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class Decoder>
</span><span class="lines">@@ -314,9 +309,6 @@
</span><span class="cx"> if (!decoder.decodeEnum(m_requester))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!decoder.decode(m_initiatedByUserGesture))
- return false;
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (184944 => 184945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2015-05-28 06:12:46 UTC (rev 184944)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2015-05-28 06:14:50 UTC (rev 184945)
</span><span class="lines">@@ -186,11 +186,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(WIN)
- if (initiatedByUserGesture())
- _CFURLRequestSetProtocolProperty(cfRequest, ResourceRequest::isUserInitiatedKey(), kCFBooleanTrue);
-#endif
-
</del><span class="cx"> m_cfRequest = adoptCF(cfRequest);
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> clearOrUpdateNSURLRequest();
</span><span class="lines">@@ -295,12 +290,6 @@
</span><span class="cx"> if (cachePartition)
</span><span class="cx"> m_cachePartition = cachePartition.get();
</span><span class="cx"> #endif
</span><del>-
-#if !PLATFORM(WIN)
- RetainPtr<CFBooleanRef> initiatedByUserGesture = adoptCF(static_cast<CFBooleanRef>(_CFURLRequestCopyProtocolPropertyForKey(m_cfRequest.get(), ResourceRequest::isUserInitiatedKey())));
- if (initiatedByUserGesture)
- setInitiatedByUserGesture(CFBooleanGetValue(initiatedByUserGesture.get()));
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::doUpdateResourceHTTPBody()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (184944 => 184945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2015-05-28 06:12:46 UTC (rev 184944)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2015-05-28 06:14:50 UTC (rev 184945)
</span><span class="lines">@@ -102,10 +102,6 @@
</span><span class="cx"> m_cachePartition = cachePartition;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
- NSNumber *initiatedByUserGesture = [NSURLProtocol propertyForKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:m_nsRequest.get()];
- if (initiatedByUserGesture)
- setInitiatedByUserGesture(initiatedByUserGesture.boolValue);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::doUpdateResourceHTTPBody()
</span><span class="lines">@@ -182,9 +178,6 @@
</span><span class="cx"> [NSURLProtocol setProperty:partitionValue forKey:(NSString *)wkCachePartitionKey() inRequest:nsRequest];
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
- if (initiatedByUserGesture())
- [NSURLProtocol setProperty:@YES forKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:nsRequest];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::doUpdatePlatformHTTPBody()
</span></span></pre>
</div>
</div>
</body>
</html>