WebKit Bugzilla
Attachment 356627 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-20181205202550.patch (text/plain), 11.99 KB, created by
Rob Buis
on 2018-12-05 11:25:51 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Rob Buis
Created:
2018-12-05 11:25:51 PST
Size:
11.99 KB
patch
obsolete
>Subversion Revision: 238890 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index efce1cc93fdd90050a4894e8f9ea467ab44fe84e..da35f2f63a4d592715522ac7363af1930e77b44f 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,26 @@ >+2018-12-05 Rob Buis <rbuis@igalia.com> >+ >+ Remove unused API in NetworkProcess >+ https://bugs.webkit.org/show_bug.cgi?id=192415 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * NetworkProcess/NetworkLoad.cpp: >+ (WebKit::NetworkLoad::shouldCaptureExtraNetworkLoadMetrics const): Deleted. >+ * NetworkProcess/NetworkLoad.h: >+ * NetworkProcess/NetworkResourceLoader.cpp: >+ (WebKit::NetworkResourceLoader::didReceiveBuffer): >+ * NetworkProcess/NetworkResourceLoader.h: >+ * NetworkProcess/NetworkSession.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-04 Fujii Hironori <Hironori.Fujii@sony.com> > > Remove using namespace WebCore and WebKit under WebKit/Shared/API >diff --git a/Source/WebKit/NetworkProcess/NetworkLoad.cpp b/Source/WebKit/NetworkProcess/NetworkLoad.cpp >index 19fe849163793bafa9f3e08a9217cef0d5e38a10..897763a6528c54828ab0d27a31a0354392579c6f 100644 >--- a/Source/WebKit/NetworkProcess/NetworkLoad.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkLoad.cpp >@@ -127,11 +127,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..7309990a9ddb5fa2a797459a42152137eba3d6da 100644 >--- a/Source/WebKit/NetworkProcess/NetworkLoad.h >+++ b/Source/WebKit/NetworkProcess/NetworkLoad.h >@@ -36,8 +36,7 @@ > > namespace WebKit { > >-class NetworkLoad final : private NetworkDataTaskClient >-{ >+class NetworkLoad final : private NetworkDataTaskClient { > WTF_MAKE_FAST_ALLOCATED; > public: > NetworkLoad(NetworkLoadClient&, NetworkLoadParameters&&, NetworkSession&); >@@ -49,7 +48,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 +59,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/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >index 82a85501d2c5c67f95e1341ceb71907edeb42f19..669ca3258a369651a9a46fec2e22623773a87cbf 100644 >--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >@@ -59,10 +59,6 @@ > #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 +504,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 +521,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 c2d5d776b73ffb7601dfe58ff1649348cfe8a84e..520ea242fd3f3ae7fdc4f6f3e43a4498e920244e 100644 >--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h >+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h >@@ -23,8 +23,7 @@ > * THE POSSIBILITY OF SUCH DAMAGE. > */ > >-#ifndef NetworkResourceLoader_h >-#define NetworkResourceLoader_h >+#pragma once > > #include "DownloadID.h" > #include "MessageSender.h" >@@ -32,7 +31,6 @@ > #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; >@@ -163,7 +160,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); > >@@ -184,7 +181,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 }; >@@ -215,5 +211,3 @@ private: > }; > > } // namespace WebKit >- >-#endif // NetworkResourceLoader_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/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