Bug 1433545 P1 Add scriptURL to ServiceWorkerDescriptor. r=asuth

dom/serviceworkers/IPCServiceWorkerDescriptor.ipdlh

@@ -17,6 +17,7 @@ struct IPCServiceWorkerDescriptor
   uint64_t id;
   PrincipalInfo principalInfo;
   nsCString scope;
+  nsCString scriptURL;
   ServiceWorkerState state;
 };
 

dom/serviceworkers/ServiceWorkerDescriptor.cpp

@@ -15,6 +15,7 @@ namespace dom {
 ServiceWorkerDescriptor::ServiceWorkerDescriptor(uint64_t aId,
                                                  nsIPrincipal* aPrincipal,
                                                  const nsACString& aScope,
+                                                 const nsACString& aScriptURL,
                                                  ServiceWorkerState aState)
   : mData(MakeUnique<IPCServiceWorkerDescriptor>())
 {
@@ -23,14 +24,17 @@ ServiceWorkerDescriptor::ServiceWorkerDescriptor(uint64_t aId,
 
   mData->id() = aId;
   mData->scope() = aScope;
+  mData->scriptURL() = aScriptURL;
   mData->state() = aState;
 }
 
 ServiceWorkerDescriptor::ServiceWorkerDescriptor(uint64_t aId,
                                                  const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
                                                  const nsACString& aScope,
+                                                 const nsACString& aScriptURL,
                                                  ServiceWorkerState aState)
   : mData(MakeUnique<IPCServiceWorkerDescriptor>(aId, aPrincipalInfo,
+                                                 nsCString(aScriptURL),
                                                  nsCString(aScope), aState))
 {
 }
@@ -94,6 +98,12 @@ ServiceWorkerDescriptor::Scope() const
   return mData->scope();
 }
 
+const nsCString&
+ServiceWorkerDescriptor::ScriptURL() const
+{
+  return mData->scriptURL();
+}
+
 ServiceWorkerState
 ServiceWorkerDescriptor::State() const
 {

dom/serviceworkers/ServiceWorkerDescriptor.h

@@ -34,11 +34,13 @@ public:
   ServiceWorkerDescriptor(uint64_t aId,
                           nsIPrincipal* aPrincipal,
                           const nsACString& aScope,
+                          const nsACString& aScriptURL,
                           ServiceWorkerState aState);
 
   ServiceWorkerDescriptor(uint64_t aId,
                           const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
                           const nsACString& aScope,
+                          const nsACString& aScriptURL,
                           ServiceWorkerState aState);
 
   explicit ServiceWorkerDescriptor(const IPCServiceWorkerDescriptor& aDescriptor);
@@ -67,6 +69,9 @@ public:
   const nsCString&
   Scope() const;
 
+  const nsCString&
+  ScriptURL() const;
+
   ServiceWorkerState
   State() const;
 

dom/serviceworkers/ServiceWorkerInfo.cpp

@@ -221,7 +221,8 @@ ServiceWorkerInfo::ServiceWorkerInfo(nsIPrincipal* aPrincipal,
                                      const nsAString& aCacheName,
                                      nsLoadFlags aImportsLoadFlags)
   : mPrincipal(aPrincipal)
-  , mDescriptor(GetNextID(), aPrincipal, aScope, ServiceWorkerState::Parsed)
+  , mDescriptor(GetNextID(), aPrincipal, aScope, aScriptSpec,
+                ServiceWorkerState::Parsed)
   , mScriptSpec(aScriptSpec)
   , mCacheName(aCacheName)
   , mImportsLoadFlags(aImportsLoadFlags)

dom/serviceworkers/ServiceWorkerPrivate.cpp

@@ -1854,10 +1854,7 @@ ServiceWorkerPrivate::SpawnWorkerIfNeeded(WakeUpReason aWhy,
   rv = PrincipalToPrincipalInfo(mInfo->Principal(), &principalInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  info.mServiceWorkerDescriptor.emplace(ServiceWorkerDescriptor(mInfo->ID(),
+  info.mServiceWorkerDescriptor.emplace(mInfo->Descriptor());
-                                                                principalInfo,
-                                                                mInfo->Scope(),
-                                                                mInfo->State()));
 
   info.mLoadGroup = aLoadGroup;
   info.mLoadFailedAsyncRunnable = aLoadFailedRunnable;