Changeset 184945 in webkit

Timestamp:

May 27, 2015, 11:14:50 PM (10 years ago)

Author:

beidson@apple.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/WebCoreSystemInterfaceIOS.mm (modified) (1 diff)
• platform/mac/WebCoreSystemInterface.mm (modified) (1 diff)
• platform/network/ResourceRequestBase.h (modified) (4 diffs)
• platform/network/cf/ResourceRequestCFNet.cpp (modified) (2 diffs)
• platform/network/cocoa/ResourceRequestCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-27  Brady Eidson  <beidson@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  <beidson@apple.com>
 

trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm

@@ -124 +124 @@
 
 WEBCORE_EXPORT bool (*wkQueryDecoderAvailability)(void);
-
-WEBCORE_EXPORT CFStringRef (*wkResourceRequestIsUserInitiatedKey)(void);
-

trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm

@@ -171 +171 @@
 #endif
 
-CFStringRef (*wkResourceRequestIsUserInitiatedKey)(void);
-
 int (*wkExernalDeviceTypeForPlayer)(AVPlayer *);
 NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);

trunk/Source/WebCore/platform/network/ResourceRequestBase.h

@@ -148 +148 @@
         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; }
@@ -217 +214 @@
         bool m_reportRawHeaders { false };
         bool m_hiddenFromInspector { false };
-        bool m_initiatedByUserGesture { false };
         ResourceLoadPriority m_priority { ResourceLoadPriority::Low };
         Requester m_requester { Requester::Unspecified };
@@ -269 +265 @@
     encoder.encodeEnum(m_priority);
     encoder.encodeEnum(m_requester);
-    encoder << m_initiatedByUserGesture;
 }
 
@@ -315 +310 @@
         return false;
 
-    if (!decoder.decode(m_initiatedByUserGesture))
-        return false;
-
     return true;
 }

trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

@@ -187 +187 @@
 #endif
 
-#if !PLATFORM(WIN)
-    if (initiatedByUserGesture())
-        _CFURLRequestSetProtocolProperty(cfRequest, ResourceRequest::isUserInitiatedKey(), kCFBooleanTrue);
-#endif
-
     m_cfRequest = adoptCF(cfRequest);
 #if PLATFORM(COCOA)
@@ -296 +291 @@
         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
 }
 

trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm

@@ -103 +103 @@
     }
 #endif
-
-    NSNumber *initiatedByUserGesture = [NSURLProtocol propertyForKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:m_nsRequest.get()];
-    if (initiatedByUserGesture)
-        setInitiatedByUserGesture(initiatedByUserGesture.boolValue);
 }
 
@@ -183 +179 @@
     }
 #endif
-
-    if (initiatedByUserGesture())
-        [NSURLProtocol setProperty:@YES forKey:(NSString *)ResourceRequest::isUserInitiatedKey() inRequest:nsRequest];
 }