Diff
Modified: trunk/Source/WebCore/ChangeLog (184774 => 184775)
--- 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)
@@ -1,3 +1,22 @@
+2015-05-22 Brady Eidson <beid...@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):
+
2015-05-22 Zalan Bujtas <za...@apple.com>
Unreviewed build fix for ENABLE(TREE_DEBUGGING)
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (184774 => 184775)
--- 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)
@@ -318,8 +318,6 @@
extern CFStringRef (*wkCachePartitionKey)(void);
#endif
-extern CFStringRef (*wkResourceRequestIsUserInitiatedKey)(void);
-
typedef enum {
wkExternalPlaybackTypeNone,
wkExternalPlaybackTypeAirPlay,
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (184774 => 184775)
--- 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)
@@ -95,6 +95,8 @@
bool encodingRequiresPlatformData() const { return m_httpBody || m_nsRequest; }
#endif
WEBCORE_EXPORT NSURLRequest *nsURLRequest(HTTPBodyUpdatePolicy) const;
+
+ WEBCORE_EXPORT static CFStringRef isUserInitiatedKey();
#endif
#if ENABLE(CACHE_PARTITIONING)
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (184774 => 184775)
--- 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)
@@ -188,7 +188,7 @@
#if !PLATFORM(WIN)
if (initiatedByUserGesture())
- _CFURLRequestSetProtocolProperty(cfRequest, wkResourceRequestIsUserInitiatedKey(), kCFBooleanTrue);
+ _CFURLRequestSetProtocolProperty(cfRequest, ResourceRequest::isUserInitiatedKey(), kCFBooleanTrue);
#endif
m_cfRequest = adoptCF(cfRequest);
@@ -297,7 +297,7 @@
#endif
#if !PLATFORM(WIN)
- RetainPtr<CFBooleanRef> initiatedByUserGesture = adoptCF(static_cast<CFBooleanRef>(_CFURLRequestCopyProtocolPropertyForKey(m_cfRequest.get(), wkResourceRequestIsUserInitiatedKey())));
+ RetainPtr<CFBooleanRef> initiatedByUserGesture = adoptCF(static_cast<CFBooleanRef>(_CFURLRequestCopyProtocolPropertyForKey(m_cfRequest.get(), ResourceRequest::isUserInitiatedKey())));
if (initiatedByUserGesture)
setInitiatedByUserGesture(CFBooleanGetValue(initiatedByUserGesture.get()));
#endif
@@ -438,4 +438,10 @@
}
#endif
+CFStringRef ResourceRequest::isUserInitiatedKey()
+{
+ static CFStringRef key = CFSTR("ResourceRequestIsUserInitiatedKey");
+ return key;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (184774 => 184775)
--- 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)
@@ -103,7 +103,7 @@
}
#endif
- NSNumber *initiatedByUserGesture = [NSURLProtocol propertyForKey:(NSString *)wkResourceRequestIsUserInitiatedKey() inRequest:m_nsRequest.get()];
+ NSNumber *initiatedByUserGesture = [NSURLProtocol propertyForKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:m_nsRequest.get()];
if (initiatedByUserGesture)
setInitiatedByUserGesture(initiatedByUserGesture.boolValue);
}
@@ -184,7 +184,7 @@
#endif
if (initiatedByUserGesture())
- [NSURLProtocol setProperty:@YES forKey:(NSString *)wkResourceRequestIsUserInitiatedKey() inRequest:nsRequest];
+ [NSURLProtocol setProperty:@YES forKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:nsRequest];
}
void ResourceRequest::doUpdatePlatformHTTPBody()
Modified: trunk/Source/WebKit/mac/ChangeLog (184774 => 184775)
--- 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)
@@ -1,3 +1,14 @@
+2015-05-22 Brady Eidson <beid...@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.
+
2015-05-21 Brady Eidson <beid...@apple.com>
Add an "initiated by user gesture" flag to ResourceRequest.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (184774 => 184775)
--- 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)
@@ -36,12 +36,6 @@
#define INIT(function) wk##function = WK##function
-static CFStringRef WKResourceRequestIsUserInitiatedKey()
-{
- static CFStringRef key = CFSTR("WKResourceRequestIsUserInitiatedKey");
- return key;
-}
-
void InitWebCoreSystemInterface(void)
{
static bool didInit;
@@ -216,7 +210,6 @@
INIT(CachePartitionKey);
#endif
- INIT(ResourceRequestIsUserInitiatedKey);
INIT(ExernalDeviceTypeForPlayer);
INIT(ExernalDeviceDisplayNameForPlayer);
Modified: trunk/Source/WebKit2/ChangeLog (184774 => 184775)
--- 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)
@@ -1,3 +1,18 @@
+2015-05-22 Brady Eidson <beid...@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.
+
2015-05-21 Gavin Barraclough <barraclo...@apple.com>
Networking process sometimes suspended while WebContent runnable
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKNSURLRequestExtras.mm (184774 => 184775)
--- 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)
@@ -26,13 +26,13 @@
#import "config.h"
#import "_WKNSURLRequestExtras.h"
-#import <WebCore/WebCoreSystemInterface.h>
+#import <WebCore/ResourceRequest.h>
@implementation NSURLRequest (WKExtras)
- (BOOL)_web_isUserInitiated
{
- NSNumber *userInitiated = [NSURLProtocol propertyForKey:(NSString *)wkResourceRequestIsUserInitiatedKey() inRequest:self];
+ NSNumber *userInitiated = [NSURLProtocol propertyForKey:(NSString *)WebCore::ResourceRequest::isUserInitiatedKey() inRequest:self];
return userInitiated.boolValue;
}
@@ -42,7 +42,7 @@
- (void)_web_setIsUserInitiated:(BOOL)userInitiated
{
- [NSURLProtocol setProperty:userInitiated ? @YES : @NO forKey:(NSString *)wkResourceRequestIsUserInitiatedKey() inRequest:self];
+ [NSURLProtocol setProperty:userInitiated ? @YES : @NO forKey:(NSString *)WebCore::ResourceRequest::isUserInitiatedKey() inRequest:self];
}
@end
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (184774 => 184775)
--- 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)
@@ -31,12 +31,6 @@
#define INIT(function) wk##function = WK##function
-static CFStringRef WKResourceRequestIsUserInitiatedKey()
-{
- static CFStringRef key = CFSTR("WKResourceRequestIsUserInitiatedKey");
- return key;
-}
-
void InitWebCoreSystemInterface(void)
{
static dispatch_once_t initOnce;
@@ -208,7 +202,6 @@
INIT(CachePartitionKey);
#endif
- INIT(ResourceRequestIsUserInitiatedKey);
INIT(ExernalDeviceTypeForPlayer);
INIT(ExernalDeviceDisplayNameForPlayer);
