author | Bobby Holley <bobbyholley@gmail.com> |
Fri, 07 Aug 2015 17:01:55 -0700 | |
changeset 257244 | 030f756097026386cce95b67b6110f51985b2ef1 |
parent 257243 | 9f162f396c26b23cf09b88ccdbc2a21bc5ae0200 |
child 257245 | f78347b683ee4be6d28adb49b94ea1335750e87d |
push id | 29210 |
push user | kwierso@gmail.com |
push date | Tue, 11 Aug 2015 22:35:38 +0000 |
treeherder | mozilla-central@7dcecc8a395d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | cpearce |
bugs | 1190495 |
milestone | 43.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
|
dom/media/TaskQueue.cpp | file | annotate | diff | comparison | revisions | |
dom/media/TaskQueue.h | file | annotate | diff | comparison | revisions |
--- a/dom/media/TaskQueue.cpp +++ b/dom/media/TaskQueue.cpp @@ -57,17 +57,17 @@ TaskQueue::DispatchLocked(already_AddRef } if (mIsShutdown) { return NS_ERROR_FAILURE; } mTasks.push(r.forget()); if (mIsRunning) { return NS_OK; } - RefPtr<nsIRunnable> runner(new Runner(this)); + nsRefPtr<nsIRunnable> runner(new Runner(this)); nsresult rv = mPool->Dispatch(runner, NS_DISPATCH_NORMAL); if (NS_FAILED(rv)) { NS_WARNING("Failed to dispatch runnable to run TaskQueue"); return rv; } mIsRunning = true; return NS_OK; @@ -140,17 +140,17 @@ TaskQueue::IsCurrentThreadIn() bool in = NS_GetCurrentThread() == mRunningThread; MOZ_ASSERT(in == (GetCurrent() == this)); return in; } nsresult TaskQueue::Runner::Run() { - RefPtr<nsIRunnable> event; + nsRefPtr<nsIRunnable> event; { MonitorAutoLock mon(mQueue->mQueueMonitor); MOZ_ASSERT(mQueue->mIsRunning); if (mQueue->mTasks.size() == 0) { mQueue->mIsRunning = false; mQueue->MaybeResolveShutdown(); mon.NotifyAll(); return NS_OK;
--- a/dom/media/TaskQueue.h +++ b/dom/media/TaskQueue.h @@ -4,17 +4,17 @@ * 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 TaskQueue_h_ #define TaskQueue_h_ #include "mozilla/Monitor.h" #include "mozilla/MozPromise.h" -#include "mozilla/RefPtr.h" +#include "mozilla/nsRefPtr.h" #include "mozilla/TaskDispatcher.h" #include "mozilla/unused.h" #include <queue> #include "mozilla/SharedThreadPool.h" #include "nsThreadUtils.h" @@ -89,17 +89,17 @@ protected: { mQueueMonitor.AssertCurrentThreadOwns(); if (mIsShutdown && !mIsRunning) { mShutdownPromise.ResolveIfExists(true, __func__); mPool = nullptr; } } - RefPtr<SharedThreadPool> mPool; + nsRefPtr<SharedThreadPool> mPool; // Monitor that protects the queue and mIsRunning; Monitor mQueueMonitor; // Queue of tasks to run. std::queue<nsCOMPtr<nsIRunnable>> mTasks; // The thread currently running the task queue. We store a reference @@ -162,15 +162,15 @@ protected: class Runner : public nsRunnable { public: explicit Runner(TaskQueue* aQueue) : mQueue(aQueue) { } NS_METHOD Run() override; private: - RefPtr<TaskQueue> mQueue; + nsRefPtr<TaskQueue> mQueue; }; }; } // namespace mozilla #endif // TaskQueue_h_