WebKit Bugzilla
Attachment 356812 Details for
Bug 192415
: Remove unused API in NetworkProcess
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-192415-20181207172155.patch (text/plain), 31.94 KB, created by
Rob Buis
on 2018-12-07 08:21:56 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Rob Buis
Created:
2018-12-07 08:21:56 PST
Size:
31.94 KB
patch
obsolete
>Subversion Revision: 238951 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 5896003dbcbd0f6211660c56d8a80a02912c8b57..e70d43d4b4bd96d43185722d61de2676084d6692 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,50 @@ >+2018-12-07 Rob Buis <rbuis@igalia.com> >+ >+ Remove unused API in NetworkProcess >+ https://bugs.webkit.org/show_bug.cgi?id=192415 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * NetworkProcess/NetworkCORSPreflightChecker.cpp: >+ (WebKit::NetworkCORSPreflightChecker::startPreflight): >+ * NetworkProcess/NetworkCORSPreflightChecker.h: >+ * NetworkProcess/NetworkConnectionToWebProcess.cpp: >+ * NetworkProcess/NetworkConnectionToWebProcess.h: >+ * NetworkProcess/NetworkContentRuleListManager.h: >+ * NetworkProcess/NetworkDataTask.cpp: >+ * NetworkProcess/NetworkDataTask.h: >+ * NetworkProcess/NetworkDataTaskBlob.cpp: >+ * NetworkProcess/NetworkLoad.cpp: >+ (WebKit::NetworkLoad::shouldCaptureExtraNetworkLoadMetrics const): Deleted. >+ * NetworkProcess/NetworkLoad.h: >+ * NetworkProcess/NetworkLoadChecker.cpp: >+ * NetworkProcess/NetworkLoadChecker.h: >+ * NetworkProcess/NetworkLoadClient.h: >+ * NetworkProcess/NetworkLoadParameters.h: >+ * NetworkProcess/NetworkProcess.cpp: >+ * NetworkProcess/NetworkProcess.h: >+ * NetworkProcess/NetworkProcessCreationParameters.cpp: >+ * NetworkProcess/NetworkProcessCreationParameters.h: >+ * NetworkProcess/NetworkResourceLoadParameters.cpp: >+ (WebKit::NetworkResourceLoadParameters::encode const): >+ (WebKit::NetworkResourceLoadParameters::decode): >+ * NetworkProcess/NetworkResourceLoadParameters.h: >+ * NetworkProcess/NetworkResourceLoader.cpp: >+ (WebKit::NetworkResourceLoader::didReceiveBuffer): >+ * NetworkProcess/NetworkResourceLoader.h: >+ * NetworkProcess/NetworkSession.cpp: >+ * NetworkProcess/NetworkSession.h: >+ * NetworkProcess/NetworkSocketStream.cpp: >+ * NetworkProcess/NetworkSocketStream.h: >+ * NetworkProcess/PingLoad.cpp: >+ (WebKit::PingLoad::PingLoad): >+ * NetworkProcess/PingLoad.h: >+ * NetworkProcess/PreconnectTask.cpp: >+ (WebKit::PreconnectTask::PreconnectTask): >+ (WebKit::PreconnectTask::frameID const): Deleted. >+ (WebKit::PreconnectTask::pageID const): Deleted. >+ * NetworkProcess/PreconnectTask.h: >+ > 2018-12-06 David Kilzer <ddkilzer@apple.com> > > Injected bundle for WebKitTestRunner leaks WKTypeRef objects >diff --git a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp >index 1e5646e2af8bbafefa8f50c8027b13b8146d381a..8f9b69a84c93f9f0460cadf92d12c0b7725a77f3 100644 >--- a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp >@@ -33,7 +33,6 @@ > #include "NetworkProcess.h" > #include "SessionTracker.h" > #include <WebCore/CrossOriginAccessControl.h> >-#include <WebCore/SecurityOrigin.h> > > #define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(m_parameters.sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkCORSPreflightChecker::" fmt, this, ##__VA_ARGS__) > >@@ -66,7 +65,6 @@ void NetworkCORSPreflightChecker::startPreflight() > NetworkLoadParameters loadParameters; > loadParameters.sessionID = m_parameters.sessionID; > loadParameters.request = createAccessControlPreflightRequest(m_parameters.originalRequest, m_parameters.sourceOrigin, m_parameters.referrer); >- loadParameters.shouldFollowRedirects = false; > if (!m_parameters.userAgent.isNull()) > loadParameters.request.setHTTPHeaderField(HTTPHeaderName::UserAgent, m_parameters.userAgent); > >diff --git a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h >index 056df127a49c9c8cef98dc47f11c549ebfcbc8d1..378860a8191e1e2fc5ccb4f15e4ac6944d469c60 100644 >--- a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h >+++ b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h >@@ -30,7 +30,6 @@ > #include <WebCore/StoredCredentialsPolicy.h> > #include <pal/SessionID.h> > #include <wtf/CompletionHandler.h> >-#include <wtf/WeakPtr.h> > > namespace WebCore { > class ResourceError; >diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp >index 43384948c0492cdf1ba9e8f7db1af029440ab900..9bba7809ee238c0016531c028a3fa2735de1db8e 100644 >--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp >@@ -26,13 +26,10 @@ > #include "config.h" > #include "NetworkConnectionToWebProcess.h" > >-#include "BlobDataFileReferenceWithSandboxExtension.h" > #include "CacheStorageEngineConnectionMessages.h" > #include "DataReference.h" > #include "NetworkBlobRegistry.h" > #include "NetworkCache.h" >-#include "NetworkConnectionToWebProcessMessages.h" >-#include "NetworkLoad.h" > #include "NetworkMDNSRegisterMessages.h" > #include "NetworkProcess.h" > #include "NetworkProcessConnectionMessages.h" >@@ -57,10 +54,8 @@ > #include "WebSWServerConnectionMessages.h" > #include "WebSWServerToContextConnection.h" > #include "WebSWServerToContextConnectionMessages.h" >-#include "WebsiteDataStore.h" > #include "WebsiteDataStoreParameters.h" > #include <WebCore/NetworkStorageSession.h> >-#include <WebCore/ResourceLoaderOptions.h> > #include <WebCore/ResourceRequest.h> > #include <WebCore/SameSiteInfo.h> > #include <WebCore/SecurityPolicy.h> >diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h >index 2753edd9be578df3a3ea809b3c16de35ed9dca4e..9be001aa994bf713b2f72f5e3092bb7b52d40dc1 100644 >--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h >+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h >@@ -25,7 +25,6 @@ > > #pragma once > >-#include "BlockingResponseMap.h" > #include "CacheStorageEngineConnection.h" > #include "Connection.h" > #include "DownloadID.h" >@@ -34,7 +33,6 @@ > #include "NetworkMDNSRegister.h" > #include "NetworkRTCProvider.h" > #include <WebCore/NetworkLoadInformation.h> >-#include <WebCore/ResourceLoadPriority.h> > #include <wtf/RefCounted.h> > > namespace PAL { >@@ -43,7 +41,6 @@ class SessionID; > > namespace WebCore { > class BlobDataFileReference; >-class HTTPHeaderMap; > class ResourceError; > class ResourceRequest; > struct SameSiteInfo; >@@ -53,14 +50,10 @@ enum class IncludeSecureCookies : bool; > > namespace WebKit { > >-class NetworkConnectionToWebProcess; >-class NetworkLoadParameters; > class NetworkResourceLoader; > class NetworkSocketStream; >-class SyncNetworkResourceLoader; > class WebIDBConnectionToClient; > class WebSWServerConnection; >-class WebSWServerToContextConnection; > typedef uint64_t ResourceLoadIdentifier; > > namespace NetworkCache { >diff --git a/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h b/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h >index 0f76ce259aa7364dc0e7612e0dd33969a66e0785..100d9b2e3a8dafa1062fbf3a1a48d3d505fdce91 100644 >--- a/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h >+++ b/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h >@@ -30,7 +30,6 @@ > #include "UserContentControllerIdentifier.h" > #include "WebCompiledContentRuleListData.h" > #include <WebCore/ContentExtensionsBackend.h> >-#include <WebCore/UserContentProvider.h> > > namespace IPC { > class Connection; >diff --git a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp b/Source/WebKit/NetworkProcess/NetworkDataTask.cpp >index 059a130143ba5f3a7e0d1eb1b1466fa91fa0b993..4f4c415a17c8fc3c30e7fd01b3f74fda9d8594e7 100644 >--- a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkDataTask.cpp >@@ -29,9 +29,7 @@ > #include "NetworkDataTaskBlob.h" > #include "NetworkLoadParameters.h" > #include "NetworkSession.h" >-#include <WebCore/ResourceError.h> > #include <WebCore/ResourceResponse.h> >-#include <wtf/MainThread.h> > #include <wtf/RunLoop.h> > > #if PLATFORM(COCOA) >diff --git a/Source/WebKit/NetworkProcess/NetworkDataTask.h b/Source/WebKit/NetworkProcess/NetworkDataTask.h >index 45251cdf228b2c04cd027486460224657e3147b2..e104ce5311b80a4886ddc91aa6f521ae45eb836c 100644 >--- a/Source/WebKit/NetworkProcess/NetworkDataTask.h >+++ b/Source/WebKit/NetworkProcess/NetworkDataTask.h >@@ -46,7 +46,6 @@ class SharedBuffer; > > namespace WebKit { > >-class Download; > class NetworkLoadParameters; > class NetworkSession; > class PendingDownload; >diff --git a/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp b/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp >index d73a6ea6ff12c304bfa74bab95be6aeee66b8990..036ec8efe85ae34f1cc298b47fa5f830d35e6910 100644 >--- a/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp >@@ -39,18 +39,13 @@ > #include "NetworkSession.h" > #include "WebErrors.h" > #include <WebCore/AsyncFileStream.h> >-#include <WebCore/BlobData.h> > #include <WebCore/BlobRegistryImpl.h> >-#include <WebCore/FileStream.h> >-#include <WebCore/HTTPHeaderNames.h> > #include <WebCore/HTTPParsers.h> > #include <WebCore/ParsedContentRange.h> > #include <WebCore/ResourceError.h> > #include <WebCore/ResourceResponse.h> > #include <WebCore/SharedBuffer.h> >-#include <wtf/MainThread.h> > #include <wtf/RunLoop.h> >-#include <wtf/URL.h> > > namespace WebKit { > using namespace WebCore; >diff --git a/Source/WebKit/NetworkProcess/NetworkLoad.cpp b/Source/WebKit/NetworkProcess/NetworkLoad.cpp >index 19fe849163793bafa9f3e08a9217cef0d5e38a10..3a10d43b13091e09fe0cb41ec423df1318e9440b 100644 >--- a/Source/WebKit/NetworkProcess/NetworkLoad.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkLoad.cpp >@@ -27,25 +27,12 @@ > #include "NetworkLoad.h" > > #include "AuthenticationChallengeDisposition.h" >-#include "AuthenticationManager.h" >-#include "DownloadProxyMessages.h" > #include "NetworkProcess.h" > #include "NetworkSession.h" >-#include "SessionTracker.h" >-#include "WebCoreArgumentCoders.h" >-#include "WebErrors.h" >-#include <WebCore/NotImplemented.h> > #include <WebCore/ResourceRequest.h> > #include <WebCore/SharedBuffer.h> >-#include <pal/SessionID.h> >-#include <wtf/MainThread.h> > #include <wtf/Seconds.h> > >-#if PLATFORM(COCOA) >-#include "NetworkDataTaskCocoa.h" >-#include "NetworkSessionCocoa.h" >-#endif >- > namespace WebKit { > > using namespace WebCore; >@@ -127,11 +114,6 @@ void NetworkLoad::continueWillSendRequest(WebCore::ResourceRequest&& newRequest) > redirectCompletionHandler(ResourceRequest(m_currentRequest)); > } > >-bool NetworkLoad::shouldCaptureExtraNetworkLoadMetrics() const >-{ >- return m_client.get().shouldCaptureExtraNetworkLoadMetrics(); >-} >- > bool NetworkLoad::isAllowedToAskUserForCredentials() const > { > return m_client.get().isAllowedToAskUserForCredentials(); >diff --git a/Source/WebKit/NetworkProcess/NetworkLoad.h b/Source/WebKit/NetworkProcess/NetworkLoad.h >index b53fdbdcf8353a300846bcf53614822587dc3bf4..31a4e22f87f7fa5fb06d6e8225b8f0c6e48388ca 100644 >--- a/Source/WebKit/NetworkProcess/NetworkLoad.h >+++ b/Source/WebKit/NetworkProcess/NetworkLoad.h >@@ -31,13 +31,11 @@ > #include "NetworkLoadParameters.h" > #include <WebCore/AuthenticationChallenge.h> > #include <wtf/CompletionHandler.h> >-#include <wtf/Optional.h> > #include <wtf/text/WTFString.h> > > namespace WebKit { > >-class NetworkLoad final : private NetworkDataTaskClient >-{ >+class NetworkLoad final : private NetworkDataTaskClient { > WTF_MAKE_FAST_ALLOCATED; > public: > NetworkLoad(NetworkLoadClient&, NetworkLoadParameters&&, NetworkSession&); >@@ -49,7 +47,6 @@ public: > bool isAllowedToAskUserForCredentials() const; > > const WebCore::ResourceRequest& currentRequest() const { return m_currentRequest; } >- void clearCurrentRequest() { m_currentRequest = WebCore::ResourceRequest(); } > > const NetworkLoadParameters& parameters() const { return m_parameters; } > >@@ -61,8 +58,6 @@ public: > void setPendingDownload(PendingDownload&); > DownloadID pendingDownloadID() { return m_task->pendingDownloadID(); } > >- bool shouldCaptureExtraNetworkLoadMetrics() const final; >- > String description() const; > > private: >diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp >index 99fb8a5c6e0ff0c2438b87c2d25834e82a558d10..288d695280da529009ebb22baef707689c005935 100644 >--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp >@@ -26,19 +26,11 @@ > #include "config.h" > #include "NetworkLoadChecker.h" > >-#include "FormDataReference.h" > #include "Logging.h" > #include "NetworkCORSPreflightChecker.h" >-#include "NetworkConnectionToWebProcess.h" > #include "NetworkProcess.h" >-#include "WebCompiledContentRuleList.h" >-#include "WebPageMessages.h" >-#include "WebUserContentController.h" >-#include <JavaScriptCore/ConsoleTypes.h> > #include <WebCore/ContentSecurityPolicy.h> >-#include <WebCore/CrossOriginAccessControl.h> > #include <WebCore/CrossOriginPreflightResultCache.h> >-#include <WebCore/HTTPParsers.h> > #include <WebCore/SchemeRegistry.h> > #include <wtf/Scope.h> > >diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.h b/Source/WebKit/NetworkProcess/NetworkLoadChecker.h >index 6bde17ccd65b1caf3bda6934a28c9773c0927b06..99d8b7f3e83b54104fb9493eb5b20961c34a4ee3 100644 >--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.h >+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.h >@@ -25,15 +25,11 @@ > > #pragma once > >-#include "NetworkContentRuleListManager.h" >-#include "NetworkResourceLoadParameters.h" >-#include <WebCore/ContentSecurityPolicyClient.h> >+#include <WebCore/ContentExtensionActions.h> > #include <WebCore/NetworkLoadInformation.h> > #include <WebCore/ResourceError.h> >-#include <WebCore/SecurityPolicyViolationEvent.h> > #include <wtf/CompletionHandler.h> > #include <wtf/Expected.h> >-#include <wtf/WeakPtr.h> > > namespace WebCore { > class ContentSecurityPolicy; >@@ -42,7 +38,6 @@ struct ContentSecurityPolicyClient; > > namespace WebKit { > >-class NetworkConnectionToWebProcess; > class NetworkCORSPreflightChecker; > > class NetworkLoadChecker : public CanMakeWeakPtr<NetworkLoadChecker> { >diff --git a/Source/WebKit/NetworkProcess/NetworkLoadClient.h b/Source/WebKit/NetworkProcess/NetworkLoadClient.h >index bbce0d9a4dd1eda3f3e4757ad125bfff4134e8d9..18ec0c53b09b326429632d52eb3c0b6c0d8c5534 100644 >--- a/Source/WebKit/NetworkProcess/NetworkLoadClient.h >+++ b/Source/WebKit/NetworkProcess/NetworkLoadClient.h >@@ -28,11 +28,9 @@ > #include <WebCore/ResourceError.h> > #include <WebCore/ResourceRequest.h> > #include <WebCore/ResourceResponse.h> >-#include <wtf/Forward.h> > > namespace WebCore { > class NetworkLoadMetrics; >-class ProtectionSpace; > class SharedBuffer; > enum class PolicyAction : uint8_t; > } >diff --git a/Source/WebKit/NetworkProcess/NetworkLoadParameters.h b/Source/WebKit/NetworkProcess/NetworkLoadParameters.h >index ca784ac2861ab6641339499ee7907a7ef1a71fd6..decb94e73ee97665f8ae312baf87e4b9713d8790 100644 >--- a/Source/WebKit/NetworkProcess/NetworkLoadParameters.h >+++ b/Source/WebKit/NetworkProcess/NetworkLoadParameters.h >@@ -45,7 +45,6 @@ public: > WebCore::ContentEncodingSniffingPolicy contentEncodingSniffingPolicy { WebCore::ContentEncodingSniffingPolicy::Sniff }; > WebCore::StoredCredentialsPolicy storedCredentialsPolicy { WebCore::StoredCredentialsPolicy::DoNotUse }; > WebCore::ClientCredentialPolicy clientCredentialPolicy { WebCore::ClientCredentialPolicy::CannotAskClientForCredentials }; >- bool shouldFollowRedirects { true }; > bool shouldClearReferrerOnHTTPSToHTTPRedirect { true }; > bool defersLoading { false }; > bool needsCertificateInfo { false }; >diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp >index e6ba0b68e91fab0cef73fcb0c4a26802dff384a7..0b31ff7733dc24ca061cbdebe644bba9e013ac35 100644 >--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp >@@ -52,7 +52,6 @@ > #include "SessionTracker.h" > #include "StatisticsData.h" > #include "WebCookieManager.h" >-#include "WebCoreArgumentCoders.h" > #include "WebPageProxyMessages.h" > #include "WebProcessPoolMessages.h" > #include "WebSWOriginStore.h" >@@ -74,17 +73,12 @@ > #include <WebCore/RuntimeApplicationChecks.h> > #include <WebCore/SchemeRegistry.h> > #include <WebCore/SecurityOriginData.h> >-#include <WebCore/SecurityOriginHash.h> >-#include <WebCore/Settings.h> >-#include <pal/SessionID.h> > #include <wtf/Algorithms.h> > #include <wtf/CallbackAggregator.h> > #include <wtf/OptionSet.h> > #include <wtf/ProcessPrivilege.h> > #include <wtf/RunLoop.h> >-#include <wtf/URLParser.h> > #include <wtf/text/AtomicString.h> >-#include <wtf/text/CString.h> > > #if ENABLE(SEC_ITEM_SHIM) > #include "SecItemShim.h" >diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h >index 7df7970b1a8114d5dccb46291cc579abea45521b..1bbbd1bf4612c473363428765678e5233730ab48 100644 >--- a/Source/WebKit/NetworkProcess/NetworkProcess.h >+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h >@@ -28,26 +28,20 @@ > #include "CacheModel.h" > #include "ChildProcess.h" > #include "DownloadManager.h" >-#include "MessageReceiverMap.h" > #include "NetworkContentRuleListManager.h" > #include "SandboxExtension.h" > #include <WebCore/DiagnosticLoggingClient.h> > #include <WebCore/FetchIdentifier.h> >-#include <WebCore/IDBBackingStore.h> >-#include <WebCore/IDBKeyData.h> > #include <WebCore/IDBServer.h> > #include <WebCore/ServiceWorkerIdentifier.h> > #include <WebCore/ServiceWorkerTypes.h> >-#include <WebCore/UniqueIDBDatabase.h> > #include <memory> >-#include <pal/SessionID.h> > #include <wtf/CrossThreadTask.h> > #include <wtf/Function.h> > #include <wtf/HashSet.h> > #include <wtf/MemoryPressureHandler.h> > #include <wtf/NeverDestroyed.h> > #include <wtf/RetainPtr.h> >-#include <wtf/WeakPtr.h> > > namespace IPC { > class FormDataReference; >@@ -62,10 +56,8 @@ class CertificateInfo; > class CurlProxySettings; > class DownloadID; > class NetworkStorageSession; >-class ProtectionSpace; > class ResourceError; > class SWServer; >-class SecurityOrigin; > enum class StoredCredentialsPolicy : bool; > struct MessageWithMessagePorts; > struct SecurityOriginData; >@@ -79,8 +71,6 @@ class AuthenticationManager; > class NetworkConnectionToWebProcess; > class NetworkProcessSupplement; > class NetworkProximityManager; >-class NetworkResourceLoader; >-class PreconnectTask; > class WebSWServerConnection; > class WebSWServerToContextConnection; > enum class WebsiteDataFetchOption; >diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h >index 5c594bf1ff20bfd9726f110f67e913e0ba02158c..a0a5d28183ab1130911693a043b7a55deffa8c10 100644 >--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h >+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h >@@ -26,7 +26,6 @@ > #pragma once > > #include "CacheModel.h" >-#include "NetworkSessionCreationParameters.h" > #include "SandboxExtension.h" > #include <WebCore/Cookie.h> > #include <wtf/ProcessID.h> >diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp >index fefeab67b17d5c6f15621bfe3d0f2f5a79d393fb..1b57415be89c3b9a46939143df9c93c0dd927a5e 100644 >--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp >@@ -26,10 +26,7 @@ > #include "config.h" > #include "NetworkResourceLoadParameters.h" > >-#include "ArgumentCoders.h" >-#include "DataReference.h" > #include "WebCoreArgumentCoders.h" >-#include <WebCore/SecurityOriginData.h> > > namespace WebKit { > using namespace WebCore; >@@ -77,7 +74,6 @@ void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const > encoder.encodeEnum(storedCredentialsPolicy); > encoder.encodeEnum(clientCredentialPolicy); > encoder.encodeEnum(shouldPreconnectOnly); >- encoder << shouldFollowRedirects; > encoder << shouldClearReferrerOnHTTPSToHTTPRedirect; > encoder << defersLoading; > encoder << needsCertificateInfo; >@@ -160,8 +156,6 @@ bool NetworkResourceLoadParameters::decode(IPC::Decoder& decoder, NetworkResourc > return false; > if (!decoder.decodeEnum(result.shouldPreconnectOnly)) > return false; >- if (!decoder.decode(result.shouldFollowRedirects)) >- return false; > if (!decoder.decode(result.shouldClearReferrerOnHTTPSToHTTPRedirect)) > return false; > if (!decoder.decode(result.defersLoading)) >diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h >index 23cf9992895604dbd172df83e618342296f4d721..ba987d88a480ea085bdddce468b9fcfd3174b07d 100644 >--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h >+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h >@@ -30,10 +30,7 @@ > #include "UserContentControllerIdentifier.h" > #include <WebCore/ContentSecurityPolicyResponseHeaders.h> > #include <WebCore/FetchOptions.h> >-#include <WebCore/ResourceLoaderOptions.h> >-#include <WebCore/ResourceRequest.h> > #include <WebCore/SecurityOrigin.h> >-#include <pal/SessionID.h> > #include <wtf/Seconds.h> > > namespace IPC { >diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >index 860c76c21bbe76e6d5491d368722c8b34a7d64a8..f7cf027e37a70fd17c406a4d170fe96030a89ffd 100644 >--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >@@ -43,26 +43,18 @@ > #include "WebPageMessages.h" > #include "WebResourceLoaderMessages.h" > #include "WebsiteDataStoreParameters.h" >-#include <JavaScriptCore/ConsoleTypes.h> > #include <WebCore/BlobDataFileReference.h> > #include <WebCore/CertificateInfo.h> > #include <WebCore/ContentSecurityPolicy.h> > #include <WebCore/DiagnosticLoggingKeys.h> >-#include <WebCore/HTTPHeaderNames.h> > #include <WebCore/HTTPParsers.h> > #include <WebCore/NetworkLoadMetrics.h> > #include <WebCore/NetworkStorageSession.h> >-#include <WebCore/ProtectionSpace.h> > #include <WebCore/SameSiteInfo.h> > #include <WebCore/SecurityOrigin.h> > #include <WebCore/SharedBuffer.h> >-#include <WebCore/SynchronousLoaderClient.h> > #include <wtf/RunLoop.h> > >-#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED >-#include <WebCore/NetworkStorageSession.h> >-#endif >- > #if USE(QUICK_LOOK) > #include <WebCore/PreviewLoader.h> > #endif >@@ -508,9 +500,8 @@ void NetworkResourceLoader::didReceiveResponse(ResourceResponse&& receivedRespon > > void NetworkResourceLoader::didReceiveBuffer(Ref<SharedBuffer>&& buffer, int reportedEncodedDataLength) > { >- if (!m_numBytesReceived) { >+ if (!m_numBytesReceived) > RELEASE_LOG_IF_ALLOWED("didReceiveBuffer: Started receiving data (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier); >- } > m_numBytesReceived += buffer->size(); > > ASSERT(!m_cacheEntryForValidation); >@@ -526,7 +517,6 @@ void NetworkResourceLoader::didReceiveBuffer(Ref<SharedBuffer>&& buffer, int rep > // FIXME: At least on OS X Yosemite we always get -1 from the resource handle. > unsigned encodedDataLength = reportedEncodedDataLength >= 0 ? reportedEncodedDataLength : buffer->size(); > >- m_bytesReceived += buffer->size(); > if (m_bufferedData) { > m_bufferedData->append(buffer.get()); > m_bufferedDataEncodedDataLength += encodedDataLength; >diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h >index a15793a016ca810468ab727e1474410d133dec30..a2c492b0ab1ef0633a53363c75ee6c09e04de1d0 100644 >--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h >+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h >@@ -31,8 +31,6 @@ > #include "NetworkConnectionToWebProcessMessages.h" > #include "NetworkLoadClient.h" > #include "NetworkResourceLoadParameters.h" >-#include "ShareableResource.h" >-#include <JavaScriptCore/ConsoleTypes.h> > #include <WebCore/ContentSecurityPolicyClient.h> > #include <WebCore/ResourceResponse.h> > #include <WebCore/SecurityPolicyViolationEvent.h> >@@ -50,7 +48,6 @@ namespace WebKit { > class NetworkConnectionToWebProcess; > class NetworkLoad; > class NetworkLoadChecker; >-class SandboxExtension; > > namespace NetworkCache { > class Entry; >@@ -162,7 +159,7 @@ private: > void logCookieInformation() const; > #endif > >- void continueWillSendRedirectedRequest(WebCore::ResourceRequest&& request, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&&); >+ void continueWillSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&&); > void didFinishWithRedirectResponse(WebCore::ResourceResponse&&); > WebCore::ResourceResponse sanitizeResponseIfPossible(WebCore::ResourceResponse&&, WebCore::ResourceResponse::SanitizationType); > >@@ -183,7 +180,6 @@ private: > > WebCore::ResourceResponse m_response; > >- size_t m_bytesReceived { 0 }; > size_t m_bufferedDataEncodedDataLength { 0 }; > RefPtr<WebCore::SharedBuffer> m_bufferedData; > unsigned m_redirectCount { 0 }; >diff --git a/Source/WebKit/NetworkProcess/NetworkSession.cpp b/Source/WebKit/NetworkProcess/NetworkSession.cpp >index 5edde83eba24bb08aeb94d29caccdf05c84cc8e9..598661868988740fbfded129595297fb8f09b4a5 100644 >--- a/Source/WebKit/NetworkProcess/NetworkSession.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkSession.cpp >@@ -26,10 +26,7 @@ > #include "config.h" > #include "NetworkSession.h" > >-#include "NetworkDataTask.h" > #include <WebCore/NetworkStorageSession.h> >-#include <wtf/MainThread.h> >-#include <wtf/RunLoop.h> > > #if PLATFORM(COCOA) > #include "NetworkSessionCocoa.h" >diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h >index 73a146792ef661a7807fffd98fc809066c5fa703..51645b8b20a6d63a6386d1187d79ad2b3b0dfc43 100644 >--- a/Source/WebKit/NetworkProcess/NetworkSession.h >+++ b/Source/WebKit/NetworkProcess/NetworkSession.h >@@ -32,7 +32,6 @@ > #include <wtf/Seconds.h> > > namespace WebCore { >-class AuthenticationChallenge; > class NetworkStorageSession; > } > >diff --git a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp >index c5a62c68fe9da656e4233fbd1369a2c661e29a4e..4c70830a9e0c531e517197e62bbd1de1ba5f9f52 100644 >--- a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp >@@ -30,7 +30,6 @@ > #include "WebSocketStreamMessages.h" > #include <WebCore/CookieRequestHeaderFieldProxy.h> > #include <WebCore/SocketStreamError.h> >-#include <WebCore/SocketStreamHandleImpl.h> > > namespace WebKit { > using namespace WebCore; >diff --git a/Source/WebKit/NetworkProcess/NetworkSocketStream.h b/Source/WebKit/NetworkProcess/NetworkSocketStream.h >index 3268716f4469c0993f2597d09cbe1588e6f23a5b..b0a25470ac277e047fb273812cd71d197b81fe91 100644 >--- a/Source/WebKit/NetworkProcess/NetworkSocketStream.h >+++ b/Source/WebKit/NetworkProcess/NetworkSocketStream.h >@@ -37,10 +37,6 @@ class Decoder; > class DataReference; > } > >-namespace WebCore { >-class SocketStreamHandleImpl; >-} >- > namespace WebKit { > > class NetworkSocketStream : public RefCounted<NetworkSocketStream>, public IPC::MessageSender, public IPC::MessageReceiver, public WebCore::SocketStreamHandleClient { >diff --git a/Source/WebKit/NetworkProcess/PingLoad.cpp b/Source/WebKit/NetworkProcess/PingLoad.cpp >index 983a42ac8bc25fcaa94f0b0c915d6fae020ef1c3..f8e91eda4c9478c0015d5b296dbcb37c9627ae10 100644 >--- a/Source/WebKit/NetworkProcess/PingLoad.cpp >+++ b/Source/WebKit/NetworkProcess/PingLoad.cpp >@@ -39,7 +39,7 @@ namespace WebKit { > > using namespace WebCore; > >-PingLoad::PingLoad(NetworkResourceLoadParameters&& parameters, WTF::CompletionHandler<void(const ResourceError&, const ResourceResponse&)>&& completionHandler) >+PingLoad::PingLoad(NetworkResourceLoadParameters&& parameters, CompletionHandler<void(const ResourceError&, const ResourceResponse&)>&& completionHandler) > : m_parameters(WTFMove(parameters)) > , m_completionHandler(WTFMove(completionHandler)) > , m_timeoutTimer(*this, &PingLoad::timeoutTimerFired) >diff --git a/Source/WebKit/NetworkProcess/PingLoad.h b/Source/WebKit/NetworkProcess/PingLoad.h >index d4543f235b9047c5709c81ffda3861c59f784243..6ce52d18bbbfc053cf2cd6d72ce9e2ee28e3b19c 100644 >--- a/Source/WebKit/NetworkProcess/PingLoad.h >+++ b/Source/WebKit/NetworkProcess/PingLoad.h >@@ -33,14 +33,8 @@ > #include <wtf/UniqueRef.h> > #include <wtf/WeakPtr.h> > >-namespace WebCore { >-class ContentSecurityPolicy; >-class HTTPHeaderMap; >-} >- > namespace WebKit { > >-class NetworkConnectionToWebProcess; > class NetworkLoadChecker; > > class PingLoad final : public CanMakeWeakPtr<PingLoad>, private NetworkDataTaskClient { >@@ -51,7 +45,6 @@ private: > ~PingLoad(); > > const URL& currentURL() const; >- WebCore::ContentSecurityPolicy* contentSecurityPolicy() const; > > void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler&&) final; > void didReceiveChallenge(WebCore::AuthenticationChallenge&&, ChallengeCompletionHandler&&) final; >@@ -68,11 +61,10 @@ private: > void didFinish(const WebCore::ResourceError& = { }, const WebCore::ResourceResponse& response = { }); > > NetworkResourceLoadParameters m_parameters; >- WTF::CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&)> m_completionHandler; >+ CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&)> m_completionHandler; > RefPtr<NetworkDataTask> m_task; > WebCore::Timer m_timeoutTimer; > UniqueRef<NetworkLoadChecker> m_networkLoadChecker; >- std::optional<WebCore::ResourceRequest> m_lastRedirectionRequest; > }; > > } >diff --git a/Source/WebKit/NetworkProcess/PreconnectTask.cpp b/Source/WebKit/NetworkProcess/PreconnectTask.cpp >index 7a99849adbc67451dbf940fe027342405fe866fb..72b1758a4b2a722dd51d4fea37ef1f1b5b082452 100644 >--- a/Source/WebKit/NetworkProcess/PreconnectTask.cpp >+++ b/Source/WebKit/NetworkProcess/PreconnectTask.cpp >@@ -40,7 +40,7 @@ namespace WebKit { > > using namespace WebCore; > >-PreconnectTask::PreconnectTask(NetworkLoadParameters&& parameters, WTF::CompletionHandler<void(const ResourceError&)>&& completionHandler) >+PreconnectTask::PreconnectTask(NetworkLoadParameters&& parameters, CompletionHandler<void(const ResourceError&)>&& completionHandler) > : m_completionHandler(WTFMove(completionHandler)) > , m_timeoutTimer([this] { didFinish(ResourceError { String(), 0, m_networkLoad->parameters().request.url(), "Preconnection timed out"_s, ResourceError::Type::Timeout }); }) > { >@@ -103,16 +103,6 @@ void PreconnectTask::didFinish(const ResourceError& error) > delete this; > } > >-uint64_t PreconnectTask::frameID() const >-{ >- return m_networkLoad->parameters().webFrameID; >-} >- >-uint64_t PreconnectTask::pageID() const >-{ >- return m_networkLoad->parameters().webPageID; >-} >- > } // namespace WebKit > > #endif // ENABLE(SERVER_PRECONNECT) >diff --git a/Source/WebKit/NetworkProcess/PreconnectTask.h b/Source/WebKit/NetworkProcess/PreconnectTask.h >index 8f93fdc2f730a1e8d30f1d6dd5872fed271df350..e8d9242eae65afff61a822860a461e6490cf8361 100644 >--- a/Source/WebKit/NetworkProcess/PreconnectTask.h >+++ b/Source/WebKit/NetworkProcess/PreconnectTask.h >@@ -39,12 +39,9 @@ class NetworkLoadParameters; > > class PreconnectTask final : public NetworkLoadClient { > public: >- explicit PreconnectTask(NetworkLoadParameters&&, WTF::CompletionHandler<void(const WebCore::ResourceError&)>&& completionHandler = { }); >+ explicit PreconnectTask(NetworkLoadParameters&&, CompletionHandler<void(const WebCore::ResourceError&)>&& completionHandler = { }); > ~PreconnectTask(); > >- uint64_t frameID() const; >- uint64_t pageID() const; >- > private: > // NetworkLoadClient. > bool isSynchronous() const final { return false; } >@@ -59,7 +56,7 @@ private: > void didFinish(const WebCore::ResourceError&); > > std::unique_ptr<NetworkLoad> m_networkLoad; >- WTF::CompletionHandler<void(const WebCore::ResourceError&)> m_completionHandler; >+ CompletionHandler<void(const WebCore::ResourceError&)> m_completionHandler; > WebCore::Timer m_timeoutTimer; > }; >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192415
:
356627
|
356641
|
356806
|
356807
|
356812
|
356817