From f9a4e85ea64f118fdead5419fbef26a83384b4c9 Mon Sep 17 00:00:00 2001
From: Brad Werth <bwerth@mozilla.com>
Date: Mon, 23 Jan 2017 16:40:28 -0800
Subject: [PATCH] Bug 1328420 Part 7: Uplift List debug method into StyleSheet.
 r=heycam

MozReview-Commit-ID: 7aqC6N6cZst

--HG--
extra : rebase_source : 059b441aa12c77aee5734d61a244248b5ccd06d8
---
 layout/style/CSSStyleSheet.cpp   | 31 +--------------------------
 layout/style/CSSStyleSheet.h     |  2 +-
 layout/style/ServoStyleSheet.cpp |  8 -------
 layout/style/ServoStyleSheet.h   |  4 ----
 layout/style/StyleSheet.cpp      | 36 ++++++++++++++++++++++++++++++++
 layout/style/StyleSheet.h        |  2 +-
 layout/style/StyleSheetInlines.h |  8 -------
 7 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/layout/style/CSSStyleSheet.cpp b/layout/style/CSSStyleSheet.cpp
index cf2d7afe673b..dc99e9ec6bfd 100644
--- a/layout/style/CSSStyleSheet.cpp
+++ b/layout/style/CSSStyleSheet.cpp
@@ -725,36 +725,7 @@ ListRules(const nsCOMArray<css::Rule>& aRules, FILE* aOut, int32_t aIndent)
 void
 CSSStyleSheet::List(FILE* out, int32_t aIndent) const
 {
-
-  int32_t index;
-
-  // Indent
-  nsAutoCString str;
-  for (index = aIndent; --index >= 0; ) {
-    str.AppendLiteral("  ");
-  }
-
-  str.AppendLiteral("CSS Style Sheet: ");
-  nsAutoCString urlSpec;
-  nsresult rv = mInner->mSheetURI->GetSpec(urlSpec);
-  if (NS_SUCCEEDED(rv) && !urlSpec.IsEmpty()) {
-    str.Append(urlSpec);
-  }
-
-  if (mMedia) {
-    str.AppendLiteral(" media: ");
-    nsAutoString  buffer;
-    mMedia->GetText(buffer);
-    AppendUTF16toUTF8(buffer, str);
-  }
-  str.Append('\n');
-  fprintf_stderr(out, "%s", str.get());
-
-  for (const StyleSheet* child = GetFirstChild();
-       child;
-       child = child->mNext) {
-    child->List(out, aIndent + 1);
-  }
+  StyleSheet::List(out, aIndent);
 
   fprintf_stderr(out, "%s", "Rules in source order:\n");
   ListRules(mInner->mOrderedRules, out, aIndent);
diff --git a/layout/style/CSSStyleSheet.h b/layout/style/CSSStyleSheet.h
index 5e82f486a808..45440d6d4b0f 100644
--- a/layout/style/CSSStyleSheet.h
+++ b/layout/style/CSSStyleSheet.h
@@ -111,7 +111,7 @@ public:
   // Find the ID of the owner inner window.
   uint64_t FindOwningWindowInnerID() const;
 #ifdef DEBUG
-  void List(FILE* out = stdout, int32_t aIndent = 0) const;
+  void List(FILE* out = stdout, int32_t aIndent = 0) const override;
 #endif
 
   // XXX do these belong here or are they generic?
diff --git a/layout/style/ServoStyleSheet.cpp b/layout/style/ServoStyleSheet.cpp
index 283278015b35..5c2a62f321a7 100644
--- a/layout/style/ServoStyleSheet.cpp
+++ b/layout/style/ServoStyleSheet.cpp
@@ -115,14 +115,6 @@ ServoStyleSheet::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
   MOZ_CRASH("stylo: not implemented");
 }
 
