Attachment 8721387 Details for Bug 1217544

[patch] Part 2: ServiceWorkerRegistration

bug1217544.background.sync.part2.serviceworkerregistration.patch (text/plain), 9.84 KB, created by Fernando Jiménez Moreno [:ferjm]

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Jiménez Moreno [:ferjm]

Size: 9.84 KB

patch

obsolete

># HG changeset patch
># User Fernando Jimenez <ferjmoreno@gmail.com>
># Parent  43a6584da74700b755f492f9fad00ef02232adfd
>Bug 1217544 - Implement one-off BackgroundSync API. Part 2: ServiceWorkerRegistration. r=baku
>
>diff --git a/dom/sync/SyncManager.cpp b/dom/sync/SyncManager.cpp
>--- a/dom/sync/SyncManager.cpp
>+++ b/dom/sync/SyncManager.cpp
>@@ -44,24 +44,25 @@ SyncManager::CreateOnMainThread(nsIGloba
>   }
> 
>   RefPtr<SyncManager> ref = new SyncManager(aGlobal, principalInfo);
>   return ref.forget();
> }
> 
> // static
> already_AddRefed<SyncManager>
>-SyncManager::CreateOnWorker(WorkerPrivate* aWorkerPrivate)
>+SyncManager::CreateOnWorker(nsIGlobalObject* aGlobal,
>+                            WorkerPrivate* aWorkerPrivate)
> {
>   MOZ_ASSERT(aWorkerPrivate);
>   aWorkerPrivate->AssertIsOnWorkerThread();
> 
>   const PrincipalInfo& principalInfo = aWorkerPrivate->GetPrincipalInfo();
> 
>-  RefPtr<SyncManager> ref = new SyncManager(nullptr, principalInfo);
>+  RefPtr<SyncManager> ref = new SyncManager(aGlobal, principalInfo);
>   return ref.forget();
> }
> 
> SyncManager::SyncManager(nsIGlobalObject* aGlobal,
>                          const PrincipalInfo& aPrincipalInfo)
>   : mGlobal(aGlobal)
>   , mPrincipalInfo(new PrincipalInfo(aPrincipalInfo))
> {}
>diff --git a/dom/sync/SyncManager.h b/dom/sync/SyncManager.h
>--- a/dom/sync/SyncManager.h
>+++ b/dom/sync/SyncManager.h
>@@ -41,24 +41,24 @@ public:
>   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SyncManager)
> 
>   static already_AddRefed<SyncManager>
>   CreateOnMainThread(nsIGlobalObject* aGlobal,
>                      nsIPrincipal* aPrincipal,
>                      ErrorResult& aRv);
> 
>   static already_AddRefed<SyncManager>
>-  CreateOnWorker(workers::WorkerPrivate* aWorkerPrivate);
>+  CreateOnWorker(nsIGlobalObject* aGlobal,
>+                 workers::WorkerPrivate* aWorkerPrivate);
> 
>   // Binding methods.
> 
>   nsIGlobalObject*
>   GetParentObject() const
>   {
>-    // Can be nullptr on workers.
>     return mGlobal;
>   }
> 
>   JSObject*
>   WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
> 
>   static bool PrefEnabled(JSContext* aCx, JSObject* aObj);
> 
>diff --git a/dom/webidl/ServiceWorkerRegistration.webidl b/dom/webidl/ServiceWorkerRegistration.webidl
>--- a/dom/webidl/ServiceWorkerRegistration.webidl
>+++ b/dom/webidl/ServiceWorkerRegistration.webidl
>@@ -27,9 +27,11 @@ interface ServiceWorkerRegistration : Ev
>   attribute EventHandler onupdatefound;
> };
> 
> partial interface ServiceWorkerRegistration {
> #ifndef MOZ_SIMPLEPUSH
>   [Throws, Exposed=(Window,Worker), Func="nsContentUtils::PushEnabled"]
>   readonly attribute PushManager pushManager;
> #endif
>+  [Throws, Exposed=(Window,Worker)]
>+  readonly attribute SyncManager sync;
> };
>diff --git a/dom/workers/ServiceWorkerRegistration.cpp b/dom/workers/ServiceWorkerRegistration.cpp
>--- a/dom/workers/ServiceWorkerRegistration.cpp
>+++ b/dom/workers/ServiceWorkerRegistration.cpp
>@@ -27,16 +27,19 @@
> #include "Workers.h"
> #include "WorkerScope.h"
> 
> #ifndef MOZ_SIMPLEPUSH
> #include "mozilla/dom/PushManagerBinding.h"
> #include "mozilla/dom/PushManager.h"
> #endif
> 
>+#include "mozilla/dom/SyncManagerBinding.h"
>+#include "mozilla/dom/SyncManager.h"
>+
> using namespace mozilla::dom::workers;
> 
> namespace mozilla {
> namespace dom {
> 
> bool
> ServiceWorkerRegistrationVisible(JSContext* aCx, JSObject* aObj)
> {
>@@ -86,20 +89,21 @@ ServiceWorkerRegistrationBase::ServiceWo
> NS_IMPL_ADDREF_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistrationBase)
> NS_IMPL_RELEASE_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistrationBase)
> 
> NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationMainThread)
> NS_INTERFACE_MAP_END_INHERITING(ServiceWorkerRegistrationBase)
> 
> #ifndef MOZ_SIMPLEPUSH
> NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistrationBase,
>-                                   mPushManager,
>+                                   mPushManager, mSyncManager,
>                                    mInstallingWorker, mWaitingWorker, mActiveWorker);
> #else
> NS_IMPL_CYCLE_COLLECTION_INHERITED(ServiceWorkerRegistrationMainThread, ServiceWorkerRegistrationBase,
>+                                   mSyncManager,
>                                    mInstallingWorker, mWaitingWorker, mActiveWorker);
> #endif
> 
> ServiceWorkerRegistrationMainThread::ServiceWorkerRegistrationMainThread(nsPIDOMWindowInner* aWindow,
>                                                                          const nsAString& aScope)
>   : ServiceWorkerRegistrationBase(aWindow, aScope)
>   , mListeningForEvents(false)
> {
>@@ -807,16 +811,48 @@ ServiceWorkerRegistrationMainThread::Get
>   }
> 
>   RefPtr<PushManager> ret = mPushManager;
>   return ret.forget();
> 
>   #endif /* ! MOZ_SIMPLEPUSH */
> }
> 
>+SyncManager*
>+ServiceWorkerRegistrationMainThread::GetSync(ErrorResult& aRv)
>+{
>+  AssertIsOnMainThread();
>+
>+  if (!mSyncManager) {
>+    nsCOMPtr<nsIGlobalObject> globalObject = do_QueryInterface(GetOwner());
>+
>+    if (!globalObject) {
>+      aRv.Throw(NS_ERROR_FAILURE);
>+      return nullptr;
>+    }
>+
>+    nsCOMPtr<nsIDocument> document = GetOwner()->GetExtantDoc();
>+    if (!document) {
>+      aRv.Throw(NS_ERROR_FAILURE);
>+      return nullptr;
>+    }
>+
>+    nsCOMPtr<nsIPrincipal> principal = document->NodePrincipal();
>+    if (!principal) {
>+      aRv.Throw(NS_ERROR_FAILURE);
>+      return nullptr;
>+    }
>+
>+    mSyncManager = SyncManager::CreateOnMainThread(globalObject, principal,
>+                                                   aRv);
>+  }
>+
>+  return mSyncManager;
>+}
>+
> ////////////////////////////////////////////////////
> // Worker Thread implementation
> class WorkerListener final : public ServiceWorkerRegistrationListener
> {
>   // Accessed on the main thread.
>   WorkerPrivate* mWorkerPrivate;
>   nsString mScope;
>   bool mListeningForEvents;
>@@ -931,23 +967,25 @@ NS_INTERFACE_MAP_END_INHERITING(ServiceW
> // Expanded macros since we need special behaviour to release the proxy.
> NS_IMPL_CYCLE_COLLECTION_CLASS(ServiceWorkerRegistrationWorkerThread)
> 
> NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(ServiceWorkerRegistrationWorkerThread,
>                                                   ServiceWorkerRegistrationBase)
> #ifndef MOZ_SIMPLEPUSH
>   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPushManager)
> #endif
>+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSyncManager)
> NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
> 
> NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(ServiceWorkerRegistrationWorkerThread,
>                                                 ServiceWorkerRegistrationBase)
> #ifndef MOZ_SIMPLEPUSH
>   NS_IMPL_CYCLE_COLLECTION_UNLINK(mPushManager)
> #endif
>+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mSyncManager)
>   tmp->ReleaseListener(RegistrationIsGoingAway);
> NS_IMPL_CYCLE_COLLECTION_UNLINK_END
> 
> ServiceWorkerRegistrationWorkerThread::ServiceWorkerRegistrationWorkerThread(WorkerPrivate* aWorkerPrivate,
>                                                                              const nsAString& aScope)
>   : ServiceWorkerRegistrationBase(nullptr, aScope)
>   , mWorkerPrivate(aWorkerPrivate)
> {
>@@ -1248,10 +1286,21 @@ ServiceWorkerRegistrationWorkerThread::G
>   }
> 
>   RefPtr<WorkerPushManager> ret = mPushManager;
>   return ret.forget();
> 
>   #endif /* ! MOZ_SIMPLEPUSH */
> }
> 
>+SyncManager*
>+ServiceWorkerRegistrationWorkerThread::GetSync(ErrorResult& aRv)
>+{
>+  if (!mSyncManager) {
>+    mSyncManager = SyncManager::CreateOnWorker(mWorkerPrivate->GlobalScope(),
>+                                               mWorkerPrivate);
>+  }
>+
>+  return mSyncManager;
>+}
>+
> } // dom namespace
> } // mozilla namespace
>diff --git a/dom/workers/ServiceWorkerRegistration.h b/dom/workers/ServiceWorkerRegistration.h
>--- a/dom/workers/ServiceWorkerRegistration.h
>+++ b/dom/workers/ServiceWorkerRegistration.h
>@@ -17,18 +17,19 @@
> 
> class nsPIDOMWindowInner;
> 
> namespace mozilla {
> namespace dom {
> 
> class Promise;
> class PushManager;
>+class SyncManager;
>+class WorkerListener;
> class WorkerPushManager;
>-class WorkerListener;
> 
> namespace workers {
> class ServiceWorker;
> class WorkerPrivate;
> } // namespace workers
> 
> bool
> ServiceWorkerRegistrationVisible(JSContext* aCx, JSObject* aObj);
>@@ -136,16 +137,19 @@ public:
>   GetWaiting() override;
> 
>   already_AddRefed<workers::ServiceWorker>
>   GetActive() override;
> 
>   already_AddRefed<PushManager>
>   GetPushManager(ErrorResult& aRv);
> 
>+  SyncManager*
>+  GetSync(ErrorResult& aRv);
>+
>   // DOMEventTargethelper
>   void DisconnectFromOwner() override
>   {
>     StopListeningForEvents();
>     ServiceWorkerRegistrationBase::DisconnectFromOwner();
>   }
> 
>   // ServiceWorkerRegistrationListener
>@@ -186,16 +190,18 @@ private:
>   // These three may change to a new worker at any time.
>   RefPtr<workers::ServiceWorker> mInstallingWorker;
>   RefPtr<workers::ServiceWorker> mWaitingWorker;
>   RefPtr<workers::ServiceWorker> mActiveWorker;
> 
> #ifndef MOZ_SIMPLEPUSH
>   RefPtr<PushManager> mPushManager;
> #endif
>+
>+  RefPtr<SyncManager> mSyncManager;
> };
> 
> class ServiceWorkerRegistrationWorkerThread final : public ServiceWorkerRegistrationBase
>                                                   , public workers::WorkerFeature
> {
> public:
>   NS_DECL_ISUPPORTS_INHERITED
>   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ServiceWorkerRegistrationWorkerThread,
>@@ -239,16 +245,19 @@ public:
>   }
> 
>   bool
>   Notify(JSContext* aCx, workers::Status aStatus) override;
> 
>   already_AddRefed<WorkerPushManager>
>   GetPushManager(ErrorResult& aRv);
> 
>+  SyncManager*
>+  GetSync(ErrorResult& aRv);
>+
> private:
>   enum Reason
>   {
>     RegistrationIsGoingAway = 0,
>     WorkerIsGoingAway,
>   };
> 
>   ~ServiceWorkerRegistrationWorkerThread();
>@@ -260,14 +269,16 @@ private:
>   ReleaseListener(Reason aReason);
> 
>   workers::WorkerPrivate* mWorkerPrivate;
>   RefPtr<WorkerListener> mListener;
> 
> #ifndef MOZ_SIMPLEPUSH
>   RefPtr<WorkerPushManager> mPushManager;
> #endif
>+
>+  RefPtr<SyncManager> mSyncManager;
> };
> 
> } // namespace dom
> } // namespace mozilla
> 
> #endif /* mozilla_dom_ServiceWorkerRegistration_h */

Actions: View | Diff | Review

Attachments on bug 1217544: 8705632 | 8705633 | 8705634 | 8707035 | 8712697 | 8712699 | 8712744 | 8712745 | 8712746 | 8721385 | 8721387 | 8721388 | 8721389 | 8721408 | 8727182 | 8731368 | 8731371 | 8731374 | 8731377 | 8733495 | 8733497 | 8736435 | 8736438 | 8743357 | 8743359 | 8743360 | 8743362 | 8743363 | 8743364 | 8743365 | 8743366 | 8759773 | 8763785 | 8763788 | 8763790 | 8763791 | 8763794 | 8763795 | 8763796 | 8763797 | 8763799 | 8777369 | 8777370 | 8777373 | 8777386 | 8777388 | 8777390 | 8777844 | 8788555 | 8788558 | 8788560 | 8788562 | 8788567 | 8788569 | 8788571 | 8788574 | 8788575 | 8788576 | 8832151 | 8832152 | 8832153 | 8832154 | 8832155 | 8832156 | 8832157 | 8832158 | 8832159 | 8832167 | 8832450 | 8866279 | 8866280 | 9053609