Bug 1263311: Part 3 - s/nsCancelableRunnable/CancelableRunnable/g. r=froydnj

dom/base/ImageEncoder.cpp

@@ -72,7 +72,7 @@ GetBRGADataSourceSurfaceSync(already_AddRefed<layers::Image> aImage)
   return helper->GetDataSurfaceSafe();
 }
 
-class EncodingCompleteEvent : public nsCancelableRunnable
+class EncodingCompleteEvent : public CancelableRunnable
 {
   virtual ~EncodingCompleteEvent() {}
 

dom/base/WebSocket.cpp

@@ -253,7 +253,7 @@ NS_IMPL_ISUPPORTS(WebSocketImpl,
                   nsIRequest,
                   nsIEventTarget)
 
-class CallDispatchConnectionCloseEvents final : public nsCancelableRunnable
+class CallDispatchConnectionCloseEvents final : public CancelableRunnable
 {
 public:
   explicit CallDispatchConnectionCloseEvents(WebSocketImpl* aWebSocketImpl)

dom/base/nsPerformance.cpp

@@ -1136,7 +1136,7 @@ PerformanceBase::CancelNotificationObservers()
   mPendingNotificationObserversTask = false;
 }
 
-class NotifyObserversTask final : public nsCancelableRunnable
+class NotifyObserversTask final : public CancelableRunnable
 {
 public:
   explicit NotifyObserversTask(PerformanceBase* aPerformance)

dom/cache/CachePushStreamChild.cpp

@@ -17,7 +17,7 @@ namespace dom {
 namespace cache {
 
 class CachePushStreamChild::Callback final : public nsIInputStreamCallback
-                                           , public nsCancelableRunnable
+                                           , public CancelableRunnable
 {
 public:
   explicit Callback(CachePushStreamChild* aActor)
@@ -89,7 +89,7 @@ private:
 };
 
 NS_IMPL_ISUPPORTS_INHERITED(CachePushStreamChild::Callback,
-                            nsCancelableRunnable,
+                            CancelableRunnable,
                             nsIInputStreamCallback);
 
 CachePushStreamChild::CachePushStreamChild(Feature* aFeature,

dom/cache/ReadStream.cpp

@@ -117,7 +117,7 @@ private:
 // be done on the thread associated with the PBackground actor.  Must be
 // cancelable to execute on Worker threads (which can occur when the
 // ReadStream is constructed on a child process Worker thread).
-class ReadStream::Inner::NoteClosedRunnable final : public nsCancelableRunnable
+class ReadStream::Inner::NoteClosedRunnable final : public CancelableRunnable
 {
 public:
   explicit NoteClosedRunnable(ReadStream::Inner* aStream)
@@ -152,7 +152,7 @@ private:
 // it on the thread associated with the PBackground actor.  Must be
 // cancelable to execute on Worker threads (which can occur when the
 // ReadStream is constructed on a child process Worker thread).
-class ReadStream::Inner::ForgetRunnable final : public nsCancelableRunnable
+class ReadStream::Inner::ForgetRunnable final : public CancelableRunnable
 {
 public:
   explicit ForgetRunnable(ReadStream::Inner* aStream)

dom/canvas/WebGLContext.cpp

@@ -1538,7 +1538,7 @@ WebGLContext::RunContextLossTimer()
     mContextLossHandler->RunTimer();
 }
 
-class UpdateContextLossStatusTask : public nsCancelableRunnable
+class UpdateContextLossStatusTask : public CancelableRunnable
 {
     RefPtr<WebGLContext> mWebGL;
 

dom/canvas/WebGLContextLossHandler.cpp

@@ -38,7 +38,7 @@ private:
     nsCOMPtr<nsIEventTarget> mEventTarget;
 };
 
-class ContextLossWorkerRunnable final : public nsCancelableRunnable
+class ContextLossWorkerRunnable final : public CancelableRunnable
 {
 public:
     explicit ContextLossWorkerRunnable(nsIRunnable* aRunnable)

dom/crypto/WebCryptoTask.h

@@ -57,7 +57,7 @@ if (NS_FAILED(rv)) { \
   return; \
 }
 
-class WebCryptoTask : public nsCancelableRunnable,
+class WebCryptoTask : public CancelableRunnable,
                       public nsNSSShutDownObject
 {
 public:

dom/events/AsyncEventDispatcher.h

@@ -25,7 +25,7 @@ namespace mozilla {
  * the wrong time, in order to avoid resulting instability.
  */
 
-class AsyncEventDispatcher : public nsCancelableRunnable
+class AsyncEventDispatcher : public CancelableRunnable
 {
 public:
   /**

dom/html/HTMLCanvasElement.cpp

@@ -1263,7 +1263,7 @@ HTMLCanvasElement::OnVisibilityChange()
   }
 
   if (mOffscreenCanvas) {
-    class Runnable final : public nsCancelableRunnable
+    class Runnable final : public CancelableRunnable
     {
     public:
       explicit Runnable(AsyncCanvasRenderer* aRenderer)
@@ -1305,7 +1305,7 @@ void
 HTMLCanvasElement::OnMemoryPressure()
 {
   if (mOffscreenCanvas) {
-    class Runnable final : public nsCancelableRunnable
+    class Runnable final : public CancelableRunnable
     {
     public:
       explicit Runnable(AsyncCanvasRenderer* aRenderer)

dom/indexedDB/ActorsChild.cpp

@@ -2531,9 +2531,9 @@ BackgroundRequestChild::Recv__delete__(const RequestResponse& aResponse)
  ******************************************************************************/
 
 // Does not need to be threadsafe since this only runs on one thread, but
-// inheriting from nsCancelableRunnable is easy.
+// inheriting from CancelableRunnable is easy.
 class BackgroundCursorChild::DelayedActionRunnable final
-  : public nsCancelableRunnable
+  : public CancelableRunnable
 {
   using ActionFunc = void (BackgroundCursorChild::*)();
 

dom/indexedDB/IDBDatabase.cpp

@@ -67,7 +67,7 @@ const char kMemoryPressureObserverTopic[] = "memory-pressure";
 const char kWindowObserverTopic[] = "inner-window-destroyed";
 
 class CancelableRunnableWrapper final
-  : public nsCancelableRunnable
+  : public CancelableRunnable
 {
   nsCOMPtr<nsIRunnable> mRunnable;
 

dom/ipc/Blob.cpp

@@ -212,7 +212,7 @@ EventTargetIsOnCurrentThread(nsIEventTarget* aEventTarget)
 }
 
 class CancelableRunnableWrapper final
-  : public nsCancelableRunnable
+  : public CancelableRunnable
 {
   nsCOMPtr<nsIRunnable> mRunnable;
 #ifdef DEBUG
@@ -241,7 +241,7 @@ private:
   nsresult Cancel() override;
 };
 
-NS_IMPL_ISUPPORTS_INHERITED0(CancelableRunnableWrapper, nsCancelableRunnable)
+NS_IMPL_ISUPPORTS_INHERITED0(CancelableRunnableWrapper, CancelableRunnable)
 
 NS_IMETHODIMP
 CancelableRunnableWrapper::Run()

dom/messagechannel/MessagePort.cpp

@@ -48,7 +48,7 @@ using namespace mozilla::dom::workers;
 namespace mozilla {
 namespace dom {
 
-class PostMessageRunnable final : public nsCancelableRunnable
+class PostMessageRunnable final : public CancelableRunnable
 {
   friend class MessagePort;
 

dom/promise/PromiseDebugging.cpp

@@ -21,7 +21,7 @@
 namespace mozilla {
 namespace dom {
 
-class FlushRejections: public nsCancelableRunnable
+class FlushRejections: public CancelableRunnable
 {
 public:
   static void Init() {

gfx/src/gfxCrashReporterUtils.cpp

@@ -83,7 +83,7 @@ public:
   }
 };
 
-class AppendAppNotesRunnable : public nsCancelableRunnable {
+class AppendAppNotesRunnable : public CancelableRunnable {
 public:
   explicit AppendAppNotesRunnable(const nsACString& aFeatureStr)
     : mFeatureString(aFeatureStr)

ipc/glue/BackgroundImpl.cpp

@@ -700,7 +700,7 @@ private:
 
 // Must be cancelable in order to dispatch on active worker threads
 class ChildImpl::AlreadyCreatedCallbackRunnable final :
-  public nsCancelableRunnable
+  public CancelableRunnable
 {
 public:
   AlreadyCreatedCallbackRunnable()

ipc/glue/MessagePump.cpp

@@ -39,7 +39,7 @@ static MessagePump::Delegate* gFirstDelegate;
 namespace mozilla {
 namespace ipc {
 
-class DoWorkRunnable final : public nsCancelableRunnable,
+class DoWorkRunnable final : public CancelableRunnable,
                              public nsITimerCallback
 {
 public:
@@ -209,7 +209,7 @@ MessagePump::DoDelayedWork(base::MessagePump::Delegate* aDelegate)
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED(DoWorkRunnable, nsCancelableRunnable,
+NS_IMPL_ISUPPORTS_INHERITED(DoWorkRunnable, CancelableRunnable,
 			    nsITimerCallback)
 
 NS_IMETHODIMP

netwerk/protocol/websocket/WebSocketChannel.cpp

@@ -691,7 +691,7 @@ NS_IMPL_ISUPPORTS(CallOnServerClose, nsIRunnable)
 // CallAcknowledge
 //-----------------------------------------------------------------------------
 
-class CallAcknowledge final : public nsCancelableRunnable
+class CallAcknowledge final : public CancelableRunnable
 {
 public:
   CallAcknowledge(WebSocketChannel* aChannel,

xpcom/base/DebuggerOnGCRunnable.h

@@ -15,7 +15,7 @@
 namespace mozilla {
 
 // Runnable to fire the SpiderMonkey Debugger API's onGarbageCollection hook.
-class DebuggerOnGCRunnable : public nsCancelableRunnable
+class DebuggerOnGCRunnable : public CancelableRunnable
 {
   JS::dbg::GarbageCollectionEvent::Ptr mGCData;
 

xpcom/base/nsCycleCollector.cpp

@@ -1492,7 +1492,7 @@ struct CCGraphDescriber : public LinkedListElement<CCGraphDescriber>
   Type mType;
 };
 
-class LogStringMessageAsync : public nsCancelableRunnable
+class LogStringMessageAsync : public CancelableRunnable
 {
 public:
   explicit LogStringMessageAsync(const nsAString& aMsg) : mMsg(aMsg)

xpcom/glue/nsThreadUtils.cpp

@@ -41,11 +41,11 @@ nsRunnable::Run()
   return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED(nsCancelableRunnable, nsRunnable,
+NS_IMPL_ISUPPORTS_INHERITED(CancelableRunnable, nsRunnable,
                             nsICancelableRunnable)
 
 nsresult
-nsCancelableRunnable::Cancel()
+CancelableRunnable::Cancel()
 {
   // Do nothing
   return NS_OK;

xpcom/glue/nsThreadUtils.h

@@ -233,7 +233,7 @@ protected:
 };
 
 // This class is designed to be subclassed.
-class nsCancelableRunnable : public nsRunnable,
+class CancelableRunnable : public nsRunnable,
                              public nsICancelableRunnable
 {
 public:
@@ -241,10 +241,10 @@ public:
   // nsICancelableRunnable
   virtual nsresult Cancel() override;
 
-  nsCancelableRunnable() {}
+  CancelableRunnable() {}
 
 protected:
-  virtual ~nsCancelableRunnable() {}
+  virtual ~CancelableRunnable() {}
 };
 
 // An event that can be used to call a C++11 functions or function objects,

xpcom/io/nsStreamUtils.cpp

@@ -30,7 +30,7 @@ using namespace mozilla;
 // those can be shut down at any time, and in these cases, Cancel() is called
 // instead of Run().
 class nsInputStreamReadyEvent final
-  : public nsCancelableRunnable
+  : public CancelableRunnable
   , public nsIInputStreamCallback
 {
 public:
@@ -111,7 +111,7 @@ private:
   nsCOMPtr<nsIEventTarget>         mTarget;
 };
 
-NS_IMPL_ISUPPORTS_INHERITED(nsInputStreamReadyEvent, nsCancelableRunnable,
+NS_IMPL_ISUPPORTS_INHERITED(nsInputStreamReadyEvent, CancelableRunnable,
                             nsIInputStreamCallback)
 
 //-----------------------------------------------------------------------------
@@ -120,7 +120,7 @@ NS_IMPL_ISUPPORTS_INHERITED(nsInputStreamReadyEvent, nsCancelableRunnable,
 // those can be shut down at any time, and in these cases, Cancel() is called
 // instead of Run().
 class nsOutputStreamReadyEvent final
-  : public nsCancelableRunnable
+  : public CancelableRunnable
   , public nsIOutputStreamCallback
 {
 public:
@@ -201,7 +201,7 @@ private:
   nsCOMPtr<nsIEventTarget>          mTarget;
 };
 
-NS_IMPL_ISUPPORTS_INHERITED(nsOutputStreamReadyEvent, nsCancelableRunnable,
+NS_IMPL_ISUPPORTS_INHERITED(nsOutputStreamReadyEvent, CancelableRunnable,
                             nsIOutputStreamCallback)
 
 //-----------------------------------------------------------------------------
@@ -235,7 +235,7 @@ NS_NewOutputStreamReadyEvent(nsIOutputStreamCallback* aCallback,
 class nsAStreamCopier
   : public nsIInputStreamCallback
   , public nsIOutputStreamCallback
-  , public nsCancelableRunnable
+  , public CancelableRunnable
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
@@ -508,7 +508,7 @@ protected:
 };
 
 NS_IMPL_ISUPPORTS_INHERITED(nsAStreamCopier,
-                            nsCancelableRunnable,
+                            CancelableRunnable,
                             nsIInputStreamCallback,
                             nsIOutputStreamCallback)
 

xpcom/threads/TimerThread.cpp

@@ -134,7 +134,7 @@ public:
 // This is a nsICancelableRunnable because we can dispatch it to Workers and
 // those can be shut down at any time, and in these cases, Cancel() is called
 // instead of Run().
-class nsTimerEvent : public nsCancelableRunnable
+class nsTimerEvent : public CancelableRunnable
 {
 public:
   NS_IMETHOD Run() override;