Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (226604 => 226605)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2018-01-09 02:07:53 UTC (rev 226605)
@@ -1,3 +1,22 @@
+2018-01-08 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r226532 and r226540.
+ https://bugs.webkit.org/show_bug.cgi?id=181422
+
+ jessie says basic browsing does not seem to work (Requested by
+ alexchristensen on #webkit).
+
+ Reverted changesets:
+
+ "Add CSP support to service workers"
+ https://bugs.webkit.org/show_bug.cgi?id=181385
+ https://trac.webkit.org/changeset/226532
+
+ "SWClientConnection should not keep references to service
+ worker jobs"
+ https://bugs.webkit.org/show_bug.cgi?id=181381
+ https://trac.webkit.org/changeset/226540
+
2018-01-08 Youenn Fablet <[email protected]>
Add CSP support to service workers
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-connect.https-expected.txt (226604 => 226605)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-connect.https-expected.txt 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-connect.https-expected.txt 2018-01-09 02:07:53 UTC (rev 226605)
@@ -1,6 +1,6 @@
PASS CSP test for connect-src in ServiceWorkerGlobalScope
PASS importScripts test for connect-src
-PASS Fetch test for connect-src
-PASS Redirected fetch test for connect-src
+FAIL Fetch test for connect-src assert_unreached: unexpected rejection: assert_unreached: fetch should fail. Reached unreachable code Reached unreachable code
+FAIL Redirected fetch test for connect-src assert_unreached: unexpected rejection: assert_unreached: Redirected fetch should fail. Reached unreachable code Reached unreachable code
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-default.https-expected.txt (226604 => 226605)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-default.https-expected.txt 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-default.https-expected.txt 2018-01-09 02:07:53 UTC (rev 226605)
@@ -1,6 +1,6 @@
PASS CSP test for default-src in ServiceWorkerGlobalScope
-PASS importScripts test for default-src
-PASS Fetch test for default-src
-PASS Redirected fetch test for default-src
+FAIL importScripts test for default-src assert_true: Importing the other origins script should fail. expected true got false
+FAIL Fetch test for default-src assert_unreached: unexpected rejection: assert_unreached: fetch should fail. Reached unreachable code Reached unreachable code
+FAIL Redirected fetch test for default-src assert_unreached: unexpected rejection: assert_unreached: Redirected fetch should fail. Reached unreachable code Reached unreachable code
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-script.https-expected.txt (226604 => 226605)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-script.https-expected.txt 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/service-worker-csp-script.https-expected.txt 2018-01-09 02:07:53 UTC (rev 226605)
@@ -1,6 +1,6 @@
PASS CSP test for script-src in ServiceWorkerGlobalScope
-PASS importScripts test for script-src
+FAIL importScripts test for script-src assert_true: Importing the other origins script should fail. expected true got false
PASS Fetch test for script-src
PASS Redirected fetch test for script-src
Modified: trunk/Source/WebCore/ChangeLog (226604 => 226605)
--- trunk/Source/WebCore/ChangeLog 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/ChangeLog 2018-01-09 02:07:53 UTC (rev 226605)
@@ -1,3 +1,22 @@
+2018-01-08 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r226532 and r226540.
+ https://bugs.webkit.org/show_bug.cgi?id=181422
+
+ jessie says basic browsing does not seem to work (Requested by
+ alexchristensen on #webkit).
+
+ Reverted changesets:
+
+ "Add CSP support to service workers"
+ https://bugs.webkit.org/show_bug.cgi?id=181385
+ https://trac.webkit.org/changeset/226532
+
+ "SWClientConnection should not keep references to service
+ worker jobs"
+ https://bugs.webkit.org/show_bug.cgi?id=181381
+ https://trac.webkit.org/changeset/226540
+
2018-01-08 Wenson Hsieh <[email protected]>
[Attachment Support] Expose file name and content type of WKAttachment
Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -134,7 +134,6 @@
m_responseURL = response.url();
m_responseMIMEType = response.mimeType();
m_responseEncoding = response.textEncodingName();
- m_contentSecurityPolicy = ContentSecurityPolicyResponseHeaders { response };
if (m_client)
m_client->didReceiveResponse(identifier, response);
}
Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.h (226604 => 226605)
--- trunk/Source/WebCore/workers/WorkerScriptLoader.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -26,7 +26,6 @@
#pragma once
-#include "ContentSecurityPolicyResponseHeaders.h"
#include "ResourceError.h"
#include "ResourceRequest.h"
#include "ThreadableLoader.h"
@@ -59,7 +58,6 @@
void notifyError();
String script();
- const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy() const { return m_contentSecurityPolicy; }
const URL& url() const { return m_url; }
const URL& responseURL() const;
const String& responseMIMEType() const { return m_responseMIMEType; }
@@ -91,7 +89,6 @@
URL m_url;
URL m_responseURL;
String m_responseMIMEType;
- ContentSecurityPolicyResponseHeaders m_contentSecurityPolicy;
unsigned long m_identifier { 0 };
bool m_failed { false };
bool m_finishing { false };
Modified: trunk/Source/WebCore/workers/service/SWClientConnection.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/SWClientConnection.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/SWClientConnection.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -38,6 +38,7 @@
#include "ServiceWorkerJobData.h"
#include "ServiceWorkerRegistration.h"
#include <wtf/CrossThreadCopier.h>
+#include <wtf/Scope.h>
namespace WebCore {
@@ -45,77 +46,103 @@
SWClientConnection::~SWClientConnection() = default;
-void SWClientConnection::scheduleJob(DocumentOrWorkerIdentifier contextIdentifier, const ServiceWorkerJobData& jobData)
+void SWClientConnection::scheduleJob(ServiceWorkerJob& job)
{
ASSERT(isMainThread());
- auto addResult = m_scheduledJobSources.add(jobData.identifier().jobIdentifier, contextIdentifier);
+ auto addResult = m_scheduledJobs.add(job.identifier(), &job);
ASSERT_UNUSED(addResult, addResult.isNewEntry);
- scheduleJobInServer(jobData);
+ scheduleJobInServer(job.data());
}
-void SWClientConnection::failedFetchingScript(ServiceWorkerJobIdentifier jobIdentifier, const ServiceWorkerRegistrationKey& registrationKey, const ResourceError& error)
+void SWClientConnection::finishedFetchingScript(ServiceWorkerJob& job, const String& script)
{
ASSERT(isMainThread());
+ ASSERT(m_scheduledJobs.get(job.identifier()) == &job);
- finishFetchingScriptInServer({ { serverConnectionIdentifier(), jobIdentifier }, registrationKey, { }, { }, error });
+ finishFetchingScriptInServer({ job.data().identifier(), job.data().registrationKey(), script, { } });
}
-bool SWClientConnection::postTaskForJob(ServiceWorkerJobIdentifier jobIdentifier, IsJobComplete isJobComplete, WTF::Function<void(ServiceWorkerJob&)>&& task)
+void SWClientConnection::failedFetchingScript(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, const ServiceWorkerRegistrationKey& registrationKey, const ResourceError& error)
{
ASSERT(isMainThread());
- auto iterator = m_scheduledJobSources.find(jobIdentifier);
- if (iterator == m_scheduledJobSources.end()) {
- LOG_ERROR("Job %s was not found", jobIdentifier.loggingString().utf8().data());
- return false;
- }
- auto isPosted = ScriptExecutionContext::postTaskTo(iterator->value, [jobIdentifier, task = WTFMove(task)] (ScriptExecutionContext& context) mutable {
- if (auto* container = context.serviceWorkerContainer()) {
- if (auto* job = container->job(jobIdentifier))
- task(*job);
- }
- });
- if (isJobComplete == IsJobComplete::Yes)
- m_scheduledJobSources.remove(iterator);
- return isPosted;
+ finishFetchingScriptInServer({ jobDataIdentifier, registrationKey, { }, error });
}
-void SWClientConnection::jobRejectedInServer(ServiceWorkerJobIdentifier jobIdentifier, const ExceptionData& exceptionData)
+void SWClientConnection::jobRejectedInServer(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, const ExceptionData& exceptionData)
{
- postTaskForJob(jobIdentifier, IsJobComplete::Yes, [exceptionData = exceptionData.isolatedCopy()] (auto& job) {
- job.failedWithException(exceptionData.toException());
+ ASSERT(isMainThread());
+
+ auto job = m_scheduledJobs.take(jobDataIdentifier.jobIdentifier);
+ if (!job) {
+ LOG_ERROR("Job %s rejected from server, but was not found", jobDataIdentifier.loggingString().utf8().data());
+ return;
+ }
+
+ ScriptExecutionContext::postTaskTo(job->contextIdentifier(), [job, exceptionData = exceptionData.isolatedCopy()](ScriptExecutionContext&) {
+ job->failedWithException(exceptionData.toException());
});
}
-void SWClientConnection::registrationJobResolvedInServer(ServiceWorkerJobIdentifier jobIdentifier, ServiceWorkerRegistrationData&& registrationData, ShouldNotifyWhenResolved shouldNotifyWhenResolved)
+void SWClientConnection::registrationJobResolvedInServer(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, ServiceWorkerRegistrationData&& registrationData, ShouldNotifyWhenResolved shouldNotifyWhenResolved)
{
- bool isPosted = postTaskForJob(jobIdentifier, IsJobComplete::Yes, [registrationData = registrationData.isolatedCopy(), shouldNotifyWhenResolved] (auto& job) mutable {
- job.resolvedWithRegistration(WTFMove(registrationData), shouldNotifyWhenResolved);
+ ASSERT(isMainThread());
+
+ auto guard = WTF::makeScopeExit([this, shouldNotifyWhenResolved, registrationKey = registrationData.key] {
+ if (shouldNotifyWhenResolved == ShouldNotifyWhenResolved::Yes)
+ didResolveRegistrationPromise(registrationKey);
});
- if (!isPosted && shouldNotifyWhenResolved == ShouldNotifyWhenResolved::Yes)
- didResolveRegistrationPromise(registrationData.key);
+ auto job = m_scheduledJobs.take(jobDataIdentifier.jobIdentifier);
+ if (!job) {
+ LOG_ERROR("Job %s resolved in server, but was not found", jobDataIdentifier.loggingString().utf8().data());
+ return;
+ }
+
+ bool wasPosted = ScriptExecutionContext::postTaskTo(job->contextIdentifier(), [job, registrationData = registrationData.isolatedCopy(), shouldNotifyWhenResolved](ScriptExecutionContext&) mutable {
+ job->resolvedWithRegistration(WTFMove(registrationData), shouldNotifyWhenResolved);
+ });
+
+ if (wasPosted)
+ guard.release();
}
-void SWClientConnection::unregistrationJobResolvedInServer(ServiceWorkerJobIdentifier jobIdentifier, bool unregistrationResult)
+void SWClientConnection::unregistrationJobResolvedInServer(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, bool unregistrationResult)
{
- postTaskForJob(jobIdentifier, IsJobComplete::Yes, [unregistrationResult] (auto& job) {
- job.resolvedWithUnregistrationResult(unregistrationResult);
+ ASSERT(isMainThread());
+
+ auto job = m_scheduledJobs.take(jobDataIdentifier.jobIdentifier);
+ if (!job) {
+ LOG_ERROR("Job %s resolved in server, but was not found", jobDataIdentifier.loggingString().utf8().data());
+ return;
+ }
+
+ ScriptExecutionContext::postTaskTo(job->contextIdentifier(), [job, unregistrationResult](ScriptExecutionContext&) {
+ job->resolvedWithUnregistrationResult(unregistrationResult);
});
}
-void SWClientConnection::startScriptFetchForServer(ServiceWorkerJobIdentifier jobIdentifier, const ServiceWorkerRegistrationKey& registrationKey, FetchOptions::Cache cachePolicy)
+void SWClientConnection::startScriptFetchForServer(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, const ServiceWorkerRegistrationKey& registrationKey, FetchOptions::Cache cachePolicy)
{
- bool isPosted = postTaskForJob(jobIdentifier, IsJobComplete::No, [cachePolicy] (auto& job) {
- job.startScriptFetch(cachePolicy);
+ ASSERT(isMainThread());
+
+ auto job = m_scheduledJobs.get(jobDataIdentifier.jobIdentifier);
+ if (!job) {
+ LOG_ERROR("Job %s instructed to start fetch from server, but job was not found", jobDataIdentifier.loggingString().utf8().data());
+
+ failedFetchingScript(jobDataIdentifier, registrationKey, ResourceError { errorDomainWebKitInternal, 0, URL(), ASCIILiteral("Failed to fetch service worker script") });
+ return;
+ }
+
+ bool wasPosted = ScriptExecutionContext::postTaskTo(job->contextIdentifier(), [job, cachePolicy](ScriptExecutionContext&) {
+ job->startScriptFetch(cachePolicy);
});
- if (!isPosted)
- failedFetchingScript(jobIdentifier, registrationKey, ResourceError { errorDomainWebKitInternal, 0, { }, makeString("Failed to fetch script for service worker with scope ", registrationKey.scope().string()) });
+ if (!wasPosted)
+ failedFetchingScript(jobDataIdentifier, registrationKey, ResourceError { errorDomainWebKitInternal, 0, job->data().scriptURL, ASCIILiteral("Failed to fetch service worker script") });
}
-
void SWClientConnection::postMessageToServiceWorkerClient(DocumentIdentifier destinationContextIdentifier, Ref<SerializedScriptValue>&& message, ServiceWorkerData&& sourceData, const String& sourceOrigin)
{
ASSERT(isMainThread());
@@ -251,13 +278,10 @@
{
ASSERT(isMainThread());
- auto jobSources = WTFMove(m_scheduledJobSources);
- for (auto& keyValue : jobSources) {
- ScriptExecutionContext::postTaskTo(keyValue.value, [identifier = keyValue.key] (auto& context) {
- if (auto* container = context.serviceWorkerContainer()) {
- if (auto* job = container->job(identifier))
- job->failedWithException(Exception { TypeError, ASCIILiteral("Internal error") });
- }
+ auto jobs = WTFMove(m_scheduledJobs);
+ for (auto& job : jobs.values()) {
+ ScriptExecutionContext::postTaskTo(job->contextIdentifier(), [job](ScriptExecutionContext&) {
+ job->failedWithException(Exception { TypeError, ASCIILiteral("Internal error") });
});
}
}
Modified: trunk/Source/WebCore/workers/service/SWClientConnection.h (226604 => 226605)
--- trunk/Source/WebCore/workers/service/SWClientConnection.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/SWClientConnection.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -68,8 +68,9 @@
virtual void addServiceWorkerRegistrationInServer(ServiceWorkerRegistrationIdentifier) = 0;
virtual void removeServiceWorkerRegistrationInServer(ServiceWorkerRegistrationIdentifier) = 0;
- void scheduleJob(DocumentOrWorkerIdentifier, const ServiceWorkerJobData&);
- void failedFetchingScript(ServiceWorkerJobIdentifier, const ServiceWorkerRegistrationKey&, const ResourceError&);
+ void scheduleJob(ServiceWorkerJob&);
+ void finishedFetchingScript(ServiceWorkerJob&, const String&);
+ void failedFetchingScript(const ServiceWorkerJobDataIdentifier&, const ServiceWorkerRegistrationKey&, const ResourceError&);
virtual void didResolveRegistrationPromise(const ServiceWorkerRegistrationKey&) = 0;
@@ -82,15 +83,13 @@
virtual void registerServiceWorkerClient(const SecurityOrigin& topOrigin, const ServiceWorkerClientData&, const std::optional<ServiceWorkerIdentifier>&) = 0;
virtual void unregisterServiceWorkerClient(DocumentIdentifier) = 0;
- virtual void finishFetchingScriptInServer(const ServiceWorkerFetchResult&) = 0;
-
protected:
WEBCORE_EXPORT SWClientConnection();
- WEBCORE_EXPORT void jobRejectedInServer(ServiceWorkerJobIdentifier, const ExceptionData&);
- WEBCORE_EXPORT void registrationJobResolvedInServer(ServiceWorkerJobIdentifier, ServiceWorkerRegistrationData&&, ShouldNotifyWhenResolved);
- WEBCORE_EXPORT void unregistrationJobResolvedInServer(ServiceWorkerJobIdentifier, bool unregistrationResult);
- WEBCORE_EXPORT void startScriptFetchForServer(ServiceWorkerJobIdentifier, const ServiceWorkerRegistrationKey&, FetchOptions::Cache);
+ WEBCORE_EXPORT void jobRejectedInServer(const ServiceWorkerJobDataIdentifier&, const ExceptionData&);
+ WEBCORE_EXPORT void registrationJobResolvedInServer(const ServiceWorkerJobDataIdentifier&, ServiceWorkerRegistrationData&&, ShouldNotifyWhenResolved);
+ WEBCORE_EXPORT void unregistrationJobResolvedInServer(const ServiceWorkerJobDataIdentifier&, bool unregistrationResult);
+ WEBCORE_EXPORT void startScriptFetchForServer(const ServiceWorkerJobDataIdentifier&, const ServiceWorkerRegistrationKey&, FetchOptions::Cache);
WEBCORE_EXPORT void postMessageToServiceWorkerClient(DocumentIdentifier destinationContextIdentifier, Ref<SerializedScriptValue>&& message, ServiceWorkerData&& source, const String& sourceOrigin);
WEBCORE_EXPORT void updateRegistrationState(ServiceWorkerRegistrationIdentifier, ServiceWorkerRegistrationState, const std::optional<ServiceWorkerData>&);
WEBCORE_EXPORT void updateWorkerState(ServiceWorkerIdentifier, ServiceWorkerState);
@@ -103,11 +102,9 @@
private:
virtual void scheduleJobInServer(const ServiceWorkerJobData&) = 0;
+ virtual void finishFetchingScriptInServer(const ServiceWorkerFetchResult&) = 0;
- enum class IsJobComplete { No, Yes };
- bool postTaskForJob(ServiceWorkerJobIdentifier, IsJobComplete, WTF::Function<void(ServiceWorkerJob&)>&&);
-
- HashMap<ServiceWorkerJobIdentifier, DocumentOrWorkerIdentifier> m_scheduledJobSources;
+ HashMap<ServiceWorkerJobIdentifier, RefPtr<ServiceWorkerJob>> m_scheduledJobs;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -42,7 +42,6 @@
#include "ScriptExecutionContext.h"
#include "SecurityOrigin.h"
#include "ServiceWorker.h"
-#include "ServiceWorkerFetchResult.h"
#include "ServiceWorkerGlobalScope.h"
#include "ServiceWorkerJob.h"
#include "ServiceWorkerJobData.h"
@@ -224,12 +223,11 @@
setPendingActivity(this);
- auto jobData = job->data();
- auto result = m_jobMap.add(job->identifier(), WTFMove(job));
+ auto result = m_jobMap.add(job->identifier(), job.copyRef());
ASSERT_UNUSED(result, result.isNewEntry);
- callOnMainThread([connection = m_swConnection, contextIdentifier = this->contextIdentifier(), jobData = WTFMove(jobData)] {
- connection->scheduleJob(contextIdentifier, jobData);
+ callOnMainThread([connection = m_swConnection, job = WTFMove(job)] {
+ connection->scheduleJob(job);
});
}
@@ -460,8 +458,8 @@
auto* context = scriptExecutionContext();
if (!context) {
LOG_ERROR("ServiceWorkerContainer::jobResolvedWithRegistration called but the container's ScriptExecutionContext is gone");
- callOnMainThread([connection = m_swConnection, jobIdentifier = job.identifier(), registrationKey = job.data().registrationKey(), scriptURL = job.data().scriptURL.isolatedCopy()] {
- connection->failedFetchingScript(jobIdentifier, registrationKey, { errorDomainWebKitInternal, 0, scriptURL, ASCIILiteral("Attempt to fetch service worker script with no ScriptExecutionContext") });
+ callOnMainThread([connection = m_swConnection, job = makeRef(job)] {
+ connection->failedFetchingScript(job->data().identifier(), job->data().registrationKey(), { errorDomainWebKitInternal, 0, job->data().scriptURL, ASCIILiteral("Attempt to fetch service worker script with no ScriptExecutionContext") });
});
jobDidFinish(job);
return;
@@ -470,7 +468,7 @@
job.fetchScriptWithContext(*context, cachePolicy);
}
-void ServiceWorkerContainer::jobFinishedLoadingScript(ServiceWorkerJob& job, const String& script, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy)
+void ServiceWorkerContainer::jobFinishedLoadingScript(ServiceWorkerJob& job, const String& script)
{
#ifndef NDEBUG
ASSERT(m_creationThread.ptr() == &Thread::current());
@@ -478,8 +476,8 @@
LOG(ServiceWorker, "SeviceWorkerContainer %p finished fetching script for job %s", this, job.identifier().loggingString().utf8().data());
- callOnMainThread([connection = m_swConnection, jobDataIdentifier = job.data().identifier(), registrationKey = job.data().registrationKey(), script = script.isolatedCopy(), contentSecurityPolicy = contentSecurityPolicy.isolatedCopy()] {
- connection->finishFetchingScriptInServer({ jobDataIdentifier, registrationKey, script, contentSecurityPolicy, { } });
+ callOnMainThread([connection = m_swConnection, job = makeRef(job), script = script.isolatedCopy()] {
+ connection->finishedFetchingScript(job, script);
});
}
@@ -495,8 +493,8 @@
if (exception && job.promise())
job.promise()->reject(*exception);
- callOnMainThread([connection = m_swConnection, jobIdentifier = job.identifier(), registrationKey = job.data().registrationKey(), error = error.isolatedCopy()] {
- connection->failedFetchingScript(jobIdentifier, registrationKey, error);
+ callOnMainThread([connection = m_swConnection, job = makeRef(job), error = error.isolatedCopy()] {
+ connection->failedFetchingScript(job->data().identifier(), job->data().registrationKey(), error);
});
}
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h (226604 => 226605)
--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -75,8 +75,6 @@
void addRegistration(ServiceWorkerRegistration&);
void removeRegistration(ServiceWorkerRegistration&);
- ServiceWorkerJob* job(ServiceWorkerJobIdentifier identifier) { return m_jobMap.get(identifier); }
-
void startMessages();
void ref() final { refEventTarget(); }
@@ -91,7 +89,7 @@
void jobResolvedWithRegistration(ServiceWorkerJob&, ServiceWorkerRegistrationData&&, ShouldNotifyWhenResolved) final;
void jobResolvedWithUnregistrationResult(ServiceWorkerJob&, bool unregistrationResult) final;
void startScriptFetchForJob(ServiceWorkerJob&, FetchOptions::Cache) final;
- void jobFinishedLoadingScript(ServiceWorkerJob&, const String& script, const ContentSecurityPolicyResponseHeaders&) final;
+ void jobFinishedLoadingScript(ServiceWorkerJob&, const String&) final;
void jobFailedLoadingScript(ServiceWorkerJob&, const ResourceError&, std::optional<Exception>&&) final;
void jobDidFinish(ServiceWorkerJob&);
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContextData.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/ServiceWorkerContextData.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContextData.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -32,7 +32,7 @@
ServiceWorkerContextData ServiceWorkerContextData::isolatedCopy() const
{
- return { jobDataIdentifier, registration.isolatedCopy(), serviceWorkerIdentifier, script.isolatedCopy(), contentSecurityPolicy.isolatedCopy(), scriptURL.isolatedCopy(), workerType, loadedFromDisk };
+ return { jobDataIdentifier, registration.isolatedCopy(), serviceWorkerIdentifier, script.isolatedCopy(), scriptURL.isolatedCopy(), workerType, loadedFromDisk };
}
} // namespace WebCore
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContextData.h (226604 => 226605)
--- trunk/Source/WebCore/workers/service/ServiceWorkerContextData.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContextData.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -25,7 +25,6 @@
#pragma once
-#include "ContentSecurityPolicyResponseHeaders.h"
#include "ServiceWorkerIdentifier.h"
#include "ServiceWorkerJobDataIdentifier.h"
#include "ServiceWorkerRegistrationData.h"
@@ -41,11 +40,10 @@
ServiceWorkerRegistrationData registration;
ServiceWorkerIdentifier serviceWorkerIdentifier;
String script;
- ContentSecurityPolicyResponseHeaders contentSecurityPolicy;
URL scriptURL;
WorkerType workerType;
bool loadedFromDisk;
-
+
template<class Encoder> void encode(Encoder&) const;
template<class Decoder> static std::optional<ServiceWorkerContextData> decode(Decoder&);
@@ -55,7 +53,7 @@
template<class Encoder>
void ServiceWorkerContextData::encode(Encoder& encoder) const
{
- encoder << jobDataIdentifier << registration << serviceWorkerIdentifier << script << contentSecurityPolicy << scriptURL << workerType << loadedFromDisk;
+ encoder << jobDataIdentifier << registration << serviceWorkerIdentifier << script << scriptURL << workerType << loadedFromDisk;
}
template<class Decoder>
@@ -78,11 +76,7 @@
String script;
if (!decoder.decode(script))
return std::nullopt;
-
- ContentSecurityPolicyResponseHeaders contentSecurityPolicy;
- if (!decoder.decode(contentSecurityPolicy))
- return std::nullopt;
-
+
URL scriptURL;
if (!decoder.decode(scriptURL))
return std::nullopt;
@@ -95,7 +89,7 @@
if (!decoder.decode(loadedFromDisk))
return std::nullopt;
- return {{ WTFMove(*jobDataIdentifier), WTFMove(*registration), WTFMove(*serviceWorkerIdentifier), WTFMove(script), WTFMove(contentSecurityPolicy), WTFMove(scriptURL), workerType, loadedFromDisk }};
+ return {{ WTFMove(*jobDataIdentifier), WTFMove(*registration), WTFMove(*serviceWorkerIdentifier), WTFMove(script), WTFMove(scriptURL), workerType, loadedFromDisk}};
}
} // namespace WebCore
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerFetchResult.h (226604 => 226605)
--- trunk/Source/WebCore/workers/service/ServiceWorkerFetchResult.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerFetchResult.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -27,7 +27,6 @@
#if ENABLE(SERVICE_WORKER)
-#include "ContentSecurityPolicyResponseHeaders.h"
#include "ResourceError.h"
#include "ServiceWorkerRegistrationKey.h"
#include "ServiceWorkerTypes.h"
@@ -38,7 +37,6 @@
ServiceWorkerJobDataIdentifier jobDataIdentifier;
ServiceWorkerRegistrationKey registrationKey;
String script;
- ContentSecurityPolicyResponseHeaders contentSecurityPolicy;
ResourceError scriptError;
template<class Encoder> void encode(Encoder&) const;
@@ -48,7 +46,7 @@
template<class Encoder>
void ServiceWorkerFetchResult::encode(Encoder& encoder) const
{
- encoder << jobDataIdentifier << registrationKey << script << contentSecurityPolicy << scriptError;
+ encoder << jobDataIdentifier << registrationKey << script << scriptError;
}
template<class Decoder>
@@ -67,8 +65,6 @@
if (!decoder.decode(result.script))
return false;
- if (!decoder.decode(result.contentSecurityPolicy))
- return false;
if (!decoder.decode(result.scriptError))
return false;
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -38,13 +38,6 @@
namespace WebCore {
-Ref<ServiceWorkerGlobalScope> ServiceWorkerGlobalScope::create(const ServiceWorkerContextData& data, const URL& url, const String& identifier, const String& userAgent, bool isOnline, ServiceWorkerThread& thread, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy, bool shouldBypassMainWorldContentSecurityPolicy, Ref<SecurityOrigin>&& topOrigin, MonotonicTime timeOrigin, IDBClient::IDBConnectionProxy* connectionProxy, SocketProvider* socketProvider, PAL::SessionID sessionID)
-{
- auto scope = adoptRef(*new ServiceWorkerGlobalScope { data, url, identifier, userAgent, isOnline, thread, shouldBypassMainWorldContentSecurityPolicy, WTFMove(topOrigin), timeOrigin, connectionProxy, socketProvider, sessionID });
- scope->applyContentSecurityPolicyResponseHeaders(contentSecurityPolicy);
- return scope;
-}
-
ServiceWorkerGlobalScope::ServiceWorkerGlobalScope(const ServiceWorkerContextData& data, const URL& url, const String& identifier, const String& userAgent, bool isOnline, ServiceWorkerThread& thread, bool shouldBypassMainWorldContentSecurityPolicy, Ref<SecurityOrigin>&& topOrigin, MonotonicTime timeOrigin, IDBClient::IDBConnectionProxy* connectionProxy, SocketProvider* socketProvider, PAL::SessionID sessionID)
: WorkerGlobalScope(url, identifier, userAgent, isOnline, thread, shouldBypassMainWorldContentSecurityPolicy, WTFMove(topOrigin), timeOrigin, connectionProxy, socketProvider, sessionID)
, m_contextData(crossThreadCopy(data))
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.h (226604 => 226605)
--- trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerGlobalScope.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -43,7 +43,10 @@
class ServiceWorkerGlobalScope final : public WorkerGlobalScope {
public:
- static Ref<ServiceWorkerGlobalScope> create(const ServiceWorkerContextData&, const URL&, const String& identifier, const String& userAgent, bool isOnline, ServiceWorkerThread&, const ContentSecurityPolicyResponseHeaders&, bool shouldBypassMainWorldContentSecurityPolicy, Ref<SecurityOrigin>&& topOrigin, MonotonicTime timeOrigin, IDBClient::IDBConnectionProxy*, SocketProvider*, PAL::SessionID);
+ template<typename... Args> static Ref<ServiceWorkerGlobalScope> create(Args&&... args)
+ {
+ return adoptRef(*new ServiceWorkerGlobalScope(std::forward<Args>(args)...));
+ }
~ServiceWorkerGlobalScope();
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerJob.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/ServiceWorkerJob.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerJob.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -142,7 +142,7 @@
ASSERT(m_scriptLoader);
if (!m_scriptLoader->failed())
- m_client->jobFinishedLoadingScript(*this, m_scriptLoader->script(), m_scriptLoader->contentSecurityPolicy());
+ m_client->jobFinishedLoadingScript(*this, m_scriptLoader->script());
else {
auto& error = m_scriptLoader->error();
ASSERT(!error.isNull());
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerJobClient.h (226604 => 226605)
--- trunk/Source/WebCore/workers/service/ServiceWorkerJobClient.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerJobClient.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -32,7 +32,6 @@
namespace WebCore {
-class ContentSecurityPolicyResponseHeaders;
class Exception;
class ResourceError;
class ServiceWorkerJob;
@@ -49,7 +48,7 @@
virtual void jobResolvedWithRegistration(ServiceWorkerJob&, ServiceWorkerRegistrationData&&, ShouldNotifyWhenResolved) = 0;
virtual void jobResolvedWithUnregistrationResult(ServiceWorkerJob&, bool unregistrationResult) = 0;
virtual void startScriptFetchForJob(ServiceWorkerJob&, FetchOptions::Cache) = 0;
- virtual void jobFinishedLoadingScript(ServiceWorkerJob&, const String& script, const ContentSecurityPolicyResponseHeaders&) = 0;
+ virtual void jobFinishedLoadingScript(ServiceWorkerJob&, const String&) = 0;
virtual void jobFailedLoadingScript(ServiceWorkerJob&, const ResourceError&, std::optional<Exception>&&) = 0;
virtual SWServerConnectionIdentifier connectionIdentifier() = 0;
Modified: trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -71,7 +71,7 @@
// FIXME: Use valid runtime flags
ServiceWorkerThread::ServiceWorkerThread(const ServiceWorkerContextData& data, PAL::SessionID, String&& userAgent, WorkerLoaderProxy& loaderProxy, WorkerDebuggerProxy& debuggerProxy, IDBClient::IDBConnectionProxy* idbConnectionProxy, SocketProvider* socketProvider)
- : WorkerThread(data.scriptURL, "serviceworker:" + Inspector::IdentifiersFactory::createIdentifier(), WTFMove(userAgent), NetworkStateNotifier::singleton().onLine(), data.script, loaderProxy, debuggerProxy, DummyServiceWorkerThreadProxy::shared(), WorkerThreadStartMode::Normal, data.contentSecurityPolicy, false, SecurityOrigin::create(data.scriptURL).get(), MonotonicTime::now(), idbConnectionProxy, socketProvider, JSC::RuntimeFlags::createAllEnabled(), SessionID::defaultSessionID())
+ : WorkerThread(data.scriptURL, "serviceworker:" + Inspector::IdentifiersFactory::createIdentifier(), WTFMove(userAgent), NetworkStateNotifier::singleton().onLine(), data.script, loaderProxy, debuggerProxy, DummyServiceWorkerThreadProxy::shared(), WorkerThreadStartMode::Normal, ContentSecurityPolicyResponseHeaders { }, false, SecurityOrigin::create(data.scriptURL).get(), MonotonicTime::now(), idbConnectionProxy, socketProvider, JSC::RuntimeFlags::createAllEnabled(), SessionID::defaultSessionID())
, m_data(data.isolatedCopy())
, m_workerObjectProxy(DummyServiceWorkerThreadProxy::shared())
{
@@ -80,9 +80,9 @@
ServiceWorkerThread::~ServiceWorkerThread() = default;
-Ref<WorkerGlobalScope> ServiceWorkerThread::createWorkerGlobalScope(const URL& url, const String& identifier, const String& userAgent, bool isOnline, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy, bool shouldBypassMainWorldContentSecurityPolicy, Ref<SecurityOrigin>&& topOrigin, MonotonicTime timeOrigin, PAL::SessionID sessionID)
+Ref<WorkerGlobalScope> ServiceWorkerThread::createWorkerGlobalScope(const URL& url, const String& identifier, const String& userAgent, bool isOnline, const ContentSecurityPolicyResponseHeaders&, bool shouldBypassMainWorldContentSecurityPolicy, Ref<SecurityOrigin>&& topOrigin, MonotonicTime timeOrigin, PAL::SessionID sessionID)
{
- return ServiceWorkerGlobalScope::create(m_data, url, identifier, userAgent, isOnline, *this, contentSecurityPolicy, shouldBypassMainWorldContentSecurityPolicy, WTFMove(topOrigin), timeOrigin, idbConnectionProxy(), socketProvider(), sessionID);
+ return ServiceWorkerGlobalScope::create(m_data, url, identifier, userAgent, isOnline, *this, shouldBypassMainWorldContentSecurityPolicy, WTFMove(topOrigin), timeOrigin, idbConnectionProxy(), socketProvider(), sessionID);
}
void ServiceWorkerThread::runEventLoop()
Modified: trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/server/RegistrationDatabase.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -40,15 +40,12 @@
#include <wtf/MainThread.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/Scope.h>
-#include <wtf/persistence/PersistentCoders.h>
-#include <wtf/persistence/PersistentDecoder.h>
-#include <wtf/persistence/PersistentEncoder.h>
namespace WebCore {
static const String v1RecordsTableSchema(const String& tableName)
{
- return makeString("CREATE TABLE ", tableName, " (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, origin TEXT NOT NULL ON CONFLICT FAIL, scopeURL TEXT NOT NULL ON CONFLICT FAIL, topOrigin TEXT NOT NULL ON CONFLICT FAIL, lastUpdateCheckTime DOUBLE NOT NULL ON CONFLICT FAIL, updateViaCache TEXT NOT NULL ON CONFLICT FAIL, scriptURL TEXT NOT NULL ON CONFLICT FAIL, script TEXT NOT NULL ON CONFLICT FAIL, workerType TEXT NOT NULL ON CONFLICT FAIL, contentSecurityPolicy BLOB NOT NULL ON CONFLICT FAIL)");
+ return makeString("CREATE TABLE ", tableName, " (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, origin TEXT NOT NULL ON CONFLICT FAIL, scopeURL TEXT NOT NULL ON CONFLICT FAIL, topOrigin TEXT NOT NULL ON CONFLICT FAIL, lastUpdateCheckTime DOUBLE NOT NULL ON CONFLICT FAIL, updateViaCache TEXT NOT NULL ON CONFLICT FAIL, scriptURL TEXT NOT NULL ON CONFLICT FAIL, script TEXT NOT NULL ON CONFLICT FAIL, workerType TEXT NOT NULL ON CONFLICT FAIL)");
}
static const String v1RecordsTableSchema()
@@ -121,7 +118,7 @@
errorMessage = importRecords();
if (!errorMessage.isNull())
return;
-
+
scopeExit.release();
}
@@ -261,7 +258,7 @@
SQLiteTransaction transaction(*m_database);
transaction.begin();
- SQLiteStatement sql(*m_database, ASCIILiteral("INSERT INTO Records VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
+ SQLiteStatement sql(*m_database, ASCIILiteral("INSERT INTO Records VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"));
if (sql.prepare() != SQLITE_OK) {
RELEASE_LOG_ERROR(ServiceWorker, "Failed to prepare statement to store registration data into records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
return;
@@ -280,9 +277,6 @@
continue;
}
- WTF::Persistence::Encoder encoder;
- data.contentSecurityPolicy.encode(encoder);
-
if (sql.bindText(1, data.registration.key.toDatabaseKey()) != SQLITE_OK
|| sql.bindText(2, data.registration.scopeURL.protocolHostAndPort()) != SQLITE_OK
|| sql.bindText(3, data.registration.scopeURL.path()) != SQLITE_OK
@@ -292,7 +286,6 @@
|| sql.bindText(7, data.scriptURL.string()) != SQLITE_OK
|| sql.bindText(8, data.script) != SQLITE_OK
|| sql.bindText(9, workerTypeToString(data.workerType)) != SQLITE_OK
- || sql.bindBlob(10, encoder.buffer(), encoder.bufferSize()) != SQLITE_OK
|| sql.step() != SQLITE_DONE) {
RELEASE_LOG_ERROR(ServiceWorker, "Failed to store registration data into records table (%i) - %s", m_database->lastError(), m_database->lastErrorMsg());
return;
@@ -325,13 +318,6 @@
auto script = sql.getColumnText(7);
auto workerType = stringToWorkerType(sql.getColumnText(8));
- Vector<uint8_t> contentSecurityPolicyData;
- sql.getColumnBlobAsVector(9, contentSecurityPolicyData);
- WTF::Persistence::Decoder decoder(contentSecurityPolicyData.data(), contentSecurityPolicyData.size());
- ContentSecurityPolicyResponseHeaders contentSecurityPolicy;
- if (contentSecurityPolicyData.size() && !ContentSecurityPolicyResponseHeaders::decode(decoder, contentSecurityPolicy))
- continue;
-
// Validate the input for this registration.
// If any part of this input is invalid, let's skip this registration.
// FIXME: Should we return an error skipping *all* registrations?
@@ -342,7 +328,7 @@
auto registrationIdentifier = generateObjectIdentifier<ServiceWorkerRegistrationIdentifierType>();
auto serviceWorkerData = ServiceWorkerData { workerIdentifier, scriptURL, ServiceWorkerState::Activated, *workerType, registrationIdentifier };
auto registration = ServiceWorkerRegistrationData { WTFMove(*key), registrationIdentifier, URL(originURL, scopePath), *updateViaCache, lastUpdateCheckTime, std::nullopt, std::nullopt, WTFMove(serviceWorkerData) };
- auto contextData = ServiceWorkerContextData { std::nullopt, WTFMove(registration), workerIdentifier, WTFMove(script), WTFMove(contentSecurityPolicy), WTFMove(scriptURL), *workerType, true };
+ auto contextData = ServiceWorkerContextData { std::nullopt, WTFMove(registration), workerIdentifier, WTFMove(script), WTFMove(scriptURL), *workerType, true };
postTaskReply(createCrossThreadTask(*this, &RegistrationDatabase::addRegistrationToStore, WTFMove(contextData)));
}
Modified: trunk/Source/WebCore/workers/service/server/SWServer.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/server/SWServer.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/server/SWServer.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -273,7 +273,7 @@
if (!connection)
return;
- connection->rejectJobInClient(jobData.identifier().jobIdentifier, exceptionData);
+ connection->rejectJobInClient(jobData.identifier(), exceptionData);
}
void SWServer::resolveRegistrationJob(const ServiceWorkerJobData& jobData, const ServiceWorkerRegistrationData& registrationData, ShouldNotifyWhenResolved shouldNotifyWhenResolved)
@@ -283,7 +283,7 @@
if (!connection)
return;
- connection->resolveRegistrationJobInClient(jobData.identifier().jobIdentifier, registrationData, shouldNotifyWhenResolved);
+ connection->resolveRegistrationJobInClient(jobData.identifier(), registrationData, shouldNotifyWhenResolved);
}
void SWServer::resolveUnregistrationJob(const ServiceWorkerJobData& jobData, const ServiceWorkerRegistrationKey& registrationKey, bool unregistrationResult)
@@ -292,7 +292,7 @@
if (!connection)
return;
- connection->resolveUnregistrationJobInClient(jobData.identifier().jobIdentifier, registrationKey, unregistrationResult);
+ connection->resolveUnregistrationJobInClient(jobData.identifier(), registrationKey, unregistrationResult);
}
void SWServer::startScriptFetch(const ServiceWorkerJobData& jobData, FetchOptions::Cache cachePolicy)
@@ -302,7 +302,7 @@
if (!connection)
return;
- connection->startScriptFetchInClient(jobData.identifier().jobIdentifier, jobData.registrationKey(), cachePolicy);
+ connection->startScriptFetchInClient(jobData.identifier(), jobData.registrationKey(), cachePolicy);
}
void SWServer::scriptFetchFinished(Connection& connection, const ServiceWorkerFetchResult& result)
@@ -431,10 +431,10 @@
registration->removeClientServiceWorkerRegistration(connection.identifier());
}
-void SWServer::updateWorker(Connection&, const ServiceWorkerJobDataIdentifier& jobDataIdentifier, SWServerRegistration& registration, const URL& url, const String& script, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy, WorkerType type)
+void SWServer::updateWorker(Connection&, const ServiceWorkerJobDataIdentifier& jobDataIdentifier, SWServerRegistration& registration, const URL& url, const String& script, WorkerType type)
{
registration.setLastUpdateTime(WallTime::now());
- tryInstallContextData({ jobDataIdentifier, registration.data(), generateObjectIdentifier<ServiceWorkerIdentifierType>(), script, contentSecurityPolicy, url, type, false });
+ tryInstallContextData({ jobDataIdentifier, registration.data(), generateObjectIdentifier<ServiceWorkerIdentifierType>(), script, url, type, false });
}
void SWServer::tryInstallContextData(ServiceWorkerContextData&& data)
@@ -478,7 +478,7 @@
auto* registration = m_registrations.get(data.registration.key);
RELEASE_ASSERT(registration);
- auto worker = SWServerWorker::create(*this, *registration, connection->identifier(), data.scriptURL, data.script, data.contentSecurityPolicy, data.workerType, data.serviceWorkerIdentifier);
+ auto worker = SWServerWorker::create(*this, *registration, connection->identifier(), data.scriptURL, data.script, data.workerType, data.serviceWorkerIdentifier);
// We don't immediately launch all workers that were just read in from disk,
// as it is unlikely they will be needed immediately.
Modified: trunk/Source/WebCore/workers/service/server/SWServer.h (226604 => 226605)
--- trunk/Source/WebCore/workers/service/server/SWServer.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/server/SWServer.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -103,10 +103,10 @@
private:
// Messages to the client WebProcess
- virtual void rejectJobInClient(ServiceWorkerJobIdentifier, const ExceptionData&) = 0;
- virtual void resolveRegistrationJobInClient(ServiceWorkerJobIdentifier, const ServiceWorkerRegistrationData&, ShouldNotifyWhenResolved) = 0;
- virtual void resolveUnregistrationJobInClient(ServiceWorkerJobIdentifier, const ServiceWorkerRegistrationKey&, bool registrationResult) = 0;
- virtual void startScriptFetchInClient(ServiceWorkerJobIdentifier, const ServiceWorkerRegistrationKey&, FetchOptions::Cache) = 0;
+ virtual void rejectJobInClient(const ServiceWorkerJobDataIdentifier&, const ExceptionData&) = 0;
+ virtual void resolveRegistrationJobInClient(const ServiceWorkerJobDataIdentifier&, const ServiceWorkerRegistrationData&, ShouldNotifyWhenResolved) = 0;
+ virtual void resolveUnregistrationJobInClient(const ServiceWorkerJobDataIdentifier&, const ServiceWorkerRegistrationKey&, bool registrationResult) = 0;
+ virtual void startScriptFetchInClient(const ServiceWorkerJobDataIdentifier&, const ServiceWorkerRegistrationKey&, FetchOptions::Cache) = 0;
struct RegistrationReadyRequest {
SecurityOriginData topOrigin;
@@ -140,7 +140,7 @@
void postTask(CrossThreadTask&&);
void postTaskReply(CrossThreadTask&&);
- void updateWorker(Connection&, const ServiceWorkerJobDataIdentifier&, SWServerRegistration&, const URL&, const String& script, const ContentSecurityPolicyResponseHeaders&, WorkerType);
+ void updateWorker(Connection&, const ServiceWorkerJobDataIdentifier&, SWServerRegistration&, const URL&, const String& script, WorkerType);
void terminateWorker(SWServerWorker&);
void syncTerminateWorker(SWServerWorker&);
void fireInstallEvent(SWServerWorker&);
Modified: trunk/Source/WebCore/workers/service/server/SWServerJobQueue.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/server/SWServerJobQueue.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/server/SWServerJobQueue.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -96,7 +96,7 @@
}
// FIXME: Support the proper worker type (classic vs module)
- m_server.updateWorker(connection, job.identifier(), *registration, job.scriptURL, result.script, result.contentSecurityPolicy, WorkerType::Classic);
+ m_server.updateWorker(connection, job.identifier(), *registration, job.scriptURL, result.script, WorkerType::Classic);
}
// https://w3c.github.io/ServiceWorker/#update-algorithm
Modified: trunk/Source/WebCore/workers/service/server/SWServerWorker.cpp (226604 => 226605)
--- trunk/Source/WebCore/workers/service/server/SWServerWorker.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/server/SWServerWorker.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -43,14 +43,12 @@
return allWorkers().get(identifier);
}
-// FIXME: Use r-value references for script and contentSecurityPolicy
-SWServerWorker::SWServerWorker(SWServer& server, SWServerRegistration& registration, SWServerToContextConnectionIdentifier contextConnectionIdentifier, const URL& scriptURL, const String& script, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy, WorkerType type, ServiceWorkerIdentifier identifier)
+SWServerWorker::SWServerWorker(SWServer& server, SWServerRegistration& registration, SWServerToContextConnectionIdentifier contextConnectionIdentifier, const URL& scriptURL, const String& script, WorkerType type, ServiceWorkerIdentifier identifier)
: m_server(server)
, m_registrationKey(registration.key())
, m_contextConnectionIdentifier(contextConnectionIdentifier)
, m_data { identifier, scriptURL, ServiceWorkerState::Redundant, type, registration.identifier() }
, m_script(script)
- , m_contentSecurityPolicy(contentSecurityPolicy)
{
m_data.scriptURL.removeFragmentIdentifier();
@@ -71,7 +69,7 @@
auto* registration = m_server.getRegistration(m_registrationKey);
ASSERT(registration);
- return { std::nullopt, registration->data(), m_data.identifier, m_script, m_contentSecurityPolicy, m_data.scriptURL, m_data.type, false };
+ return { std::nullopt, registration->data(), m_data.identifier, m_script, m_data.scriptURL, m_data.type, false };
}
void SWServerWorker::terminate()
Modified: trunk/Source/WebCore/workers/service/server/SWServerWorker.h (226604 => 226605)
--- trunk/Source/WebCore/workers/service/server/SWServerWorker.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebCore/workers/service/server/SWServerWorker.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -104,7 +104,7 @@
const ClientOrigin& origin() const;
private:
- SWServerWorker(SWServer&, SWServerRegistration&, SWServerToContextConnectionIdentifier, const URL&, const String& script, const ContentSecurityPolicyResponseHeaders&, WorkerType, ServiceWorkerIdentifier);
+ SWServerWorker(SWServer&, SWServerRegistration&, SWServerToContextConnectionIdentifier, const URL&, const String& script, WorkerType, ServiceWorkerIdentifier);
void callWhenActivatedHandler(bool success);
@@ -113,7 +113,6 @@
SWServerToContextConnectionIdentifier m_contextConnectionIdentifier;
ServiceWorkerData m_data;
String m_script;
- ContentSecurityPolicyResponseHeaders m_contentSecurityPolicy;
bool m_hasPendingEvents { false };
State m_state { State::NotRunning };
mutable std::optional<ClientOrigin> m_origin;
Modified: trunk/Source/WebKit/ChangeLog (226604 => 226605)
--- trunk/Source/WebKit/ChangeLog 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebKit/ChangeLog 2018-01-09 02:07:53 UTC (rev 226605)
@@ -1,3 +1,22 @@
+2018-01-08 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r226532 and r226540.
+ https://bugs.webkit.org/show_bug.cgi?id=181422
+
+ jessie says basic browsing does not seem to work (Requested by
+ alexchristensen on #webkit).
+
+ Reverted changesets:
+
+ "Add CSP support to service workers"
+ https://bugs.webkit.org/show_bug.cgi?id=181385
+ https://trac.webkit.org/changeset/226532
+
+ "SWClientConnection should not keep references to service
+ worker jobs"
+ https://bugs.webkit.org/show_bug.cgi?id=181381
+ https://trac.webkit.org/changeset/226540
+
2018-01-08 Wenson Hsieh <[email protected]>
[Attachment Support] Expose file name and content type of WKAttachment
Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (226604 => 226605)
--- trunk/Source/WebKit/Scripts/webkit/messages.py 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py 2018-01-09 02:07:53 UTC (rev 226605)
@@ -186,7 +186,6 @@
no_forward_declaration_types = frozenset([
'WebCore::DocumentIdentifier',
'WebCore::ServiceWorkerIdentifier',
- 'WebCore::ServiceWorkerJobIdentifier',
'WebCore::ServiceWorkerOrClientData',
'WebCore::ServiceWorkerOrClientIdentifier',
'WebCore::ServiceWorkerRegistrationIdentifier',
@@ -388,7 +387,6 @@
'WebCore::PolicyAction': ['<WebCore/FrameLoaderTypes.h>'],
'WebCore::RecentSearch': ['<WebCore/SearchPopupMenu.h>'],
'WebCore::SWServerConnectionIdentifier': ['<WebCore/ServiceWorkerTypes.h>'],
- 'WebCore::ServiceWorkerJobIdentifier': ['<WebCore/ServiceWorkerTypes.h>'],
'WebCore::ServiceWorkerOrClientData': ['<WebCore/ServiceWorkerTypes.h>', '<WebCore/ServiceWorkerClientData.h>', '<WebCore/ServiceWorkerData.h>'],
'WebCore::ServiceWorkerOrClientIdentifier': ['<WebCore/ServiceWorkerTypes.h>', '<WebCore/ServiceWorkerClientIdentifier.h>'],
'WebCore::ServiceWorkerRegistrationIdentifier': ['<WebCore/ServiceWorkerTypes.h>'],
Modified: trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp (226604 => 226605)
--- trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp 2018-01-09 02:07:53 UTC (rev 226605)
@@ -76,24 +76,24 @@
notImplemented();
}
-void WebSWServerConnection::rejectJobInClient(ServiceWorkerJobIdentifier jobIdentifier, const ExceptionData& exceptionData)
+void WebSWServerConnection::rejectJobInClient(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, const ExceptionData& exceptionData)
{
- send(Messages::WebSWClientConnection::JobRejectedInServer(jobIdentifier, exceptionData));
+ send(Messages::WebSWClientConnection::JobRejectedInServer(jobDataIdentifier, exceptionData));
}
-void WebSWServerConnection::resolveRegistrationJobInClient(ServiceWorkerJobIdentifier jobIdentifier, const ServiceWorkerRegistrationData& registrationData, ShouldNotifyWhenResolved shouldNotifyWhenResolved)
+void WebSWServerConnection::resolveRegistrationJobInClient(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, const ServiceWorkerRegistrationData& registrationData, ShouldNotifyWhenResolved shouldNotifyWhenResolved)
{
- send(Messages::WebSWClientConnection::RegistrationJobResolvedInServer(jobIdentifier, registrationData, shouldNotifyWhenResolved));
+ send(Messages::WebSWClientConnection::RegistrationJobResolvedInServer(jobDataIdentifier, registrationData, shouldNotifyWhenResolved));
}
-void WebSWServerConnection::resolveUnregistrationJobInClient(ServiceWorkerJobIdentifier jobIdentifier, const ServiceWorkerRegistrationKey& registrationKey, bool unregistrationResult)
+void WebSWServerConnection::resolveUnregistrationJobInClient(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, const ServiceWorkerRegistrationKey& registrationKey, bool unregistrationResult)
{
- send(Messages::WebSWClientConnection::UnregistrationJobResolvedInServer(jobIdentifier, unregistrationResult));
+ send(Messages::WebSWClientConnection::UnregistrationJobResolvedInServer(jobDataIdentifier, unregistrationResult));
}
-void WebSWServerConnection::startScriptFetchInClient(ServiceWorkerJobIdentifier jobIdentifier, const ServiceWorkerRegistrationKey& registrationKey, FetchOptions::Cache cachePolicy)
+void WebSWServerConnection::startScriptFetchInClient(const ServiceWorkerJobDataIdentifier& jobDataIdentifier, const ServiceWorkerRegistrationKey& registrationKey, FetchOptions::Cache cachePolicy)
{
- send(Messages::WebSWClientConnection::StartScriptFetchForServer(jobIdentifier, registrationKey, cachePolicy));
+ send(Messages::WebSWClientConnection::StartScriptFetchForServer(jobDataIdentifier, registrationKey, cachePolicy));
}
void WebSWServerConnection::updateRegistrationStateInClient(ServiceWorkerRegistrationIdentifier identifier, ServiceWorkerRegistrationState state, const std::optional<ServiceWorkerData>& serviceWorkerData)
Modified: trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.h (226604 => 226605)
--- trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.h 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.h 2018-01-09 02:07:53 UTC (rev 226605)
@@ -71,10 +71,10 @@
private:
// Implement SWServer::Connection (Messages to the client WebProcess)
- void rejectJobInClient(WebCore::ServiceWorkerJobIdentifier, const WebCore::ExceptionData&) final;
- void resolveRegistrationJobInClient(WebCore::ServiceWorkerJobIdentifier, const WebCore::ServiceWorkerRegistrationData&, WebCore::ShouldNotifyWhenResolved) final;
- void resolveUnregistrationJobInClient(WebCore::ServiceWorkerJobIdentifier, const WebCore::ServiceWorkerRegistrationKey&, bool unregistrationResult) final;
- void startScriptFetchInClient(WebCore::ServiceWorkerJobIdentifier, const WebCore::ServiceWorkerRegistrationKey&, WebCore::FetchOptions::Cache) final;
+ void rejectJobInClient(const WebCore::ServiceWorkerJobDataIdentifier&, const WebCore::ExceptionData&) final;
+ void resolveRegistrationJobInClient(const WebCore::ServiceWorkerJobDataIdentifier&, const WebCore::ServiceWorkerRegistrationData&, WebCore::ShouldNotifyWhenResolved) final;
+ void resolveUnregistrationJobInClient(const WebCore::ServiceWorkerJobDataIdentifier&, const WebCore::ServiceWorkerRegistrationKey&, bool unregistrationResult) final;
+ void startScriptFetchInClient(const WebCore::ServiceWorkerJobDataIdentifier&, const WebCore::ServiceWorkerRegistrationKey&, WebCore::FetchOptions::Cache) final;
void updateRegistrationStateInClient(WebCore::ServiceWorkerRegistrationIdentifier, WebCore::ServiceWorkerRegistrationState, const std::optional<WebCore::ServiceWorkerData>&) final;
void updateWorkerStateInClient(WebCore::ServiceWorkerIdentifier, WebCore::ServiceWorkerState) final;
void fireUpdateFoundEvent(WebCore::ServiceWorkerRegistrationIdentifier) final;
Modified: trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.messages.in (226604 => 226605)
--- trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.messages.in 2018-01-09 02:05:48 UTC (rev 226604)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.messages.in 2018-01-09 02:07:53 UTC (rev 226605)
@@ -24,10 +24,10 @@
messages -> WebSWClientConnection {
# When possible, these messages can be implemented directly by WebCore::SWServer::Connection
- JobRejectedInServer(WebCore::ServiceWorkerJobIdentifier jobDataIdentifier, struct WebCore::ExceptionData exception)
- RegistrationJobResolvedInServer(WebCore::ServiceWorkerJobIdentifier jobDataIdentifier, struct WebCore::ServiceWorkerRegistrationData registration, enum WebCore::ShouldNotifyWhenResolved shouldNotifyWhenResolved)
- UnregistrationJobResolvedInServer(WebCore::ServiceWorkerJobIdentifier jobDataIdentifier, bool unregistrationResult)
- StartScriptFetchForServer(WebCore::ServiceWorkerJobIdentifier jobDataIdentifier, WebCore::ServiceWorkerRegistrationKey registrationKey, WebCore::FetchOptions::Cache cachePolicy)
+ JobRejectedInServer(struct WebCore::ServiceWorkerJobDataIdentifier jobDataIdentifier, struct WebCore::ExceptionData exception)
+ RegistrationJobResolvedInServer(struct WebCore::ServiceWorkerJobDataIdentifier jobDataIdentifier, struct WebCore::ServiceWorkerRegistrationData registration, enum WebCore::ShouldNotifyWhenResolved shouldNotifyWhenResolved)
+ UnregistrationJobResolvedInServer(struct WebCore::ServiceWorkerJobDataIdentifier jobDataIdentifier, bool unregistrationResult)
+ StartScriptFetchForServer(struct WebCore::ServiceWorkerJobDataIdentifier jobDataIdentifier, WebCore::ServiceWorkerRegistrationKey registrationKey, WebCore::FetchOptions::Cache cachePolicy)
UpdateRegistrationState(WebCore::ServiceWorkerRegistrationIdentifier identifier, enum WebCore::ServiceWorkerRegistrationState state, std::optional<WebCore::ServiceWorkerData> serviceWorkerIdentifier)
UpdateWorkerState(WebCore::ServiceWorkerIdentifier serviceWorkerIdentifier, enum WebCore::ServiceWorkerState state)
FireUpdateFoundEvent(WebCore::ServiceWorkerRegistrationIdentifier identifier)
