Changeset 223944 in webkit

Timestamp:

Oct 24, 2017 5:47:27 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

ServiceWorkerClientFetch should return an error that is not null in case of failure
​https://bugs.webkit.org/show_bug.cgi?id=178761

Patch by Youenn Fablet <​youenn@apple.com> on 2017-10-24
Reviewed by Geoffrey Garen.

Source/WebCore:

Covered by existing tests.

As per spec, ServiceWorkerJob should not go through Service Worker Handle Fetch
for fetching scripts.

• workers/WorkerScriptLoader.cpp:

(WebCore::WorkerScriptLoader::loadAsynchronously):

• workers/WorkerScriptLoaderClient.h:

(WebCore::WorkerScriptLoaderClient::isServiceWorkerClient const):

• workers/service/ServiceWorkerJob.h:

Source/WebKit:

• WebProcess/Storage/ServiceWorkerClientFetch.cpp:

(WebKit::ServiceWorkerClientFetch::didFail): Generating a General error.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/workers/WorkerScriptLoader.cpp (modified) (1 diff)
• WebCore/workers/WorkerScriptLoaderClient.h (modified) (1 diff)
• WebCore/workers/service/ServiceWorkerJob.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-24  Youenn Fablet  <youenn@apple.com>
+
+        ServiceWorkerClientFetch should return an error that is not null in case of failure
+        https://bugs.webkit.org/show_bug.cgi?id=178761
+
+        Reviewed by Geoffrey Garen.
+
+        Covered by existing tests.
+
+        As per spec, ServiceWorkerJob should not go through Service Worker Handle Fetch
+        for fetching scripts.
+
+        * workers/WorkerScriptLoader.cpp:
+        (WebCore::WorkerScriptLoader::loadAsynchronously):
+        * workers/WorkerScriptLoaderClient.h:
+        (WebCore::WorkerScriptLoaderClient::isServiceWorkerClient const):
+        * workers/service/ServiceWorkerJob.h:
+
 2017-10-24  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/WebCore/workers/WorkerScriptLoader.cpp

@@ -88 +88 @@
     options.sendLoadCallbacks = SendCallbacks;
     options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
-
+#if ENABLE(SERVICE_WORKER)
+    options.serviceWorkersMode = m_client->isServiceWorkerClient() ? ServiceWorkersMode::None : ServiceWorkersMode::All;
+    options.serviceWorkerIdentifier = scriptExecutionContext->selectedServiceWorkerIdentifier();
+#endif
     // During create, callbacks may happen which remove the last reference to this object.
     Ref<WorkerScriptLoader> protectedThis(*this);

trunk/Source/WebCore/workers/WorkerScriptLoaderClient.h

@@ -35 +35 @@
     virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&) = 0;
     virtual void notifyFinished() = 0;
+    virtual bool isServiceWorkerClient() const { return false; }
 
 protected:

trunk/Source/WebCore/workers/service/ServiceWorkerJob.h

@@ -70 +70 @@
     void didReceiveResponse(unsigned long identifier, const ResourceResponse&) final;
     void notifyFinished() final;
+    bool isServiceWorkerClient() const final { return true; }
+
 
     Ref<ServiceWorkerJobClient> m_client;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-24  Youenn Fablet  <youenn@apple.com>
+
+        ServiceWorkerClientFetch should return an error that is not null in case of failure
+        https://bugs.webkit.org/show_bug.cgi?id=178761
+
+        Reviewed by Geoffrey Garen.
+
+        * WebProcess/Storage/ServiceWorkerClientFetch.cpp:
+        (WebKit::ServiceWorkerClientFetch::didFail): Generating a General error.
+
 2017-10-24  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp

@@ -90 +90 @@
 {
     auto protectedThis = makeRef(*this);
-    m_loader->didFail({ });
+    m_loader->didFail({ ResourceError::Type::General });
 
     if (auto callback = WTFMove(m_callback))