Bug 1568950 - Part 5: Remove nsIDOMWindowUtils::forceUseCounterFlush; r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D42818

--HG--
extra : moz-landing-system : lando

Author: EdgarChen

dom/base/Document.cpp

@@ -14397,26 +14397,14 @@ bool Document::InlineScriptAllowedByCSP() {
   return allowsInlineScript;
 }
 
-static bool ReportExternalResourceUseCounters(Document* aDocument,
-                                              void* aData) {
-  const auto reportKind =
-      Document::UseCounterReportKind::eIncludeExternalResources;
-  aDocument->ReportUseCounters(reportKind);
-  return true;
-}
-
-void Document::ReportUseCounters(UseCounterReportKind aKind) {
+void Document::ReportUseCounters() {
   static const bool sDebugUseCounters = false;
   if (mReportedUseCounters) {
     return;
   }
 
   mReportedUseCounters = true;
 
-  if (aKind == UseCounterReportKind::eIncludeExternalResources) {
-    EnumerateExternalResources(ReportExternalResourceUseCounters, nullptr);
-  }
-
   if (Telemetry::HistogramUseCounterCount > 0 &&
       (IsContentDocument() || IsResourceDoc())) {
     nsCOMPtr<nsIURI> uri;

dom/base/Document.h

@@ -3770,20 +3770,7 @@ class Document : public nsINode,
 
   bool IsSynthesized();
 
-  enum class UseCounterReportKind {
-    // Flush the document's use counters only; the use counters for any
-    // external resource documents will be flushed when the external
-    // resource documents themselves are destroyed.
-    eDefault,
-
-    // Flush use counters for the document and for its external resource
-    // documents. (Should only be necessary for tests, where we need
-    // flushing to happen synchronously and deterministically.)
-    eIncludeExternalResources,
-  };
-
-  void ReportUseCounters(
-      UseCounterReportKind aKind = UseCounterReportKind::eDefault);
+  void ReportUseCounters();
 
   void SetDocumentUseCounter(UseCounter aUseCounter) {
     if (!mUseCounters[aUseCounter]) {

dom/base/nsDOMWindowUtils.cpp

@@ -3816,31 +3816,6 @@ nsDOMWindowUtils::TriggerDeviceReset() {
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsDOMWindowUtils::ForceUseCounterFlush(nsINode* aNode) {
-  NS_ENSURE_ARG_POINTER(aNode);
-
-  if (nsCOMPtr<Document> doc = do_QueryInterface(aNode)) {
-    mozilla::css::ImageLoader* loader = doc->StyleImageLoader();
-    loader->FlushUseCounters();
-
-    // Flush the document and any external documents that it depends on.
-    const auto reportKind =
-        Document::UseCounterReportKind::eIncludeExternalResources;
-    doc->ReportUseCounters(reportKind);
-    return NS_OK;
-  }
-
-  if (nsCOMPtr<nsIContent> content = do_QueryInterface(aNode)) {
-    if (HTMLImageElement* img = HTMLImageElement::FromNode(content)) {
-      img->FlushUseCounters();
-      return NS_OK;
-    }
-  }
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDOMWindowUtils::HasRuleProcessorUsedByMultipleStyleSets(uint32_t aSheetType,
                                                           bool* aRetVal) {

dom/html/HTMLImageElement.cpp

@@ -1208,15 +1208,5 @@ void HTMLImageElement::MediaFeatureValuesChanged() {
   QueueImageLoadTask(false);
 }
 
-void HTMLImageElement::FlushUseCounters() {
-  nsCOMPtr<imgIRequest> request;
-  GetRequest(CURRENT_REQUEST, getter_AddRefs(request));
-
-  nsCOMPtr<imgIContainer> container;
-  request->GetImage(getter_AddRefs(container));
-
-  static_cast<image::Image*>(container.get())->ReportUseCounters();
-}
-
 }  // namespace dom
 }  // namespace mozilla

dom/html/HTMLImageElement.h

@@ -247,12 +247,6 @@ class HTMLImageElement final : public nsGenericHTMLElement,
       const nsAString& aTypeAttr, const nsAString& aMediaAttr,
       nsAString& aResult);
 
-  /**
-   * If this image's src pointers to an SVG document, flush the SVG document's
-   * use counters to telemetry.  Only used for testing purposes.
-   */
-  void FlushUseCounters();
-
  protected:
   virtual ~HTMLImageElement();
 

dom/interfaces/base/nsIDOMWindowUtils.idl

@@ -1836,17 +1836,6 @@ interface nsIDOMWindowUtils : nsISupports {
    */
   bool hasRuleProcessorUsedByMultipleStyleSets(in unsigned long aSheetType);
 
-  /*
-   * Force the use counters for the node's associated document(s) to be
-   * flushed to telemetry.  For example, a document node will flush its own
-   * counters and an image node with an SVG source will flush the SVG
-   * document's counters.  Normally, use counters are flushed to telemetry
-   * upon document destruction, but as document destruction is somewhat
-   * non-deterministic, we have this method here for more determinism when
-   * running tests.
-   */
-  void forceUseCounterFlush(in Node aNode);
-
   /**
    * Enable or disable displayport suppression. This is intended to be used by
    * testing code, to provide more deterministic behaviour over the displayport

image/Image.h

@@ -225,8 +225,6 @@ class Image : public imgIContainer {
   virtual void SetHasError() = 0;
 
   virtual nsIURI* GetURI() const = 0;
-
-  virtual void ReportUseCounters() {}
 };
 
 class ImageResource : public Image {

image/VectorImage.cpp

@@ -1509,12 +1509,6 @@ void VectorImage::PropagateUseCounters(Document* aParentDocument) {
   }
 }
 
-void VectorImage::ReportUseCounters() {
-  if (Document* doc = mSVGDocumentWrapper->GetDocument()) {
-    doc->ReportUseCounters();
-  }
-}
-
 nsIntSize VectorImage::OptimalImageSizeForDest(const gfxSize& aDest,
                                                uint32_t aWhichFrame,
                                                SamplingFilter aSamplingFilter,

image/VectorImage.h

@@ -67,8 +67,6 @@ class VectorImage final : public ImageResource, public nsIStreamListener {
   void OnSVGDocumentLoaded();
   void OnSVGDocumentError();
 
-  virtual void ReportUseCounters() override;
-
  protected:
   explicit VectorImage(nsIURI* aURI = nullptr);
   virtual ~VectorImage();

layout/style/ImageLoader.cpp

@@ -790,20 +790,6 @@ nsresult ImageLoader::OnLoadComplete(imgIRequest* aRequest) {
   return NS_OK;
 }
 
-void ImageLoader::FlushUseCounters() {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  for (auto iter = mRegisteredImages.Iter(); !iter.Done(); iter.Next()) {
-    if (imgRequestProxy* request = iter.Data()) {
-      nsCOMPtr<imgIContainer> container;
-      request->GetImage(getter_AddRefs(container));
-      if (container) {
-        static_cast<image::Image*>(container.get())->ReportUseCounters();
-      }
-    }
-  }
-}
-
 bool ImageLoader::ImageReflowCallback::ReflowFinished() {
   // Check that the frame is still valid. If it isn't, then onload was
   // unblocked when the frame was removed from the FrameSet in