SWServer::scriptFetchFinished does not need a Connection as parameter
https://bugs.webkit.org/show_bug.cgi?id=204641
Reviewed by Chris Dumez.
No change of behavior, removing an unused parameter.
* workers/service/server/SWServer.cpp:
(WebCore::SWServer::Connection::finishFetchingScriptInServer):
(WebCore::SWServer::startScriptFetch):
(WebCore::SWServer::didResolveRegistrationPromise):
* workers/service/server/SWServer.h:
* workers/service/server/SWServerJobQueue.cpp:
(WebCore::SWServerJobQueue::scriptFetchFinished):
* workers/service/server/SWServerJobQueue.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@252986 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8f5c8b0..8fb6b92 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,23 @@
2019-12-02 youenn fablet <youenn@apple.com>
+ SWServer::scriptFetchFinished does not need a Connection as parameter
+ https://bugs.webkit.org/show_bug.cgi?id=204641
+
+ Reviewed by Chris Dumez.
+
+ No change of behavior, removing an unused parameter.
+
+ * workers/service/server/SWServer.cpp:
+ (WebCore::SWServer::Connection::finishFetchingScriptInServer):
+ (WebCore::SWServer::startScriptFetch):
+ (WebCore::SWServer::didResolveRegistrationPromise):
+ * workers/service/server/SWServer.h:
+ * workers/service/server/SWServerJobQueue.cpp:
+ (WebCore::SWServerJobQueue::scriptFetchFinished):
+ * workers/service/server/SWServerJobQueue.h:
+
+2019-12-02 youenn fablet <youenn@apple.com>
+
Service Worker should correctly set its document first party for cookies URL
https://bugs.webkit.org/show_bug.cgi?id=204742
diff --git a/Source/WebCore/workers/service/server/SWServer.cpp b/Source/WebCore/workers/service/server/SWServer.cpp
index c764baa..0ddfcfc 100644
--- a/Source/WebCore/workers/service/server/SWServer.cpp
+++ b/Source/WebCore/workers/service/server/SWServer.cpp
@@ -288,7 +288,7 @@
void SWServer::Connection::finishFetchingScriptInServer(const ServiceWorkerFetchResult& result)
{
- m_server.scriptFetchFinished(*this, result);
+ m_server.scriptFetchFinished(result);
}
void SWServer::Connection::didResolveRegistrationPromise(const ServiceWorkerRegistrationKey& key)
@@ -383,7 +383,7 @@
connection->startScriptFetchInClient(jobData.identifier().jobIdentifier, jobData.registrationKey(), cachePolicy);
}
-void SWServer::scriptFetchFinished(Connection& connection, const ServiceWorkerFetchResult& result)
+void SWServer::scriptFetchFinished(const ServiceWorkerFetchResult& result)
{
LOG(ServiceWorker, "Server handling scriptFetchFinished for current job %s in client", result.jobDataIdentifier.loggingString().utf8().data());
@@ -393,7 +393,7 @@
if (!jobQueue)
return;
- jobQueue->scriptFetchFinished(connection, result);
+ jobQueue->scriptFetchFinished(result);
}
void SWServer::scriptContextFailedToStart(const Optional<ServiceWorkerJobDataIdentifier>& jobDataIdentifier, SWServerWorker& worker, const String& message)
@@ -542,7 +542,7 @@
registration->removeClientServiceWorkerRegistration(connection.identifier());
}
-void SWServer::updateWorker(Connection&, const ServiceWorkerJobDataIdentifier& jobDataIdentifier, SWServerRegistration& registration, const URL& url, const String& script, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy, const String& referrerPolicy, WorkerType type, HashMap<URL, ServiceWorkerContextData::ImportedScript>&& scriptResourceMap)
+void SWServer::updateWorker(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, SWServerRegistration& registration, const URL& url, const String& script, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy, const String& referrerPolicy, WorkerType type, HashMap<URL, ServiceWorkerContextData::ImportedScript>&& scriptResourceMap)
{
tryInstallContextData({ jobDataIdentifier, registration.data(), ServiceWorkerIdentifier::generate(), script, contentSecurityPolicy, referrerPolicy, url, type, false, WTFMove(scriptResourceMap) });
}
diff --git a/Source/WebCore/workers/service/server/SWServer.h b/Source/WebCore/workers/service/server/SWServer.h
index d627277..9cda9b3 100644
--- a/Source/WebCore/workers/service/server/SWServer.h
+++ b/Source/WebCore/workers/service/server/SWServer.h
@@ -146,7 +146,7 @@
void resolveUnregistrationJob(const ServiceWorkerJobData&, const ServiceWorkerRegistrationKey&, bool unregistrationResult);
void startScriptFetch(const ServiceWorkerJobData&, FetchOptions::Cache);
- void updateWorker(Connection&, const ServiceWorkerJobDataIdentifier&, SWServerRegistration&, const URL&, const String& script, const ContentSecurityPolicyResponseHeaders&, const String& referrerPolicy, WorkerType, HashMap<URL, ServiceWorkerContextData::ImportedScript>&&);
+ void updateWorker(const ServiceWorkerJobDataIdentifier&, SWServerRegistration&, const URL&, const String& script, const ContentSecurityPolicyResponseHeaders&, const String& referrerPolicy, WorkerType, HashMap<URL, ServiceWorkerContextData::ImportedScript>&&);
void terminateWorker(SWServerWorker&);
WEBCORE_EXPORT void syncTerminateWorker(SWServerWorker&);
void fireInstallEvent(SWServerWorker&);
@@ -207,7 +207,7 @@
WEBCORE_EXPORT void whenImportIsCompleted(CompletionHandler<void()>&&);
private:
- void scriptFetchFinished(Connection&, const ServiceWorkerFetchResult&);
+ void scriptFetchFinished(const ServiceWorkerFetchResult&);
void didResolveRegistrationPromise(Connection&, const ServiceWorkerRegistrationKey&);
diff --git a/Source/WebCore/workers/service/server/SWServerJobQueue.cpp b/Source/WebCore/workers/service/server/SWServerJobQueue.cpp
index 487cc75..3a9727c 100644
--- a/Source/WebCore/workers/service/server/SWServerJobQueue.cpp
+++ b/Source/WebCore/workers/service/server/SWServerJobQueue.cpp
@@ -56,7 +56,7 @@
return !m_jobQueue.isEmpty() && firstJob().identifier() == jobDataIdentifier;
}
-void SWServerJobQueue::scriptFetchFinished(SWServer::Connection& connection, const ServiceWorkerFetchResult& result)
+void SWServerJobQueue::scriptFetchFinished(const ServiceWorkerFetchResult& result)
{
if (!isCurrentlyProcessingJob(result.jobDataIdentifier))
return;
@@ -101,7 +101,7 @@
// FIXME: Update all the imported scripts as per spec. For now, we just do as if there is none.
// FIXME: Support the proper worker type (classic vs module)
- m_server.updateWorker(connection, job.identifier(), *registration, job.scriptURL, result.script, result.contentSecurityPolicy, result.referrerPolicy, WorkerType::Classic, { });
+ m_server.updateWorker(job.identifier(), *registration, job.scriptURL, result.script, result.contentSecurityPolicy, result.referrerPolicy, WorkerType::Classic, { });
}
// https://w3c.github.io/ServiceWorker/#update-algorithm
diff --git a/Source/WebCore/workers/service/server/SWServerJobQueue.h b/Source/WebCore/workers/service/server/SWServerJobQueue.h
index 0a9777e..6c0434e 100644
--- a/Source/WebCore/workers/service/server/SWServerJobQueue.h
+++ b/Source/WebCore/workers/service/server/SWServerJobQueue.h
@@ -50,7 +50,7 @@
void runNextJob();
- void scriptFetchFinished(SWServer::Connection&, const ServiceWorkerFetchResult&);
+ void scriptFetchFinished(const ServiceWorkerFetchResult&);
void scriptContextFailedToStart(const ServiceWorkerJobDataIdentifier&, ServiceWorkerIdentifier, const String& message);
void scriptContextStarted(const ServiceWorkerJobDataIdentifier&, ServiceWorkerIdentifier);
void didFinishInstall(const ServiceWorkerJobDataIdentifier&, SWServerWorker&, bool wasSuccessful);
