Bug 1559919 - Finish the WorkerHolder cleanup - part 8 - Get rid of WorkerHolderToken, r=asuth

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

--HG--
extra : moz-landing-system : lando

dom/workers/WorkerHolderToken.cpp

@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "WorkerHolderToken.h"
-
-#include "WorkerPrivate.h"
-
-namespace mozilla {
-namespace dom {
-
-// static
-already_AddRefed<WorkerHolderToken> WorkerHolderToken::Create(
-    WorkerPrivate* aWorkerPrivate, WorkerStatus aShutdownStatus,
-    Behavior aBehavior) {
-  MOZ_DIAGNOSTIC_ASSERT(aWorkerPrivate);
-  aWorkerPrivate->AssertIsOnWorkerThread();
-
-  RefPtr<WorkerHolderToken> workerHolder =
-      new WorkerHolderToken(aShutdownStatus, aBehavior);
-
-  if (NS_WARN_IF(!workerHolder->HoldWorker(aWorkerPrivate, aShutdownStatus))) {
-    return nullptr;
-  }
-
-  return workerHolder.forget();
-}
-
-void WorkerHolderToken::AddListener(Listener* aListener) {
-  NS_ASSERT_OWNINGTHREAD(WorkerHolderToken);
-  MOZ_ASSERT(aListener);
-  MOZ_ASSERT(!mListenerList.Contains(aListener));
-
-  mListenerList.AppendElement(aListener);
-
-  // Allow an actor to be added after we've entered the Notifying case.  We
-  // can't stop the actor creation from racing with out destruction of the
-  // other actors and we need to wait for this extra one to close as well.
-  // Signal it should destroy itself right away.
-  if (mShuttingDown) {
-    aListener->WorkerShuttingDown();
-  }
-}
-
-void WorkerHolderToken::RemoveListener(Listener* aListener) {
-  NS_ASSERT_OWNINGTHREAD(WorkerHolderToken);
-  MOZ_ASSERT(aListener);
-
-  DebugOnly<bool> removed = mListenerList.RemoveElement(aListener);
-
-  MOZ_ASSERT(removed);
-  MOZ_ASSERT(!mListenerList.Contains(aListener));
-}
-
-bool WorkerHolderToken::IsShuttingDown() const { return mShuttingDown; }
-
-WorkerPrivate* WorkerHolderToken::GetWorkerPrivate() const {
-  NS_ASSERT_OWNINGTHREAD(WorkerHolderToken);
-  return mWorkerPrivate;
-}
-
-WorkerHolderToken::WorkerHolderToken(WorkerStatus aShutdownStatus,
-                                     Behavior aBehavior)
-    : WorkerHolder("WorkerHolderToken", aBehavior),
-      mShutdownStatus(aShutdownStatus),
-      mShuttingDown(false) {}
-
-WorkerHolderToken::~WorkerHolderToken() {
-  NS_ASSERT_OWNINGTHREAD(WorkerHolderToken);
-  MOZ_ASSERT(mListenerList.IsEmpty());
-}
-
-bool WorkerHolderToken::Notify(WorkerStatus aStatus) {
-  NS_ASSERT_OWNINGTHREAD(WorkerHolderToken);
-
-  // When the service worker thread is stopped we will get Canceling,
-  // but nothing higher than that.  We must shut things down at Canceling.
-  if (aStatus < mShutdownStatus || mShuttingDown) {
-    return true;
-  }
-
-  // Start the asynchronous destruction of our actors.  These will call back
-  // into RemoveActor() once the actor is destroyed.
-  nsTObserverArray<Listener*>::ForwardIterator iter(mListenerList);
-  while (iter.HasMore()) {
-    iter.GetNext()->WorkerShuttingDown();
-  }
-
-  // Set this after calling WorkerShuttingDown() on listener list in case
-  // one callback triggers another listener to be added.
-  mShuttingDown = true;
-
-  return true;
-}
-
-}  // namespace dom
-}  // namespace mozilla

dom/workers/WorkerHolderToken.h

@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_dom_workers_WorkerHolderToken_h
-#define mozilla_dom_workers_WorkerHolderToken_h
-
-#include "nsISupportsImpl.h"
-#include "nsTObserverArray.h"
-#include "WorkerHolder.h"
-
-namespace mozilla {
-namespace dom {
-
-class WorkerPrivate;
-
-// This is a ref-counted WorkerHolder implementation.  If you wish
-// to be notified of worker shutdown beginning, then you can implement
-// the Listener interface and call AddListener().
-//
-// This is purely a convenience class to avoid requiring code to
-// extend WorkerHolder all the time.
-class WorkerHolderToken final : public WorkerHolder {
- public:
-  // Pure virtual class defining the interface for objects that
-  // wish to be notified of worker shutdown.
-  class Listener {
-   public:
-    virtual void WorkerShuttingDown() = 0;
-  };
-
-  // Attempt to create a WorkerHolderToken().  If the shutdown has already
-  // passed the given shutdown phase or fails for another reason then
-  // nullptr is returned.
-  static already_AddRefed<WorkerHolderToken> Create(
-      WorkerPrivate* aWorkerPrivate, WorkerStatus aShutdownStatus,
-      Behavior aBehavior = PreventIdleShutdownStart);
-
-  // Add a listener to the token.  Note, this does not hold a strong
-  // reference to the listener.  You must call RemoveListener() before
-  // the listener is destroyed.  This can only be called on the owning
-  // worker thread.
-  void AddListener(Listener* aListener);
-
-  // Remove a previously added listener.  This can only be called on the
-  // owning worker thread.
-  void RemoveListener(Listener* aListener);
-
-  bool IsShuttingDown() const;
-
-  WorkerPrivate* GetWorkerPrivate() const;
-
- private:
-  WorkerHolderToken(WorkerStatus aShutdownStatus, Behavior aBehavior);
-
-  ~WorkerHolderToken();
-
-  // WorkerHolder methods
-  virtual bool Notify(WorkerStatus aStatus) override;
-
-  nsTObserverArray<Listener*> mListenerList;
-  const WorkerStatus mShutdownStatus;
-  bool mShuttingDown;
-
- public:
-  NS_INLINE_DECL_REFCOUNTING(WorkerHolderToken)
-};
-
-}  // namespace dom
-}  // namespace mozilla
-
-#endif  // mozilla_dom_workers_WorkerHolderToken_h

dom/workers/moz.build

@@ -18,7 +18,6 @@ EXPORTS.mozilla.dom += [
     'WorkerDebuggerManager.h',
     'WorkerError.h',
     'WorkerHolder.h',
-    'WorkerHolderToken.h',
     'WorkerLoadInfo.h',
     'WorkerLocation.h',
     'WorkerNavigator.h',
@@ -58,7 +57,6 @@ UNIFIED_SOURCES += [
     'WorkerError.cpp',
     'WorkerEventTarget.cpp',
     'WorkerHolder.cpp',
-    'WorkerHolderToken.cpp',
     'WorkerLoadInfo.cpp',
     'WorkerLocation.cpp',
     'WorkerNavigator.cpp',