1089778 - ServiceWorkerRegistration should be keyed by scope for event dispatch and invalidation

Status: RESOLVED FIXED

(Core :: DOM: Workers, defect)

Description

[Nikhil Marathe [:nsm] (No longer reading bugmail, please needinfo?)]

When the code was adapted from ServiceWorkerContainer, ServiceWorkerRegistrations continued to be keyed on the URI of the document owning the ServiceWorkerRegistration. ServiceWorkerRegistrations should be keyed by scope instead when firing events such as updatefound and invalidating their ServiceWorker instances.

Comment 1

[Nikhil Marathe [:nsm] (No longer reading bugmail, please needinfo?)]

Attachment: ServiceWorkerRegistration is keyed by scope for event dispatch and invalidation

Comment 2

[Andrea Marchesini [:baku]]

Comment on attachment 8512136 [details] [diff] [review]
ServiceWorkerRegistration is keyed by scope for event dispatch and invalidation

Review of attachment 8512136 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/workers/ServiceWorkerManager.cpp
@@ +1785,2 @@
>    AssertIsOnMainThread();
> +  nsCString scope = NS_ConvertUTF16toUTF8(aScope);

nsAutoCString

@@ +1807,5 @@
>    ServiceWorkerRegistration* registration = static_cast<ServiceWorkerRegistration*>(aListener);
>    MOZ_ASSERT(!domainInfo->mServiceWorkerRegistrations.Contains(registration));
> +#ifdef DEBUG
> +  // Ensure a registration is only listening for it's own scope.
> +  nsString regScope;

nsAutoString

@@ +1822,3 @@
>  {
>    AssertIsOnMainThread();
> +  nsCString scope = NS_ConvertUTF16toUTF8(aScope);

nsAutoCString

@@ +1830,5 @@
>    ServiceWorkerRegistration* registration = static_cast<ServiceWorkerRegistration*>(aListener);
>    MOZ_ASSERT(domainInfo->mServiceWorkerRegistrations.Contains(registration));
> +#ifdef DEBUG
> +  // Ensure a registration is unregistering for it's own scope.
> +  nsString regScope;

nsAutoString

@@ +1852,5 @@
>    if (domainInfo) {
>      nsTObserverArray<ServiceWorkerRegistration*>::ForwardIterator it(domainInfo->mServiceWorkerRegistrations);
>      while (it.HasMore()) {
>        nsRefPtr<ServiceWorkerRegistration> target = it.GetNext();
> +      nsString regScope;

nsAutoString

@@ +1856,5 @@
> +      nsString regScope;
> +      target->GetScope(regScope);
> +      MOZ_ASSERT(!regScope.IsEmpty());
> +
> +      nsCString utf8Scope = NS_ConvertUTF16toUTF8(regScope);

NS_ConvertUTF16toUTF8 utf8Scope(regScope);

@@ +1859,5 @@
> +
> +      nsCString utf8Scope = NS_ConvertUTF16toUTF8(regScope);
> +      if (utf8Scope.Equals(aRegistration->mScope)) {
> +        nsresult rv = target->DispatchTrustedEvent(aName);
> +        if (NS_WARN_IF(NS_FAILED(rv))) {

then just do: NS_WARN_IF(NS_FAILED(rv));

@@ +2256,5 @@
>    if (domainInfo) {
>      nsTObserverArray<ServiceWorkerRegistration*>::ForwardIterator it(domainInfo->mServiceWorkerRegistrations);
>      while (it.HasMore()) {
>        nsRefPtr<ServiceWorkerRegistration> target = it.GetNext();
> +      nsString regScope;

nsAutoString

@@ +2263,3 @@
>  
> +      nsCString utf8Scope = NS_ConvertUTF16toUTF8(regScope);
> +

NS_ConvertUTF16toUTF8 utf8Scope(regScope);

Comment 3

[Nikhil Marathe [:nsm] (No longer reading bugmail, please needinfo?)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/180805605d91

Comment 4

[Nikhil Marathe [:nsm] (No longer reading bugmail, please needinfo?)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4a3216caf471

Comment 5

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/180805605d91
https://hg.mozilla.org/mozilla-central/rev/4a3216caf471