-#ifdef DEBUG
-void
-ServoStyleSheet::List(FILE* aOut, int32_t aIndex) const
-{
-  MOZ_CRASH("stylo: not implemented");
-}
-#endif
-
 css::Rule*
 ServoStyleSheet::GetDOMOwnerRule() const
 {
diff --git a/layout/style/ServoStyleSheet.h b/layout/style/ServoStyleSheet.h
index e74286f24d35..f1ec541c712f 100644
--- a/layout/style/ServoStyleSheet.h
+++ b/layout/style/ServoStyleSheet.h
@@ -55,10 +55,6 @@ public:
 
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
 
-#ifdef DEBUG
-  void List(FILE* aOut = stdout, int32_t aIndex = 0) const;
-#endif
-
   RawServoStyleSheet* RawSheet() const { return mSheet; }
   void SetSheetForImport(RawServoStyleSheet* aSheet) {
     MOZ_ASSERT(!mSheet);
diff --git a/layout/style/StyleSheet.cpp b/layout/style/StyleSheet.cpp
index 2d2605cb2da2..382435c65d1d 100644
--- a/layout/style/StyleSheet.cpp
+++ b/layout/style/StyleSheet.cpp
@@ -432,6 +432,42 @@ StyleSheet::AppendStyleSheet(StyleSheet* aSheet)
   DidDirty();
 }
 
+#ifdef DEBUG
+void
+StyleSheet::List(FILE* out, int32_t aIndent) const
+{
+  int32_t index;
+
+  // Indent
+  nsAutoCString str;
+  for (index = aIndent; --index >= 0; ) {
+    str.AppendLiteral("  ");
+  }
+
+  str.AppendLiteral("CSS Style Sheet: ");
+  nsAutoCString urlSpec;
+  nsresult rv = GetSheetURI()->GetSpec(urlSpec);
+  if (NS_SUCCEEDED(rv) && !urlSpec.IsEmpty()) {
+    str.Append(urlSpec);
+  }
+
+  if (mMedia) {
+    str.AppendLiteral(" media: ");
+    nsAutoString  buffer;
+    mMedia->GetText(buffer);
+    AppendUTF16toUTF8(buffer, str);
+  }
+  str.Append('\n');
+  fprintf_stderr(out, "%s", str.get());
+
+  for (const StyleSheet* child = GetFirstChild();
+       child;
+       child = child->mNext) {
+    child->List(out, aIndent + 1);
+  }
+}
+#endif
+
 void
 StyleSheet::SetMedia(nsMediaList* aMedia)
 {
diff --git a/layout/style/StyleSheet.h b/layout/style/StyleSheet.h
index ad4b405ec47a..bfa4eb82999f 100644
--- a/layout/style/StyleSheet.h
+++ b/layout/style/StyleSheet.h
@@ -153,7 +153,7 @@ public:
 
   inline size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
 #ifdef DEBUG
-  inline void List(FILE* aOut = stdout, int32_t aIndex = 0) const;
+  virtual void List(FILE* aOut = stdout, int32_t aIndex = 0) const;
 #endif
 
   // WebIDL StyleSheet API
diff --git a/layout/style/StyleSheetInlines.h b/layout/style/StyleSheetInlines.h
index b4872e69c7ff..3f83798b0f67 100644
--- a/layout/style/StyleSheetInlines.h
+++ b/layout/style/StyleSheetInlines.h
@@ -140,14 +140,6 @@ StyleSheet::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
   MOZ_STYLO_FORWARD(SizeOfIncludingThis, (aMallocSizeOf))
 }
 
-#ifdef DEBUG
-void
-StyleSheet::List(FILE* aOut, int32_t aIndex) const
-{
-  MOZ_STYLO_FORWARD(List, (aOut, aIndex))
-}
-#endif
-
 void StyleSheet::WillDirty() { MOZ_STYLO_FORWARD(WillDirty, ()) }
 void StyleSheet::DidDirty() { MOZ_STYLO_FORWARD(DidDirty, ()) }