Diff
Modified: trunk/Source/WebKit/ChangeLog (239006 => 239007)
--- trunk/Source/WebKit/ChangeLog 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/ChangeLog 2018-12-08 07:35:47 UTC (rev 239007)
@@ -1,3 +1,50 @@
+2018-12-07 Rob Buis <[email protected]>
+
+ Remove unused API in NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=192415
+
+ Reviewed by Alex Christensen.
+
+ This patch removed some unused API and headers in NetworkProcess.
+
+ * 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:
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkLoadChecker.cpp:
+ * NetworkProcess/NetworkLoadChecker.h:
+ * NetworkProcess/NetworkLoadClient.h:
+ * NetworkProcess/NetworkLoadParameters.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ * NetworkProcess/NetworkProcess.h:
+ * 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-07 Eric Carlson <[email protected]>
[MediaStream] 'devicechange' event should not fire in frames that can't access capture devices
Modified: trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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 @@
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);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -30,7 +30,6 @@
#include <WebCore/StoredCredentialsPolicy.h>
#include <pal/SessionID.h>
#include <wtf/CompletionHandler.h>
-#include <wtf/WeakPtr.h>
namespace WebCore {
class ResourceError;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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>
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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 @@
namespace WebCore {
class BlobDataFileReference;
-class HTTPHeaderMap;
class ResourceError;
class ResourceRequest;
struct SameSiteInfo;
@@ -53,14 +50,10 @@
namespace WebKit {
-class NetworkConnectionToWebProcess;
-class NetworkLoadParameters;
class NetworkResourceLoader;
class NetworkSocketStream;
-class SyncNetworkResourceLoader;
class WebIDBConnectionToClient;
class WebSWServerConnection;
-class WebSWServerToContextConnection;
typedef uint64_t ResourceLoadIdentifier;
namespace NetworkCache {
Modified: trunk/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -30,7 +30,6 @@
#include "UserContentControllerIdentifier.h"
#include "WebCompiledContentRuleListData.h"
#include <WebCore/ContentExtensionsBackend.h>
-#include <WebCore/UserContentProvider.h>
namespace IPC {
class Connection;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkDataTask.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkDataTask.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkDataTask.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkDataTask.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -46,7 +46,6 @@
namespace WebKit {
-class Download;
class NetworkLoadParameters;
class NetworkSession;
class PendingDownload;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoad.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoad.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoad.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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 @@
bool isAllowedToAskUserForCredentials() const;
const WebCore::ResourceRequest& currentRequest() const { return m_currentRequest; }
- void clearCurrentRequest() { m_currentRequest = WebCore::ResourceRequest(); }
const NetworkLoadParameters& parameters() const { return m_parameters; }
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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 <_javascript_Core/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>
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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 @@
namespace WebKit {
-class NetworkConnectionToWebProcess;
class NetworkCORSPreflightChecker;
class NetworkLoadChecker : public CanMakeWeakPtr<NetworkLoadChecker> {
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoadClient.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoadClient.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoadClient.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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;
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoadParameters.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoadParameters.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoadParameters.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -45,7 +45,6 @@
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 };
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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"
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -28,19 +28,15 @@
#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>
@@ -47,7 +43,6 @@
#include <wtf/MemoryPressureHandler.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/RetainPtr.h>
-#include <wtf/WeakPtr.h>
namespace IPC {
class FormDataReference;
@@ -62,10 +57,8 @@
class CurlProxySettings;
class DownloadID;
class NetworkStorageSession;
-class ProtectionSpace;
class ResourceError;
class SWServer;
-class SecurityOrigin;
enum class StoredCredentialsPolicy : bool;
struct MessageWithMessagePorts;
struct SecurityOriginData;
@@ -79,8 +72,6 @@
class NetworkConnectionToWebProcess;
class NetworkProcessSupplement;
class NetworkProximityManager;
-class NetworkResourceLoader;
-class PreconnectTask;
class WebSWServerConnection;
class WebSWServerToContextConnection;
enum class WebsiteDataFetchOption;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -26,7 +26,6 @@
#pragma once
#include "CacheModel.h"
-#include "NetworkSessionCreationParameters.h"
#include "SandboxExtension.h"
#include <WebCore/Cookie.h>
#include <wtf/ProcessID.h>
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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 @@
encoder.encodeEnum(storedCredentialsPolicy);
encoder.encodeEnum(clientCredentialPolicy);
encoder.encodeEnum(shouldPreconnectOnly);
- encoder << shouldFollowRedirects;
encoder << shouldClearReferrerOnHTTPSToHTTPRedirect;
encoder << defersLoading;
encoder << needsCertificateInfo;
@@ -160,8 +156,6 @@
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))
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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 {
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -43,26 +43,18 @@
#include "WebPageMessages.h"
#include "WebResourceLoaderMessages.h"
#include "WebsiteDataStoreParameters.h"
-#include <_javascript_Core/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::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 @@
// 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;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -31,8 +31,6 @@
#include "NetworkConnectionToWebProcessMessages.h"
#include "NetworkLoadClient.h"
#include "NetworkResourceLoadParameters.h"
-#include "ShareableResource.h"
-#include <_javascript_Core/ConsoleTypes.h>
#include <WebCore/ContentSecurityPolicyClient.h>
#include <WebCore/ResourceResponse.h>
#include <WebCore/SecurityPolicyViolationEvent.h>
@@ -50,7 +48,6 @@
class NetworkConnectionToWebProcess;
class NetworkLoad;
class NetworkLoadChecker;
-class SandboxExtension;
namespace NetworkCache {
class Entry;
@@ -162,7 +159,7 @@
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 @@
WebCore::ResourceResponse m_response;
- size_t m_bytesReceived { 0 };
size_t m_bufferedDataEncodedDataLength { 0 };
RefPtr<WebCore::SharedBuffer> m_bufferedData;
unsigned m_redirectCount { 0 };
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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"
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkSession.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -32,7 +32,6 @@
#include <wtf/Seconds.h>
namespace WebCore {
-class AuthenticationChallenge;
class NetworkStorageSession;
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -30,7 +30,6 @@
#include "WebSocketStreamMessages.h"
#include <WebCore/CookieRequestHeaderFieldProxy.h>
#include <WebCore/SocketStreamError.h>
-#include <WebCore/SocketStreamHandleImpl.h>
namespace WebKit {
using namespace WebCore;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSocketStream.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/NetworkSocketStream.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSocketStream.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -37,10 +37,6 @@
class DataReference;
}
-namespace WebCore {
-class SocketStreamHandleImpl;
-}
-
namespace WebKit {
class NetworkSocketStream : public RefCounted<NetworkSocketStream>, public IPC::MessageSender, public IPC::MessageReceiver, public WebCore::SocketStreamHandleClient {
Modified: trunk/Source/WebKit/NetworkProcess/PingLoad.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/PingLoad.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/PingLoad.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -39,7 +39,7 @@
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)
Modified: trunk/Source/WebKit/NetworkProcess/PingLoad.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/PingLoad.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/PingLoad.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -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 @@
~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 @@
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;
};
}
Modified: trunk/Source/WebKit/NetworkProcess/PreconnectTask.cpp (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/PreconnectTask.cpp 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/PreconnectTask.cpp 2018-12-08 07:35:47 UTC (rev 239007)
@@ -40,7 +40,7 @@
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 @@
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)
Modified: trunk/Source/WebKit/NetworkProcess/PreconnectTask.h (239006 => 239007)
--- trunk/Source/WebKit/NetworkProcess/PreconnectTask.h 2018-12-08 03:11:36 UTC (rev 239006)
+++ trunk/Source/WebKit/NetworkProcess/PreconnectTask.h 2018-12-08 07:35:47 UTC (rev 239007)
@@ -39,12 +39,9 @@
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 @@
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;
};
