bug 1328964 address modernize-use-override and modernize-use-equals-default r=baku
authorKarl Tomlinson <karlt+@karlt.net>
Wed, 04 Apr 2018 19:36:13 +1200
changeset 412957 55823ab4098ad331e48a4caad64ea422d4e232cd
parent 412956 e90079d5f339e7515298f3c5b8ef30c6737ac3d1
child 412958 6c5c5d824c234a268b433b3167cf68cd8d9e77b4
push id33828
push userarchaeopteryx@coole-files.de
push dateThu, 12 Apr 2018 19:19:41 +0000
treeherdermozilla-central@6e22c4a726c2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1328964
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1328964 address modernize-use-override and modernize-use-equals-default r=baku clang-tidy suggestions in "part 3 - Console API exposed to worklets". MozReview-Commit-ID: Aab74PCau9m
dom/console/Console.cpp
--- a/dom/console/Console.cpp
+++ b/dom/console/Console.cpp
@@ -297,18 +297,17 @@ private:
     MOZ_ASSERT(mStatus != eInUse);
   }
 };
 
 // This base class must be extended for Worker and for Worklet.
 class ConsoleRunnable : public StructuredCloneHolderBase
 {
 public:
-  virtual
-  ~ConsoleRunnable()
+  ~ConsoleRunnable() override
   {
     // Clear the StructuredCloneHolderBase class.
     Clear();
   }
 
 protected:
   JSObject*
   CustomReadHandler(JSContext* aCx,
@@ -541,18 +540,17 @@ protected:
     : Runnable("dom::console::ConsoleWorkletRunnable")
     , mConsole(aConsole)
     , mWorkletThread(WorkletThread::Get())
   {
     WorkletThread::AssertIsOnWorkletThread();
     MOZ_ASSERT(mWorkletThread);
   }
 
-  virtual
-  ~ConsoleWorkletRunnable() = default;
+  ~ConsoleWorkletRunnable() override = default;
 
   NS_IMETHOD
   Run() override
   {
     // This runnable is dispatched to main-thread first, then it goes back to
     // worklet thread.
     if (NS_IsMainThread()) {
       RunOnMainThread();
@@ -618,22 +616,22 @@ private:
     WorkletThread::AssertIsOnWorkletThread();
     MOZ_ASSERT(aCallData);
     aCallData->AssertIsOnOwningThread();
 
     // Marking this CallData as in use.
     mCallData->mStatus = ConsoleCallData::eInUse;
   }
 
-  ~ConsoleCallDataWorkletRunnable()
+  ~ConsoleCallDataWorkletRunnable() override
   {
     MOZ_ASSERT(!mCallData);
   }
 
-  virtual void
+  void
   RunOnMainThread() override
   {
     AutoSafeJSContext cx;
 
     JSObject* sandbox =
       mConsole->GetOrCreateSandbox(cx,
                                    mWorkletThread->GetWorkletLoadInfo().Principal());
     JS::Rooted<JSObject*> global(cx, sandbox);
@@ -667,18 +665,17 @@ class ConsoleWorkerRunnable : public Wor
                             , public ConsoleRunnable
 {
 public:
   explicit ConsoleWorkerRunnable(Console* aConsole)
     : WorkerProxyToMainThreadRunnable(GetCurrentThreadWorkerPrivate())
     , mConsole(aConsole)
   {}
 
-  virtual
-  ~ConsoleWorkerRunnable() = default;
+  ~ConsoleWorkerRunnable() override = default;
 
   bool
   Dispatch(JSContext* aCx)
   {
     mWorkerPrivate->AssertIsOnWorkerThread();
 
     if (NS_WARN_IF(!PreDispatch(aCx))) {
       RunBackOnWorkerThreadForCleanup();
@@ -807,17 +804,17 @@ public:
     mWorkerPrivate->AssertIsOnWorkerThread();
     mCallData->AssertIsOnOwningThread();
 
     // Marking this CallData as in use.
     mCallData->mStatus = ConsoleCallData::eInUse;
   }
 
 private:
-  ~ConsoleCallDataWorkerRunnable()
+  ~ConsoleCallDataWorkerRunnable() override
   {
     MOZ_ASSERT(!mCallData);
   }
 
   bool
   PreDispatch(JSContext* aCx) override
   {
     return StoreConsoleData(aCx, mCallData);