[webkit-changes] [253449] trunk/Source/WebKit

Thu, 12 Dec 2019 15:43:01 -0800

Title: [253449] trunk/Source/WebKit
Revision
253449
Author
[email protected]
Date
2019-12-12 15:42:04 -0800 (Thu, 12 Dec 2019)

Log Message

NetworkDataTaskCocoa and NetworkSessionCocoa should use public methods instead of being friends
https://bugs.webkit.org/show_bug.cgi?id=204242

Patch by Alex Christensen <[email protected]> on 2019-12-12
Reviewed by Chris Dumez.

This makes them stay good abstractions, and probably could make a good meme about not having any friends.

* NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTaskCocoa::applySniffingPoliciesAndBindRequestToInferfaceIfNeeded):
* NetworkProcess/cocoa/NetworkSessionCocoa.h:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (253448 => 253449)


--- trunk/Source/WebKit/ChangeLog	2019-12-12 23:35:04 UTC (rev 253448)
+++ trunk/Source/WebKit/ChangeLog	2019-12-12 23:42:04 UTC (rev 253449)
@@ -1,3 +1,17 @@
+2019-12-12  Alex Christensen  <[email protected]>
+
+        NetworkDataTaskCocoa and NetworkSessionCocoa should use public methods instead of being friends
+        https://bugs.webkit.org/show_bug.cgi?id=204242
+
+        Reviewed by Chris Dumez.
+
+        This makes them stay good abstractions, and probably could make a good meme about not having any friends.
+
+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+        (WebKit::NetworkDataTaskCocoa::applySniffingPoliciesAndBindRequestToInferfaceIfNeeded):
+        * NetworkProcess/cocoa/NetworkSessionCocoa.h:
+
 2019-12-12  Per Arne Vollan  <[email protected]>
 
         [iOS] Deny mach lookup access to content filter service in the WebContent sandbox

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h (253448 => 253449)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h	2019-12-12 23:35:04 UTC (rev 253448)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h	2019-12-12 23:42:04 UTC (rev 253449)
@@ -41,7 +41,6 @@
 struct SessionWrapper;
 
 class NetworkDataTaskCocoa final : public NetworkDataTask {
-    friend class NetworkSessionCocoa;
 public:
     static Ref<NetworkDataTask> create(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& request, WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, WebCore::ContentSniffingPolicy shouldContentSniff, WebCore::ContentEncodingSniffingPolicy shouldContentEncodingSniff, bool shouldClearReferrerOnHTTPSToHTTPRedirect, PreconnectOnly shouldPreconnectOnly, bool dataTaskIsForMainFrameNavigation, bool dataTaskIsForMainResourceNavigationForAnyFrame, Optional<NetworkActivityTracker> networkActivityTracker)
     {

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (253448 => 253449)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	2019-12-12 23:35:04 UTC (rev 253448)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	2019-12-12 23:42:04 UTC (rev 253449)
@@ -94,12 +94,14 @@
 #endif
 
     auto& cocoaSession = static_cast<NetworkSessionCocoa&>(*m_session);
+    auto& boundInterfaceIdentifier = cocoaSession.boundInterfaceIdentifier();
+    auto* proxyConfiguration = cocoaSession.proxyConfiguration();
     if (shouldContentSniff
 #if USE(CFNETWORK_CONTENT_ENCODING_SNIFFING_OVERRIDE)
         && shouldContentEncodingSniff
 #endif
-        && cocoaSession.m_boundInterfaceIdentifier.isNull()
-        && !cocoaSession.m_proxyConfiguration)
+        && boundInterfaceIdentifier.isNull()
+        && !proxyConfiguration)
         return;
 
     auto mutableRequest = adoptNS([nsRequest mutableCopy]);
@@ -112,11 +114,11 @@
     if (!shouldContentSniff)
         [mutableRequest _setProperty:@NO forKey:(NSString *)_kCFURLConnectionPropertyShouldSniff];
 
-    if (!cocoaSession.m_boundInterfaceIdentifier.isNull())
-        [mutableRequest setBoundInterfaceIdentifier:cocoaSession.m_boundInterfaceIdentifier];
+    if (!boundInterfaceIdentifier.isNull())
+        [mutableRequest setBoundInterfaceIdentifier:boundInterfaceIdentifier];
 
-    if (cocoaSession.m_proxyConfiguration)
-        CFURLRequestSetProxySettings([mutableRequest _CFURLRequest], cocoaSession.m_proxyConfiguration.get());
+    if (proxyConfiguration)
+        CFURLRequestSetProxySettings([mutableRequest _CFURLRequest], proxyConfiguration);
 
     nsRequest = mutableRequest.autorelease();
 }

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h (253448 => 253449)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h	2019-12-12 23:35:04 UTC (rev 253448)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h	2019-12-12 23:42:04 UTC (rev 253449)
@@ -61,7 +61,6 @@
 };
 
 class NetworkSessionCocoa final : public NetworkSession {
-    friend class NetworkDataTaskCocoa;
 public:
     static std::unique_ptr<NetworkSession> create(NetworkProcess&, NetworkSessionCreationParameters&&);
 
@@ -94,12 +93,13 @@
     bool hasIsolatedSession(const WebCore::RegistrableDomain) const override;
     void clearIsolatedSessions() override;
 
+    SessionWrapper& sessionWrapperForTask(const WebCore::ResourceRequest&, WebCore::StoredCredentialsPolicy);
+
 private:
     void invalidateAndCancel() override;
     void clearCredentials() override;
     bool shouldLogCookieInformation() const override { return m_shouldLogCookieInformation; }
     Seconds loadThrottleLatency() const override { return m_loadThrottleLatency; }
-    SessionWrapper& sessionWrapperForTask(const WebCore::ResourceRequest&, WebCore::StoredCredentialsPolicy);
     SessionWrapper& isolatedSession(WebCore::StoredCredentialsPolicy, const WebCore::RegistrableDomain);
 
 #if HAVE(NSURLSESSION_WEBSOCKET)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to