Backed out changeset caca636b78f8 (bug 1175783) while alternative fixes are investigated.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 13 Jul 2015 15:26:25 -0400
changeset 275322 c332d0157b9f24721121f7d1a7abf0b45ec4fc14
parent 275321 d23402a8262f568afb9a691a24d558c0e6312cc2
child 275323 f61915acf75bf583bc4e4303162768519dd1d803
child 275325 664b98d33a1b128b7444e45a5ae16a168cc22b56
child 275327 6c4bb5acee125bc74fe411886a46f78151a6e1f7
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1175783
milestone40.0
backs outcaca636b78f8e013ad710a90a9cfbb7299205cc1
Backed out changeset caca636b78f8 (bug 1175783) while alternative fixes are investigated.
dom/media/gmp/GMPParent.cpp
--- a/dom/media/gmp/GMPParent.cpp
+++ b/dom/media/gmp/GMPParent.cpp
@@ -25,17 +25,16 @@
 #include "mozilla/SandboxInfo.h"
 #endif
 
 #include "mozilla/dom/CrashReporterParent.h"
 using mozilla::dom::CrashReporterParent;
 using mozilla::ipc::GeckoChildProcessHost;
 
 #ifdef MOZ_CRASHREPORTER
-#include "nsPrintfCString.h"
 using CrashReporter::AnnotationTable;
 using CrashReporter::GetIDFromMinidump;
 #endif
 
 #include "mozilla/Telemetry.h"
 
 namespace mozilla {
 
@@ -195,21 +194,16 @@ GMPParent::LoadProcess()
   return NS_OK;
 }
 
 void
 AbortWaitingForGMPAsyncShutdown(nsITimer* aTimer, void* aClosure)
 {
   NS_WARNING("Timed out waiting for GMP async shutdown!");
   GMPParent* parent = reinterpret_cast<GMPParent*>(aClosure);
-#if defined(MOZ_CRASHREPORTER)
-  CrashReporter::AnnotateCrashReport(
-    nsPrintfCString("AsyncPluginShutdown-%s@%p", parent->GetDisplayName().get(), parent),
-    NS_LITERAL_CSTRING("Timed out waiting for async shutdown"));
-#endif
   nsRefPtr<GeckoMediaPluginServiceParent> service =
     GeckoMediaPluginServiceParent::GetSingleton();
   if (service) {
     service->AsyncShutdownComplete(parent);
   }
 }
 
 nsresult
@@ -243,30 +237,18 @@ GMPParent::EnsureAsyncShutdownTimeoutSet
     nsITimer::TYPE_ONE_SHOT);
 }
 
 bool
 GMPParent::RecvPGMPContentChildDestroyed()
 {
   --mGMPContentChildCount;
   if (!IsUsed()) {
-#if defined(MOZ_CRASHREPORTER)
-    CrashReporter::AnnotateCrashReport(
-      nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
-      NS_LITERAL_CSTRING("Content children destroyed"));
-#endif
     CloseIfUnused();
   }
-#if defined(MOZ_CRASHREPORTER)
-  else {
-    CrashReporter::AnnotateCrashReport(
-      nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
-      nsPrintfCString("Content child destroyed, remaining: %u", mGMPContentChildCount));
-  }
-#endif
   return true;
 }
 
 void
 GMPParent::CloseIfUnused()
 {
   MOZ_ASSERT(GMPThread() == NS_GetCurrentThread());
   LOGD("%s: mAsyncShutdownRequired=%d", __FUNCTION__, mAsyncShutdownRequired);
@@ -278,29 +260,19 @@ GMPParent::CloseIfUnused()
     // Ensure all timers are killed.
     for (uint32_t i = mTimers.Length(); i > 0; i--) {
       mTimers[i - 1]->Shutdown();
     }
 
     if (mAsyncShutdownRequired) {
       if (!mAsyncShutdownInProgress) {
         LOGD("%s: sending async shutdown notification", __FUNCTION__);
-#if defined(MOZ_CRASHREPORTER)
-      CrashReporter::AnnotateCrashReport(
-        nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
-        NS_LITERAL_CSTRING("Sent BeginAsyncShutdown"));
-#endif
         mAsyncShutdownInProgress = true;
         if (!SendBeginAsyncShutdown() ||
             NS_FAILED(EnsureAsyncShutdownTimeoutSet())) {
-#if defined(MOZ_CRASHREPORTER)
-          CrashReporter::AnnotateCrashReport(
-            nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
-            NS_LITERAL_CSTRING("Could not send BeginAsyncShutdown - Aborting"));
-#endif
           AbortAsyncShutdown();
         }
       }
     } else {
       // Any async shutdown must be complete. Shutdown GMPStorage.
       for (size_t i = mStorage.Length(); i > 0; i--) {
         mStorage[i - 1]->Shutdown();
       }
@@ -339,21 +311,16 @@ GMPParent::CloseActive(bool aDieWhenUnlo
 
   if (aDieWhenUnloaded) {
     mDeleteProcessOnlyOnUnload = true; // don't allow this to go back...
   }
   if (mState == GMPStateLoaded) {
     mState = GMPStateUnloading;
   }
   if (mState != GMPStateNotLoaded && IsUsed()) {
-#if defined(MOZ_CRASHREPORTER)
-    CrashReporter::AnnotateCrashReport(
-      nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
-      nsPrintfCString("Sent CloseActive, content children to close: %u", mGMPContentChildCount));
-#endif
     unused << SendCloseActive();
   }
 }
 
 void
 GMPParent::MarkForDeletion()
 {
   mDeleteProcessOnlyOnUnload = true;
@@ -599,21 +566,16 @@ GMPParent::ActorDestroy(ActorDestroyReas
   mState = GMPStateClosing;
   mAbnormalShutdownInProgress = true;
   CloseActive(false);
 
   // Normal Shutdown() will delete the process on unwind.
   if (AbnormalShutdown == aWhy) {
     nsRefPtr<GMPParent> self(this);
     if (mAsyncShutdownRequired) {
-#if defined(MOZ_CRASHREPORTER)
-      CrashReporter::AnnotateCrashReport(
-        nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
-        NS_LITERAL_CSTRING("Actor destroyed"));
-#endif
       mService->AsyncShutdownComplete(this);
       mAsyncShutdownRequired = false;
     }
     // Must not call Close() again in DeleteProcess(), as we'll recurse
     // infinitely if we do.
     MOZ_ASSERT(mState == GMPStateClosing);
     DeleteProcess();
     // Note: final destruction will be Dispatched to ourself
@@ -906,21 +868,16 @@ GMPParent::RecvAsyncShutdownRequired()
 }
 
 bool
 GMPParent::RecvAsyncShutdownComplete()
 {
   LOGD("%s", __FUNCTION__);
 
   MOZ_ASSERT(mAsyncShutdownRequired);
-#if defined(MOZ_CRASHREPORTER)
-  CrashReporter::AnnotateCrashReport(
-    nsPrintfCString("AsyncPluginShutdown-%s@%p", GetDisplayName().get(), this),
-    NS_LITERAL_CSTRING("Received AsyncShutdownComplete"));
-#endif
   AbortAsyncShutdown();
   return true;
 }
 
 class RunCreateContentParentCallbacks : public nsRunnable
 {
 public:
   explicit RunCreateContentParentCallbacks(GMPContentParent* aGMPContentParent)