Bug 1218135 - Remove FetchEvent.client; r=bzbarsky

This has been removed from the spec.  See:
w3c/ServiceWorker#723 (comment)

Author: ehsan

dom/push/test/lifetime_worker.js

@@ -7,13 +7,15 @@ onfetch = function(event) {
     return;
   }
 
-  if (!event.client) {
-    dump("ERROR: no client to post the message to!\n");
-    dump("request.url=" + event.request.url + "\n");
-    return;
-  }
-
-  event.client.postMessage({type: "fetch", state: state});
+  var currentState = state;
+  event.waitUntil(
+    clients.matchAll()
+           .then(clients => {
+             clients.forEach(client => {
+               client.postMessage({type: "fetch", state: currentState});
+             });
+           })
+  );
 
   if (event.request.url.indexOf("update") >= 0) {
     state = "update";

dom/webidl/FetchEvent.webidl

@@ -12,9 +12,6 @@
  Exposed=(ServiceWorker)]
 interface FetchEvent : ExtendableEvent {
   [SameObject] readonly attribute Request request;
-
-  // https://github.com/slightlyoff/ServiceWorker/issues/631
-  readonly attribute Client? client; // The window issuing the request.
   readonly attribute boolean isReload;
 
   [Throws]
@@ -23,6 +20,5 @@ interface FetchEvent : ExtendableEvent {
 
 dictionary FetchEventInit : EventInit {
   Request request;
-  Client client;
   boolean isReload;
 };

dom/workers/ServiceWorkerEvents.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ServiceWorkerEvents.h"
-#include "ServiceWorkerClient.h"
 
 #include "nsIHttpChannelInternal.h"
 #include "nsINetworkInterceptController.h"
@@ -72,12 +71,10 @@ FetchEvent::~FetchEvent()
 
 void
 FetchEvent::PostInit(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel,
-                     const nsACString& aScriptSpec,
-                     UniquePtr<ServiceWorkerClientInfo>&& aClientInfo)
+                     const nsACString& aScriptSpec)
 {
   mChannel = aChannel;
   mScriptSpec.Assign(aScriptSpec);
-  mClientInfo = Move(aClientInfo);
 }
 
 /*static*/ already_AddRefed<FetchEvent>
@@ -96,8 +93,6 @@ FetchEvent::Constructor(const GlobalObject& aGlobal,
       &aOptions.mRequest.Value() : nullptr;
   e->mIsReload = aOptions.mIsReload.WasPassed() ?
       aOptions.mIsReload.Value() : false;
-  e->mClient = aOptions.mClient.WasPassed() ?
-      &aOptions.mClient.Value() : nullptr;
   return e.forget();
 }
 
@@ -460,32 +455,14 @@ FetchEvent::RespondWith(Promise& aArg, ErrorResult& aRv)
   aArg.AppendNativeHandler(handler);
 }
 
-already_AddRefed<ServiceWorkerClient>
-FetchEvent::GetClient()
-{
-  if (!mClient) {
-    if (!mClientInfo) {
-      return nullptr;
-    }
-
-    WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
-    MOZ_ASSERT(worker);
-    RefPtr<nsIGlobalObject> global = worker->GlobalScope();
-
-    mClient = new ServiceWorkerClient(global, *mClientInfo);
-  }
-  RefPtr<ServiceWorkerClient> client = mClient;
-  return client.forget();
-}
-
 NS_IMPL_ADDREF_INHERITED(FetchEvent, ExtendableEvent)
 NS_IMPL_RELEASE_INHERITED(FetchEvent, ExtendableEvent)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FetchEvent)
 NS_INTERFACE_MAP_END_INHERITING(ExtendableEvent)
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(FetchEvent, ExtendableEvent,
-                                   mRequest, mClient, mPromise)
+                                   mRequest, mPromise)
 
 ExtendableEvent::ExtendableEvent(EventTarget* aOwner)
   : Event(aOwner, nullptr, nullptr)

dom/workers/ServiceWorkerEvents.h

@@ -35,8 +35,6 @@ class ResponseOrPromise;
 
 BEGIN_WORKERS_NAMESPACE
 
