Bug 1231213 - Add OptionalServiceWorkerData to RemoteWorkerData. r=asuth

Differential Revision: https://phabricator.services.mozilla.com/D26167

dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh

@@ -3,16 +3,37 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include ClientIPCTypes;
+include IPCServiceWorkerDescriptor;
+include IPCServiceWorkerRegistrationDescriptor;
 include PBackgroundSharedTypes;
 include URIParams;
 include DOMTypes;
 
+using struct IPC::Permission from "mozilla/net/NeckoMessageUtils.h";
 using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 using mozilla::StorageAccess from "mozilla/dom/ClientIPCUtils.h";
 
 namespace mozilla {
 namespace dom {
 
+struct KeyAndPermissions {
+  nsCString key;
+  Permission[] permissions;
+};
+
+struct ServiceWorkerData {
+  KeyAndPermissions[] permissionsByKey;
+  IPCServiceWorkerDescriptor descriptor;
+  IPCServiceWorkerRegistrationDescriptor registrationDescriptor;
+  nsString cacheName;
+  uint32_t loadFlags;
+};
+
+union OptionalServiceWorkerData {
+  void_t;
+  ServiceWorkerData;
+};
+
 struct RemoteWorkerData
 {
   // This should only be used for devtools.
@@ -46,6 +67,7 @@ struct RemoteWorkerData
   StorageAccess storageAccess;
 
   bool isSharedWorker;
+  OptionalServiceWorkerData serviceWorkerData;
 };
 
 // ErrorData/ErrorDataNote correspond to WorkerErrorReport/WorkerErrorNote

dom/workers/sharedworkers/SharedWorker.cpp

@@ -195,7 +195,7 @@ already_AddRefed<SharedWorker> SharedWorker::Constructor(
       nsString(aScriptURL), baseURL, resolvedScriptURL, name,
       loadingPrincipalInfo, principalInfo, storagePrincipalInfo,
       loadInfo.mDomain, isSecureContext, ipcClientInfo, loadInfo.mReferrerInfo,
-      storageAllowed, true /* sharedWorker */);
+      storageAllowed, void_t() /* OptionalServiceWorkerData */);
 
   PSharedWorkerChild* pActor = actorChild->SendPSharedWorkerConstructor(
       remoteWorkerData, loadInfo.mWindowID, portIdentifier);

netwerk/ipc/NeckoMessageUtils.h

@@ -37,6 +37,12 @@ struct Permission {
         capability(aCapability),
         expireType(aExpireType),
         expireTime(aExpireTime) {}
+
+  bool operator==(const Permission& aOther) const {
+    return aOther.origin == origin && aOther.type == type &&
+           aOther.capability == capability && aOther.expireType == expireType &&
+           aOther.expireTime == expireTime;
+  }
 };
 
 template <>