diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 3a0d89f1b5..b53d036e90 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -542,7 +542,7 @@ DialogValueHolder::Get(JSContext* aCx, JS::Handle aScope, class IdleRequestExecutor final : public nsIRunnable , public nsICancelableRunnable - , public nsIIncrementalRunnable + , public nsIIdleRunnable { public: explicit IdleRequestExecutor(nsGlobalWindow* aWindow) @@ -586,7 +586,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(IdleRequestExecutor) NS_INTERFACE_MAP_ENTRY(nsIRunnable) NS_INTERFACE_MAP_ENTRY(nsICancelableRunnable) - NS_INTERFACE_MAP_ENTRY(nsIIncrementalRunnable) + NS_INTERFACE_MAP_ENTRY(nsIIdleRunnable) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIRunnable) NS_INTERFACE_MAP_END diff --git a/xpcom/glue/nsThreadUtils.cpp b/xpcom/glue/nsThreadUtils.cpp index 9128509152..c24b06736b 100644 --- a/xpcom/glue/nsThreadUtils.cpp +++ b/xpcom/glue/nsThreadUtils.cpp @@ -60,11 +60,11 @@ CancelableRunnable::Cancel() return NS_OK; } -NS_IMPL_ISUPPORTS_INHERITED(IncrementalRunnable, CancelableRunnable, - nsIIncrementalRunnable) +NS_IMPL_ISUPPORTS_INHERITED(IdleRunnable, CancelableRunnable, + nsIIdleRunnable) void -IncrementalRunnable::SetDeadline(TimeStamp aDeadline) +IdleRunnable::SetDeadline(TimeStamp aDeadline) { // Do nothing } diff --git a/xpcom/glue/nsThreadUtils.h b/xpcom/glue/nsThreadUtils.h index 01270c1e94..33475fe8fe 100644 --- a/xpcom/glue/nsThreadUtils.h +++ b/xpcom/glue/nsThreadUtils.h @@ -14,7 +14,7 @@ #include "nsIRunnable.h" #include "nsICancelableRunnable.h" #include "nsIIdlePeriod.h" -#include "nsIIncrementalRunnable.h" +#include "nsIIdleRunnable.h" #include "nsStringGlue.h" #include "nsCOMPtr.h" #include "nsAutoPtr.h" @@ -285,22 +285,22 @@ private: }; // This class is designed to be subclassed. -class IncrementalRunnable : public CancelableRunnable, - public nsIIncrementalRunnable +class IdleRunnable : public CancelableRunnable, + public nsIIdleRunnable { public: NS_DECL_ISUPPORTS_INHERITED - // nsIIncrementalRunnable + // nsIIdleRunnable virtual void SetDeadline(TimeStamp aDeadline) override; - IncrementalRunnable() {} + IdleRunnable() {} protected: - virtual ~IncrementalRunnable() {} + virtual ~IdleRunnable() {} private: - IncrementalRunnable(const IncrementalRunnable&) = delete; - IncrementalRunnable& operator=(const IncrementalRunnable&) = delete; - IncrementalRunnable& operator=(const IncrementalRunnable&&) = delete; + IdleRunnable(const IdleRunnable&) = delete; + IdleRunnable& operator=(const IdleRunnable&) = delete; + IdleRunnable& operator=(const IdleRunnable&&) = delete; }; namespace detail { diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build index b09608eba6..b1a91fbf82 100644 --- a/xpcom/threads/moz.build +++ b/xpcom/threads/moz.build @@ -22,7 +22,7 @@ XPIDL_MODULE = 'xpcom_threads' EXPORTS += [ 'nsEventQueue.h', 'nsICancelableRunnable.h', - 'nsIIncrementalRunnable.h', + 'nsIIdleRunnable.h', 'nsMemoryPressure.h', 'nsProcess.h', 'nsThread.h', diff --git a/xpcom/threads/nsIIncrementalRunnable.h b/xpcom/threads/nsIIdleRunnable.h similarity index 62% rename from xpcom/threads/nsIIncrementalRunnable.h rename to xpcom/threads/nsIIdleRunnable.h index 206d189ce0..7263604eba 100644 --- a/xpcom/threads/nsIIncrementalRunnable.h +++ b/xpcom/threads/nsIIdleRunnable.h @@ -3,13 +3,13 @@ * 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 nsIIncrementalRunnable_h__ -#define nsIIncrementalRunnable_h__ +#ifndef nsIIdleRunnable_h__ +#define nsIIdleRunnable_h__ #include "nsISupports.h" #include "mozilla/TimeStamp.h" -#define NS_IINCREMENTALRUNNABLE_IID \ +#define NS_IIDLERUNNABLE_IID \ { 0x688be92e, 0x7ade, 0x4fdc, \ { 0x9d, 0x83, 0x74, 0xcb, 0xef, 0xf4, 0xa5, 0x2c } } @@ -18,10 +18,10 @@ * A task interface for tasks that can schedule their work to happen * in increments bounded by a deadline. */ -class nsIIncrementalRunnable : public nsISupports +class nsIIdleRunnable : public nsISupports { public: - NS_DECLARE_STATIC_IID_ACCESSOR(NS_IINCREMENTALRUNNABLE_IID) + NS_DECLARE_STATIC_IID_ACCESSOR(NS_IIDLERUNNABLE_IID) /** * Notify the task of a point in time in the future when the task @@ -30,11 +30,11 @@ public: virtual void SetDeadline(mozilla::TimeStamp aDeadline) = 0; protected: - nsIIncrementalRunnable() { } - virtual ~nsIIncrementalRunnable() {} + nsIIdleRunnable() { } + virtual ~nsIIdleRunnable() {} }; -NS_DEFINE_STATIC_IID_ACCESSOR(nsIIncrementalRunnable, - NS_IINCREMENTALRUNNABLE_IID) +NS_DEFINE_STATIC_IID_ACCESSOR(nsIIdleRunnable, + NS_IIDLERUNNABLE_IID) -#endif // nsIIncrementalRunnable_h__ +#endif // nsIIdleRunnable_h__ \ No newline at end of file diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp index 71e71822fa..0d8c8dc196 100644 --- a/xpcom/threads/nsThread.cpp +++ b/xpcom/threads/nsThread.cpp @@ -34,7 +34,7 @@ #include "mozilla/Unused.h" #include "mozilla/dom/ScriptSettings.h" #include "nsIIdlePeriod.h" -#include "nsIIncrementalRunnable.h" +#include "nsIIdleRunnable.h" #include "nsThreadSyncDispatch.h" #include "LeakRefPtr.h" @@ -1035,7 +1035,7 @@ nsThread::GetIdleEvent(nsIRunnable** aEvent, MutexAutoLock& aProofOfLock) mIdleEvents.GetEvent(false, aEvent, aProofOfLock); if (*aEvent) { - nsCOMPtr incrementalEvent(do_QueryInterface(*aEvent)); + nsCOMPtr incrementalEvent(do_QueryInterface(*aEvent)); if (incrementalEvent) { incrementalEvent->SetDeadline(idleDeadline); }