Commit 0cda76d6 authored by Bill McCloskey's avatar Bill McCloskey
Browse files

Bug 1339289 - Give names to a lot of common timers (r=ehsan) 

MozReview-Commit-ID: IMsv5bkyjBL
parent 194043ae

dom/base/nsContentSink.cpp

+14 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsContentSink) 
  NS_INTERFACE_MAP_ENTRY(nsIDocumentObserver)

  NS_INTERFACE_MAP_ENTRY(nsIMutationObserver)

  NS_INTERFACE_MAP_ENTRY(nsITimerCallback)

  NS_INTERFACE_MAP_ENTRY(nsINamed)

  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDocumentObserver)

NS_INTERFACE_MAP_END
@@ -1627,3 +1628,16 @@ nsContentSink::NotifyDocElementCreated(nsIDocument* aDoc) 
                                      NS_LITERAL_STRING("DOMDocElementInserted"),

                                      true, false);

}



NS_IMETHODIMP

nsContentSink::GetName(nsACString& aName)

{

  aName.AssignASCII("nsContentSink_timer");

  return NS_OK;

}



NS_IMETHODIMP

nsContentSink::SetName(const char* aName)

{

  return NS_ERROR_NOT_IMPLEMENTED;

}

dom/base/nsContentSink.h

+4 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ extern mozilla::LazyLogModule gContentSinkLogModuleInfo; 
class nsContentSink : public nsICSSLoaderObserver,

                      public nsSupportsWeakReference,

                      public nsStubDocumentObserver,

                      public nsITimerCallback

                      public nsITimerCallback,

                      public nsINamed

{

  NS_DECL_CYCLE_COLLECTING_ISUPPORTS

  NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsContentSink,
@@ -84,6 +85,8 @@ class nsContentSink : public nsICSSLoaderObserver, 
    // nsITimerCallback

  NS_DECL_NSITIMERCALLBACK



  NS_DECL_NSINAMED



  // nsICSSLoaderObserver

  NS_IMETHOD StyleSheetLoaded(mozilla::StyleSheet* aSheet,

                              bool aWasAlternate,

dom/base/nsWindowMemoryReporter.cpp

+3 −2
Original line number Diff line number Diff line
@@ -656,8 +656,9 @@ nsWindowMemoryReporter::AsyncCheckForGhostWindows() 
  mCheckTimer = do_CreateInstance("@mozilla.org/timer;1");



  if (mCheckTimer) {

    mCheckTimer->InitWithFuncCallback(CheckTimerFired, nullptr,

                                      timerDelay, nsITimer::TYPE_ONE_SHOT);

    mCheckTimer->InitWithNamedFuncCallback(CheckTimerFired, nullptr,

                                           timerDelay, nsITimer::TYPE_ONE_SHOT,

                                           "nsWindowMemoryReporter::AsyncCheckForGhostWindows_timer");

  }

}

dom/events/EventStateManager.cpp

+18 −2
Original line number Diff line number Diff line
@@ -196,18 +196,21 @@ PrintDocTreeAll(nsIDocShellTreeItem* aItem) 
/* mozilla::UITimerCallback                                       */

/******************************************************************/



class UITimerCallback final : public nsITimerCallback

class UITimerCallback final :

    public nsITimerCallback,

    public nsINamed

{

public:

  UITimerCallback() : mPreviousCount(0) {}

  NS_DECL_ISUPPORTS

  NS_DECL_NSITIMERCALLBACK

  NS_DECL_NSINAMED

private:

  ~UITimerCallback() = default;

  uint32_t mPreviousCount;

};



NS_IMPL_ISUPPORTS(UITimerCallback, nsITimerCallback)

NS_IMPL_ISUPPORTS(UITimerCallback, nsITimerCallback, nsINamed)



// If aTimer is nullptr, this method always sends "user-interaction-inactive"

// notification.
@@ -233,6 +236,19 @@ UITimerCallback::Notify(nsITimer* aTimer) 
  return NS_OK;

}



NS_IMETHODIMP

UITimerCallback::GetName(nsACString& aName)

{

  aName.AssignASCII("UITimerCallback_timer");

  return NS_OK;

}



NS_IMETHODIMP

UITimerCallback::SetName(const char* aName)

{

  return NS_ERROR_NOT_IMPLEMENTED;

}



/******************************************************************/

/* mozilla::OverOutElementsWrapper                                */

/******************************************************************/

dom/html/nsHTMLDNSPrefetch.cpp

+2 −1
Original line number Diff line number Diff line
@@ -295,7 +295,8 @@ nsHTMLDNSPrefetch::nsDeferrals::Add(uint16_t flags, Link *aElement) 


  if (!mActiveLoaderCount && !mTimerArmed && mTimer) {

    mTimerArmed = true;

    mTimer->InitWithFuncCallback(Tick, this, 2000, nsITimer::TYPE_ONE_SHOT);

    mTimer->InitWithNamedFuncCallback(Tick, this, 2000, nsITimer::TYPE_ONE_SHOT,

                                      "nsHTMLDNSPrefetch::nsDeferrals::Tick");

  }

  

  return NS_OK;