Bug 1313864 - Use the timeout handle to cancel rIC timeout. r=bkelly

MozReview-Commit-ID: I0OVIXn3fZT

dom/base/IdleRequest.cpp

@@ -45,6 +45,13 @@ IdleRequest::SetTimeoutHandle(int32_t aHandle)
   mTimeoutHandle = Some(aHandle);
 }
 
+uint32_t
+IdleRequest::GetTimeoutHandle() const
+{
+  MOZ_DIAGNOSTIC_ASSERT(mTimeoutHandle.isSome());
+  return mTimeoutHandle.value();
+}
+
 nsresult
 IdleRequest::IdleRun(nsPIDOMWindowInner* aWindow,
                      DOMHighResTimeStamp aDeadline,

dom/base/IdleRequest.h

@@ -36,6 +36,7 @@ public:
 
   void SetTimeoutHandle(int32_t aHandle);
   bool HasTimeout() const { return mTimeoutHandle.isSome(); }
+  uint32_t GetTimeoutHandle() const;
 
   uint32_t Handle() const
   {

dom/base/nsGlobalWindow.cpp

@@ -699,7 +699,7 @@ nsGlobalWindow::RemoveIdleCallback(mozilla::dom::IdleRequest* aRequest)
   AssertIsOnMainThread();
 
   if (aRequest->HasTimeout()) {
-    mTimeoutManager->ClearTimeout(aRequest->Handle(),
+    mTimeoutManager->ClearTimeout(aRequest->GetTimeoutHandle(),
                                   Timeout::Reason::eIdleCallbackTimeout);
   }