Backed out changeset c253b6bd00b1 (bug 1220007) for causing a bustage on B2g-emulator L builds which is only visible on b2g-inbound on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 03 Nov 2015 14:08:50 +0100
changeset 270908 59a6ad6a921f4809dfc37d943d765300c65721e5
parent 270907 aeabfab3ea4d7681e961786ecf1363253c07dc46
child 270928 d954d32c5c2753061ac94c42a7f1cf2caeb05159
child 270954 d968c6ddc5d90fff8ce00eaf85c8b8461e4f5ce7
child 271007 5bd197b129a8b3daae102e6151b8f6fea60d8824
push id29627
push usercbook@mozilla.com
push dateTue, 03 Nov 2015 13:09:01 +0000
treeherdermozilla-central@59a6ad6a921f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1220007
milestone45.0a1
backs outc253b6bd00b1f3fc6ab7fc99b9d1ea1bd635c8c8
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset c253b6bd00b1 (bug 1220007) for causing a bustage on B2g-emulator L builds which is only visible on b2g-inbound on a CLOSED TREE
dom/base/ConsoleReportCollector.cpp
dom/base/ConsoleReportCollector.h
dom/base/nsIConsoleReportCollector.h
netwerk/protocol/http/HttpBaseChannel.cpp
netwerk/protocol/http/HttpBaseChannel.h
--- a/dom/base/ConsoleReportCollector.cpp
+++ b/dom/base/ConsoleReportCollector.cpp
@@ -74,34 +74,13 @@ ConsoleReportCollector::FlushConsoleRepo
                                     aDocument, report.mPropertiesFile,
                                     report.mMessageName.get(),
                                     params.get(),
                                     paramsLength, uri, EmptyString(),
                                     report.mLineNumber, report.mColumnNumber);
   }
 }
 
-void
-ConsoleReportCollector::FlushConsoleReports(nsIConsoleReportCollector* aCollector)
-{
-  MOZ_ASSERT(aCollector);
-
-  nsTArray<PendingReport> reports;
-
-  {
-    MutexAutoLock lock(mMutex);
-    mPendingReports.SwapElements(reports);
-  }
-
-  for (uint32_t i = 0; i < reports.Length(); ++i) {
-    PendingReport& report = reports[i];
-    aCollector->AddConsoleReport(report.mErrorFlags, report.mCategory,
-                                 report.mPropertiesFile, report.mSourceFileURI,
-                                 report.mLineNumber, report.mColumnNumber,
-                                 report.mMessageName, report.mStringParams);
-  }
-}
-
 ConsoleReportCollector::~ConsoleReportCollector()
 {
 }
 
 } // namespace mozilla
--- a/dom/base/ConsoleReportCollector.h
+++ b/dom/base/ConsoleReportCollector.h
@@ -24,19 +24,16 @@ public:
                    const nsACString& aSourceFileURI,
                    uint32_t aLineNumber, uint32_t aColumnNumber,
                    const nsACString& aMessageName,
                    const nsTArray<nsString>& aStringParams) override;
 
   void
   FlushConsoleReports(nsIDocument* aDocument) override;
 
-  void
-  FlushConsoleReports(nsIConsoleReportCollector* aCollector) override;
-
 private:
   ~ConsoleReportCollector();
 
   struct PendingReport
   {
     PendingReport(uint32_t aErrorFlags, const nsACString& aCategory,
                nsContentUtils::PropertiesFile aPropertiesFile,
                const nsACString& aSourceFileURI, uint32_t aLineNumber,
--- a/dom/base/nsIConsoleReportCollector.h
+++ b/dom/base/nsIConsoleReportCollector.h
@@ -61,29 +61,21 @@ public:
                    Params... aParams)
   {
     nsTArray<nsString> params;
     mozilla::dom::StringArrayAppender::Append(params, sizeof...(Params), aParams...);
     AddConsoleReport(aErrorFlags, aCategory, aPropertiesFile, aSourceFileURI,
                      aLineNumber, aColumnNumber, aMessageName, params);
   }
 
-  // Flush all pending reports to the console.  Main thread only.
+  // Flush all pending reports to the console.
   //
   // aDocument      An optional document representing where to flush the
   //                reports.  If provided, then the corresponding window's
   //                web console will get the reports.  Otherwise the reports
   //                go to the browser console.
   virtual void
   FlushConsoleReports(nsIDocument* aDocument) = 0;
-
-  // Flush all pending reports to another collector.  May be called from any
-  // thread.
-  //
-  // aCollector     A required collector object that will effectively take
-  //                ownership of our currently console reports.
-  virtual void
-  FlushConsoleReports(nsIConsoleReportCollector* aCollector) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIConsoleReportCollector, NS_NSICONSOLEREPORTCOLLECTOR_IID)
 
 #endif // nsIConsoleReportCollector_h
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -2352,22 +2352,16 @@ HttpBaseChannel::AddConsoleReport(uint32
 }
 
 void
 HttpBaseChannel::FlushConsoleReports(nsIDocument* aDocument)
 {
   mReportCollector->FlushConsoleReports(aDocument);
 }
 
-void
-HttpBaseChannel::FlushConsoleReports(nsIConsoleReportCollector* aCollector)
-{
-  mReportCollector->FlushConsoleReports(aCollector);
-}
-
 nsIPrincipal *
 HttpBaseChannel::GetURIPrincipal()
 {
   if (mPrincipal) {
       return mPrincipal;
   }
 
   nsIScriptSecurityManager *securityManager =
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -242,19 +242,16 @@ public:
                    const nsACString& aSourceFileURI,
                    uint32_t aLineNumber, uint32_t aColumnNumber,
                    const nsACString& aMessageName,
                    const nsTArray<nsString>& aStringParams) override;
 
   void
   FlushConsoleReports(nsIDocument* aDocument) override;
 
-  void
-  FlushConsoleReports(nsIConsoleReportCollector* aCollector) override;
-
   class nsContentEncodings : public nsIUTF8StringEnumerator
     {
     public:
         NS_DECL_ISUPPORTS
         NS_DECL_NSIUTF8STRINGENUMERATOR
 
         nsContentEncodings(nsIHttpChannel* aChannel, const char* aEncodingHeader);