Title: [184945] trunk/Source/WebCore
- Revision
- 184945
- Author
- beid...@apple.com
- Date
- 2015-05-27 23:14:50 -0700 (Wed, 27 May 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (184944 => 184945)
--- 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)
@@ -1,5 +1,31 @@
2015-05-27 Brady Eidson <beid...@apple.com>
+ 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 <beid...@apple.com>
+
Add a "should open urls externally" flag to DocumentLoader.
rdar://problem/21025301 and https://bugs.webkit.org/show_bug.cgi?id=145417
Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (184944 => 184945)
--- 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)
@@ -123,6 +123,3 @@
WEBCORE_EXPORT NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
WEBCORE_EXPORT bool (*wkQueryDecoderAvailability)(void);
-
-WEBCORE_EXPORT CFStringRef (*wkResourceRequestIsUserInitiatedKey)(void);
-
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (184944 => 184945)
--- 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)
@@ -170,8 +170,6 @@
CFStringRef (*wkCachePartitionKey)(void);
#endif
-CFStringRef (*wkResourceRequestIsUserInitiatedKey)(void);
-
int (*wkExernalDeviceTypeForPlayer)(AVPlayer *);
NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (184944 => 184945)
--- 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)
@@ -147,9 +147,6 @@
bool hiddenFromInspector() const { return m_hiddenFromInspector; }
void setHiddenFromInspector(bool hiddenFromInspector) { m_hiddenFromInspector = hiddenFromInspector; }
- bool initiatedByUserGesture() const { return m_initiatedByUserGesture; }
- void setInitiatedByUserGesture(bool initiatedByUserGesture) { m_initiatedByUserGesture = initiatedByUserGesture; }
-
enum class Requester { Unspecified, Main, XHR };
Requester requester() const { return m_requester; }
void setRequester(Requester requester) { m_requester = requester; }
@@ -216,7 +213,6 @@
bool m_reportLoadTiming { false };
bool m_reportRawHeaders { false };
bool m_hiddenFromInspector { false };
- bool m_initiatedByUserGesture { false };
ResourceLoadPriority m_priority { ResourceLoadPriority::Low };
Requester m_requester { Requester::Unspecified };
@@ -268,7 +264,6 @@
encoder << m_allowCookies;
encoder.encodeEnum(m_priority);
encoder.encodeEnum(m_requester);
- encoder << m_initiatedByUserGesture;
}
template<class Decoder>
@@ -314,9 +309,6 @@
if (!decoder.decodeEnum(m_requester))
return false;
- if (!decoder.decode(m_initiatedByUserGesture))
- return false;
-
return true;
}
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (184944 => 184945)
--- 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)
@@ -186,11 +186,6 @@
}
#endif
-#if !PLATFORM(WIN)
- if (initiatedByUserGesture())
- _CFURLRequestSetProtocolProperty(cfRequest, ResourceRequest::isUserInitiatedKey(), kCFBooleanTrue);
-#endif
-
m_cfRequest = adoptCF(cfRequest);
#if PLATFORM(COCOA)
clearOrUpdateNSURLRequest();
@@ -295,12 +290,6 @@
if (cachePartition)
m_cachePartition = cachePartition.get();
#endif
-
-#if !PLATFORM(WIN)
- RetainPtr<CFBooleanRef> initiatedByUserGesture = adoptCF(static_cast<CFBooleanRef>(_CFURLRequestCopyProtocolPropertyForKey(m_cfRequest.get(), ResourceRequest::isUserInitiatedKey())));
- if (initiatedByUserGesture)
- setInitiatedByUserGesture(CFBooleanGetValue(initiatedByUserGesture.get()));
-#endif
}
void ResourceRequest::doUpdateResourceHTTPBody()
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (184944 => 184945)
--- 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)
@@ -102,10 +102,6 @@
m_cachePartition = cachePartition;
}
#endif
-
- NSNumber *initiatedByUserGesture = [NSURLProtocol propertyForKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:m_nsRequest.get()];
- if (initiatedByUserGesture)
- setInitiatedByUserGesture(initiatedByUserGesture.boolValue);
}
void ResourceRequest::doUpdateResourceHTTPBody()
@@ -182,9 +178,6 @@
[NSURLProtocol setProperty:partitionValue forKey:(NSString *)wkCachePartitionKey() inRequest:nsRequest];
}
#endif
-
- if (initiatedByUserGesture())
- [NSURLProtocol setProperty:@YES forKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:nsRequest];
}
void ResourceRequest::doUpdatePlatformHTTPBody()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