-class ServiceWorkerClient;
-
 class CancelChannelRunnable final : public nsRunnable
 {
   nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;
@@ -103,10 +101,8 @@ class ExtendableEvent : public Event
 class FetchEvent final : public ExtendableEvent
 {
   nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;
-  RefPtr<ServiceWorkerClient> mClient;
   RefPtr<Request> mRequest;
   nsCString mScriptSpec;
-  UniquePtr<ServiceWorkerClientInfo> mClientInfo;
   RefPtr<Promise> mPromise;
   bool mIsReload;
   bool mWaitToRespond;
@@ -125,8 +121,7 @@ class FetchEvent final : public ExtendableEvent
   }
 
   void PostInit(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel,
-                const nsACString& aScriptSpec,
-                UniquePtr<ServiceWorkerClientInfo>&& aClientInfo);
+                const nsACString& aScriptSpec);
 
   static already_AddRefed<FetchEvent>
   Constructor(const GlobalObject& aGlobal,
@@ -146,9 +141,6 @@ class FetchEvent final : public ExtendableEvent
     return mRequest;
   }
 
-  already_AddRefed<ServiceWorkerClient>
-  GetClient();
-
   bool
   IsReload() const
   {

dom/workers/ServiceWorkerPrivate.cpp

@@ -915,7 +915,6 @@ class FetchEventRunnable : public ExtendableFunctionalEventWorkerRunnable
   const nsCString mScriptSpec;
   nsTArray<nsCString> mHeaderNames;
   nsTArray<nsCString> mHeaderValues;
-  UniquePtr<ServiceWorkerClientInfo> mClientInfo;
   nsCString mSpec;
   nsCString mMethod;
   bool mIsReload;
@@ -940,7 +939,6 @@ class FetchEventRunnable : public ExtendableFunctionalEventWorkerRunnable
         aWorkerPrivate, aKeepAliveToken, aRegistration)
     , mInterceptedChannel(aChannel)
     , mScriptSpec(aScriptSpec)
-    , mClientInfo(Move(aClientInfo))
     , mIsReload(aIsReload)
     , mIsHttpChannel(false)
     , mRequestMode(RequestMode::No_cors)
@@ -1161,7 +1159,7 @@ class FetchEventRunnable : public ExtendableFunctionalEventWorkerRunnable
       return false;
     }
 
-    event->PostInit(mInterceptedChannel, mScriptSpec, Move(mClientInfo));
+    event->PostInit(mInterceptedChannel, mScriptSpec);
     event->SetTrusted(true);
 
     RefPtr<EventTarget> target = do_QueryObject(aWorkerPrivate->GlobalScope());

dom/workers/test/serviceworkers/fetch/plugin/worker.js

@@ -1,7 +1,14 @@
 self.addEventListener("fetch", function(event) {
   var resource = event.request.url.split('/').pop();
-  if (event.client) {
-    event.client.postMessage({context: event.request.context,
-                              resource: resource});
-  }
+  event.waitUntil(
+    clients.matchAll()
+           .then(clients => {
+             clients.forEach(client => {
+               if (client.url.includes("plugins.html")) {
+                 client.postMessage({context: event.request.context,
+                                     resource: resource});
+               }
+             });
+           })
+  );
 });

dom/workers/test/serviceworkers/fetch_event_client.js

@@ -173,8 +173,6 @@ support-files =
   opaque_intercept_worker.js
   notify_loaded.js
   test_request_context.js
-  fetch_event_client.js
-  sw_clients/dummy.html
   fetch/plugin/worker.js
   fetch/plugin/plugins.html
   eventsource/*
@@ -271,7 +269,6 @@ skip-if = toolkit == "android" || toolkit == "gonk"
 [test_workerUpdate.html]
 [test_workerupdatefoundevent.html]
 [test_opaque_intercept.html]
-[test_fetch_event_client_postmessage.html]
 [test_xslt.html]
 [test_escapedSlashes.html]
 [test_eventsource_intercept.html]

dom/workers/test/serviceworkers/mochitest.ini

@@ -1,9 +1,12 @@
 onfetch = function(event) {
-  if (!event.client) {
-    dump("ERROR: event doesnt have a client");
-  }
-
-  event.client.postMessage("continue");
+  event.waitUntil(
+    clients.matchAll()
+           .then(clients => {
+             clients.forEach(client => {
+               client.postMessage("continue");
+             });
+           })
+  );
 
   // never resolve
   event.respondWith(new Promise(function(res, rej) {}));