Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (202851 => 202852)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-07-06 06:52:25 UTC (rev 202851)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-07-06 06:53:18 UTC (rev 202852)
@@ -175,7 +175,6 @@
set(NetworkProcess_COMMON_SOURCES
NetworkProcess/NetworkConnectionToWebProcess.cpp
NetworkProcess/NetworkLoad.cpp
- NetworkProcess/NetworkLoadParameters.cpp
NetworkProcess/NetworkProcess.cpp
NetworkProcess/NetworkProcessPlatformStrategies.cpp
NetworkProcess/NetworkResourceLoader.cpp
Modified: trunk/Source/WebKit2/ChangeLog (202851 => 202852)
--- trunk/Source/WebKit2/ChangeLog 2016-07-06 06:52:25 UTC (rev 202851)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-06 06:53:18 UTC (rev 202852)
@@ -1,3 +1,20 @@
+2016-07-06 Youenn Fablet <[email protected]>
+
+ Refactor NetworkResourceLoadParameters
+ https://bugs.webkit.org/show_bug.cgi?id=159402
+
+ Reviewed by Alex Christensen.
+
+ Making NetworkResourceLoadParameters derive from NetworkLoadParameters.
+
+ * CMakeLists.txt: Removed NetworkLoadParameters.cpp
+ * NetworkProcess/NetworkLoadParameters.cpp: Deleted.
+ * NetworkProcess/NetworkLoadParameters.h:
+ * NetworkProcess/NetworkResourceLoadParameters.cpp:
+ (WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters): Deleted.
+ * NetworkProcess/NetworkResourceLoadParameters.h: Making it derive from NetworkLoadParameters.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2016-07-05 Alex Christensen <[email protected]>
Actually persist changes to cookie accept policy.
Deleted: trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp (202851 => 202852)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp 2016-07-06 06:52:25 UTC (rev 202851)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp 2016-07-06 06:53:18 UTC (rev 202852)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "NetworkLoadParameters.h"
-
-#include "NetworkResourceLoadParameters.h"
-
-namespace WebKit {
-
-NetworkLoadParameters::NetworkLoadParameters(const NetworkResourceLoadParameters& parameters)
- : webPageID(parameters.webPageID)
- , webFrameID(parameters.webFrameID)
- , sessionID(parameters.sessionID)
- , request(parameters.request)
- , contentSniffingPolicy(parameters.contentSniffingPolicy)
- , allowStoredCredentials(parameters.allowStoredCredentials)
- , clientCredentialPolicy(parameters.clientCredentialPolicy)
- , shouldClearReferrerOnHTTPSToHTTPRedirect(parameters.shouldClearReferrerOnHTTPSToHTTPRedirect)
- , defersLoading(parameters.defersLoading)
- , needsCertificateInfo(parameters.needsCertificateInfo)
-{
-}
-
-} // namespace WebKit
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h (202851 => 202852)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h 2016-07-06 06:52:25 UTC (rev 202851)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h 2016-07-06 06:53:18 UTC (rev 202852)
@@ -32,13 +32,8 @@
namespace WebKit {
-class NetworkResourceLoadParameters;
-
class NetworkLoadParameters {
public:
- NetworkLoadParameters() = default;
- NetworkLoadParameters(const NetworkResourceLoadParameters&);
-
uint64_t webPageID { 0 };
uint64_t webFrameID { 0 };
WebCore::SessionID sessionID { WebCore::SessionID::emptySessionID() };
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp (202851 => 202852)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp 2016-07-06 06:52:25 UTC (rev 202851)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp 2016-07-06 06:53:18 UTC (rev 202852)
@@ -34,21 +34,6 @@
namespace WebKit {
-NetworkResourceLoadParameters::NetworkResourceLoadParameters()
- : identifier(0)
- , webPageID(0)
- , webFrameID(0)
- , sessionID(SessionID::emptySessionID())
- , contentSniffingPolicy(SniffContent)
- , allowStoredCredentials(DoNotAllowStoredCredentials)
- , clientCredentialPolicy(DoNotAskClientForAnyCredentials)
- , shouldClearReferrerOnHTTPSToHTTPRedirect(true)
- , defersLoading(false)
- , needsCertificateInfo(false)
- , maximumBufferingTime(0ms)
-{
-}
-
void NetworkResourceLoadParameters::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << identifier;
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h (202851 => 202852)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h 2016-07-06 06:52:25 UTC (rev 202851)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h 2016-07-06 06:53:18 UTC (rev 202852)
@@ -26,6 +26,7 @@
#ifndef NetworkResourceLoadParameters_h
#define NetworkResourceLoadParameters_h
+#include "NetworkLoadParameters.h"
#include "SandboxExtension.h"
#include <WebCore/ResourceHandle.h>
#include <WebCore/ResourceLoaderOptions.h>
@@ -41,27 +42,15 @@
typedef uint64_t ResourceLoadIdentifier;
-class NetworkResourceLoadParameters {
+class NetworkResourceLoadParameters : public NetworkLoadParameters {
public:
- NetworkResourceLoadParameters();
-
void encode(IPC::ArgumentEncoder&) const;
static bool decode(IPC::ArgumentDecoder&, NetworkResourceLoadParameters&);
- ResourceLoadIdentifier identifier;
- uint64_t webPageID;
- uint64_t webFrameID;
- WebCore::SessionID sessionID;
- WebCore::ResourceRequest request;
+ ResourceLoadIdentifier identifier { 0 };
Vector<RefPtr<SandboxExtension>> requestBodySandboxExtensions; // Created automatically for the sender.
RefPtr<SandboxExtension> resourceSandboxExtension; // Created automatically for the sender.
- WebCore::ContentSniffingPolicy contentSniffingPolicy;
- WebCore::StoredCredentials allowStoredCredentials;
- WebCore::ClientCredentialPolicy clientCredentialPolicy;
- bool shouldClearReferrerOnHTTPSToHTTPRedirect;
- bool defersLoading;
- bool needsCertificateInfo;
- std::chrono::milliseconds maximumBufferingTime;
+ std::chrono::milliseconds maximumBufferingTime { 0ms };
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (202851 => 202852)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-07-06 06:52:25 UTC (rev 202851)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-07-06 06:53:18 UTC (rev 202852)
@@ -1184,7 +1184,6 @@
83891B691A68BEBC0030F386 /* _WKDiagnosticLoggingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 83891B681A68BEBC0030F386 /* _WKDiagnosticLoggingDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
83891B6C1A68C30B0030F386 /* DiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83891B6A1A68C30B0030F386 /* DiagnosticLoggingClient.h */; };
83891B6D1A68C30B0030F386 /* DiagnosticLoggingClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83891B6B1A68C30B0030F386 /* DiagnosticLoggingClient.mm */; };
- 839149641BEA838500D2D953 /* NetworkLoadParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839149621BEA838500D2D953 /* NetworkLoadParameters.cpp */; };
839149651BEA838500D2D953 /* NetworkLoadParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 839149631BEA838500D2D953 /* NetworkLoadParameters.h */; };
839902021BE9A02B000F3653 /* NetworkLoad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839901FF1BE9A01B000F3653 /* NetworkLoad.cpp */; };
839902031BE9A02B000F3653 /* NetworkLoad.h in Headers */ = {isa = PBXBuildFile; fileRef = 839901FE1BE9A01B000F3653 /* NetworkLoad.h */; };
@@ -3245,7 +3244,6 @@
83891B681A68BEBC0030F386 /* _WKDiagnosticLoggingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKDiagnosticLoggingDelegate.h; sourceTree = "<group>"; };
83891B6A1A68C30B0030F386 /* DiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagnosticLoggingClient.h; sourceTree = "<group>"; };
83891B6B1A68C30B0030F386 /* DiagnosticLoggingClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DiagnosticLoggingClient.mm; sourceTree = "<group>"; };
- 839149621BEA838500D2D953 /* NetworkLoadParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkLoadParameters.cpp; path = NetworkProcess/NetworkLoadParameters.cpp; sourceTree = "<group>"; };
839149631BEA838500D2D953 /* NetworkLoadParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkLoadParameters.h; path = NetworkProcess/NetworkLoadParameters.h; sourceTree = "<group>"; };
839901FE1BE9A01B000F3653 /* NetworkLoad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkLoad.h; path = NetworkProcess/NetworkLoad.h; sourceTree = "<group>"; };
839901FF1BE9A01B000F3653 /* NetworkLoad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkLoad.cpp; path = NetworkProcess/NetworkLoad.cpp; sourceTree = "<group>"; };
@@ -5356,7 +5354,6 @@
839901FF1BE9A01B000F3653 /* NetworkLoad.cpp */,
839901FE1BE9A01B000F3653 /* NetworkLoad.h */,
83D454D61BE9D3C4006C93BD /* NetworkLoadClient.h */,
- 839149621BEA838500D2D953 /* NetworkLoadParameters.cpp */,
839149631BEA838500D2D953 /* NetworkLoadParameters.h */,
510CC7DF16138E2900D03ED3 /* NetworkProcess.cpp */,
510CC7E016138E2900D03ED3 /* NetworkProcess.h */,
@@ -9035,7 +9032,6 @@
5CBC9B8D1C65279C00A8FDCF /* NetworkDataTaskCocoa.mm in Sources */,
839902021BE9A02B000F3653 /* NetworkLoad.cpp in Sources */,
836EEB801BE9EC9E006B4B82 /* NetworkLoadMac.mm in Sources */,
- 839149641BEA838500D2D953 /* NetworkLoadParameters.cpp in Sources */,
51795568162876CF00FA43B6 /* NetworkProcess.cpp in Sources */,
7EC4F0FB18E4ACBB008056AF /* NetworkProcessCocoa.mm in Sources */,
5183DDEC1630BDFC008BE5C7 /* NetworkProcessConnection.cpp in Sources */,