Changeset 293310 in webkit

Timestamp:

Apr 24, 2022, 10:56:51 PM (3 years ago)

Author:

youenn@apple.com

Message:

Make NetworkResourceLoader.m_parameters non const
​https://bugs.webkit.org/show_bug.cgi?id=239603

Reviewed by Anders Carlsson.

Now that NetworkResourceLoader can be transitioned through WebProcesses,
several NetworkResourceLoaderParameters might need to be changed over time.
For that reason, it no longer makes sense to have m_parameters const.

Covered by existing tests.

• NetworkProcess/NetworkLoadParameters.h:
• NetworkProcess/NetworkResourceLoadParameters.h:
• NetworkProcess/NetworkResourceLoader.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkLoadParameters.h (modified) (1 diff)
• NetworkProcess/NetworkResourceLoadParameters.h (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-04-24  Youenn Fablet  <youenn@apple.com>
+
+        Make NetworkResourceLoader.m_parameters non const
+        https://bugs.webkit.org/show_bug.cgi?id=239603
+
+        Reviewed by Anders Carlsson.
+
+        Now that NetworkResourceLoader can be transitioned through WebProcesses,
+        several NetworkResourceLoaderParameters might need to be changed over time.
+        For that reason, it no longer makes sense to have m_parameters const.
+
+        Covered by existing tests.
+
+        * NetworkProcess/NetworkLoadParameters.h:
+        * NetworkProcess/NetworkResourceLoadParameters.h:
+        * NetworkProcess/NetworkResourceLoader.h:
+
 2022-04-24  Daniel Kolesa  <dkolesa@igalia.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkLoadParameters.h

@@ -45 +45 @@
 class NetworkLoadParameters {
 public:
-    mutable WebPageProxyIdentifier webPageProxyID;
-    mutable WebCore::PageIdentifier webPageID;
-    mutable WebCore::FrameIdentifier webFrameID;
+    WebPageProxyIdentifier webPageProxyID;
+    WebCore::PageIdentifier webPageID;
+    WebCore::FrameIdentifier webFrameID;
     RefPtr<WebCore::SecurityOrigin> topOrigin;
     RefPtr<WebCore::SecurityOrigin> sourceOrigin;

trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h

@@ -53 +53 @@
     RefPtr<WebCore::SecurityOrigin> parentOrigin() const;
 
-    mutable WebCore::ResourceLoaderIdentifier identifier;
+    WebCore::ResourceLoaderIdentifier identifier;
     Vector<RefPtr<SandboxExtension>> requestBodySandboxExtensions; // Created automatically for the sender.
     RefPtr<SandboxExtension> resourceSandboxExtension; // Created automatically for the sender.
-    mutable Seconds maximumBufferingTime;
-    mutable WebCore::FetchOptions options;
+    Seconds maximumBufferingTime;
+    WebCore::FetchOptions options;
     std::optional<WebCore::ContentSecurityPolicyResponseHeaders> cspResponseHeaders;
     WebCore::CrossOriginEmbedderPolicy parentCrossOriginEmbedderPolicy;

trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h

@@ -252 +252 @@
     std::optional<WebCore::NetworkLoadMetrics> computeResponseMetrics(const WebCore::ResourceResponse&) const;
 
-    const NetworkResourceLoadParameters m_parameters;
+    NetworkResourceLoadParameters m_parameters;
 
     Ref<NetworkConnectionToWebProcess> m_connection;