Backed out changeset d84ea38d6fd0 (bug 1399453) because the annotations are no longer needed.

gfx/ipc/VsyncBridgeParent.cpp

@@ -28,7 +28,7 @@ VsyncBridgeParent::VsyncBridgeParent()
  : mOpen(false)
 {
   MOZ_COUNT_CTOR(VsyncBridgeParent);
-  mCompositorThreadRef = new CompositorThreadHolderDebug("VsyncBridge");
+  mCompositorThreadRef = CompositorThreadHolder::GetSingleton();
 }
 
 VsyncBridgeParent::~VsyncBridgeParent()

gfx/ipc/VsyncBridgeParent.h

@@ -38,7 +38,7 @@ private:
 
 private:
   bool mOpen;
-  RefPtr<layers::CompositorThreadHolderDebug> mCompositorThreadRef;
+  RefPtr<layers::CompositorThreadHolder> mCompositorThreadRef;
 };
 
 } // namespace gfx

gfx/layers/ipc/CompositorManagerParent.cpp

@@ -42,8 +42,6 @@ CompositorManagerParent::CreateSameProcess()
   // process case because if we open from the child perspective, we can do it
   // on the main thread and complete before we return the manager handles.
   RefPtr<CompositorManagerParent> parent = new CompositorManagerParent();
-  parent->mCompositorThreadHolder =
-    new CompositorThreadHolderDebug("CompositorManagerSame");
   parent->SetOtherProcessId(base::GetCurrentProcId());
   return parent.forget();
 }
@@ -58,8 +56,6 @@ CompositorManagerParent::Create(Endpoint<PCompositorManagerParent>&& aEndpoint)
   MOZ_ASSERT(aEndpoint.OtherPid() != base::GetCurrentProcId());
 
   RefPtr<CompositorManagerParent> bridge = new CompositorManagerParent();
-  bridge->mCompositorThreadHolder =
-    new CompositorThreadHolderDebug("CompositorManagerContent");
 
   RefPtr<Runnable> runnable = NewRunnableMethod<Endpoint<PCompositorManagerParent>&&>(
     "CompositorManagerParent::Bind",
@@ -110,6 +106,7 @@ CompositorManagerParent::CreateSameProcessWidgetCompositorBridge(CSSToLayoutDevi
 }
 
 CompositorManagerParent::CompositorManagerParent()
+  : mCompositorThreadHolder(CompositorThreadHolder::GetSingleton())
 {
 }
 

gfx/layers/ipc/CompositorManagerParent.h

@@ -19,7 +19,7 @@ namespace mozilla {
 namespace layers {
 
 class CompositorBridgeParent;
-class CompositorThreadHolderDebug;
+class CompositorThreadHolder;
 
 #ifndef DEBUG
 #define COMPOSITOR_MANAGER_PARENT_EXPLICIT_SHUTDOWN
@@ -68,7 +68,7 @@ private:
 
   void DeferredDestroy();
 
-  RefPtr<CompositorThreadHolderDebug> mCompositorThreadHolder;
+  RefPtr<CompositorThreadHolder> mCompositorThreadHolder;
 
   AutoTArray<RefPtr<CompositorBridgeParent>, 1> mPendingCompositorBridges;
 };

gfx/layers/ipc/CompositorThread.cpp

@@ -10,9 +10,6 @@
 #include "mozilla/layers/ImageBridgeParent.h"
 #include "mozilla/layers/SharedSurfacesParent.h"
 #include "mozilla/media/MediaSystemResourceService.h"
-#ifdef MOZ_CRASHREPORTER
-#include "nsExceptionHandler.h"     // for CrashReporter
-#endif
 
 namespace mozilla {
 
@@ -23,33 +20,6 @@ void ReleaseVRManagerParentSingleton();
 
 namespace layers {
 
-#ifdef MOZ_CRASHREPORTER
-static Atomic<int32_t> sHoldersNextId(0);
-#endif
-
-CompositorThreadHolderDebug::CompositorThreadHolderDebug(const char* aName)
-  : mHolder(CompositorThreadHolder::GetSingleton())
-{
-#ifdef MOZ_CRASHREPORTER
-  if (XRE_IsParentProcess()) {
-    mId.AppendLiteral("gfxCTH:");
-    mId.Append(aName);
-    mId.AppendLiteral(":");
-    mId.AppendInt(++sHoldersNextId);
-    CrashReporter::AnnotateCrashReport(mId, NS_LITERAL_CSTRING("1"));
-  }
-#endif
-}
-
-CompositorThreadHolderDebug::~CompositorThreadHolderDebug()
-{
-#ifdef MOZ_CRASHREPORTER
-  if (XRE_IsParentProcess()) {
-    CrashReporter::AnnotateCrashReport(mId, NS_LITERAL_CSTRING("0"));
-  }
-#endif
-}
-
 static StaticRefPtr<CompositorThreadHolder> sCompositorThreadHolder;
 static bool sFinishedCompositorShutDown = false;
 

gfx/layers/ipc/CompositorThread.h

@@ -60,22 +60,6 @@ private:
   friend class CompositorBridgeParent;
 };
 
-class CompositorThreadHolderDebug final
-{
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CompositorThreadHolderDebug)
-
-public:
-  explicit CompositorThreadHolderDebug(const char* aName);
-
-private:
-  ~CompositorThreadHolderDebug();
-
-  RefPtr<CompositorThreadHolder> mHolder;
-#ifdef MOZ_CRASHREPORTER
-  nsAutoCString mId;
-#endif
-};
-
 base::Thread* CompositorThread();
 
 } // namespace layers

gfx/layers/ipc/ImageBridgeParent.cpp

@@ -66,13 +66,10 @@ ImageBridgeParent::ImageBridgeParent(MessageLoop* aLoop,
   : mMessageLoop(aLoop)
   , mSetChildThreadPriority(false)
   , mClosed(false)
+  , mCompositorThreadHolder(CompositorThreadHolder::GetSingleton())
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  mCompositorThreadHolder =
-    new CompositorThreadHolderDebug(IsSameProcess() ? "ImageBridgeSame"
-                                                    : "ImageBridge");
-
   // creates the map only if it has not been created already, so it is safe
   // with several bridges
   {

gfx/layers/ipc/ImageBridgeParent.h

@@ -144,7 +144,7 @@ private:
   typedef std::map<base::ProcessId, ImageBridgeParent*> ImageBridgeMap;
   static ImageBridgeMap sImageBridges;
 
-  RefPtr<CompositorThreadHolderDebug> mCompositorThreadHolder;
+  RefPtr<CompositorThreadHolder> mCompositorThreadHolder;
 };
 
 } // namespace layers

gfx/layers/ipc/VideoBridgeParent.cpp

@@ -21,7 +21,7 @@ VideoBridgeParent::VideoBridgeParent()
 {
   mSelfRef = this;
   sVideoBridgeSingleton = this;
-  mCompositorThreadRef = new CompositorThreadHolderDebug("VideoBridge");
+  mCompositorThreadRef = CompositorThreadHolder::GetSingleton();
 }
 
 VideoBridgeParent::~VideoBridgeParent()

gfx/layers/ipc/VideoBridgeParent.h

@@ -13,7 +13,7 @@
 namespace mozilla {
 namespace layers {
 
-class CompositorThreadHolderDebug;
+class CompositorThreadHolder;
 
 class VideoBridgeParent final : public PVideoBridgeParent,
                                 public HostIPCAllocator,
@@ -64,7 +64,7 @@ private:
   // This keeps us alive until ActorDestroy(), at which point we do a
   // deferred destruction of ourselves.
   RefPtr<VideoBridgeParent> mSelfRef;
-  RefPtr<CompositorThreadHolderDebug> mCompositorThreadRef;
+  RefPtr<CompositorThreadHolder> mCompositorThreadRef;
 
   std::map<uint64_t, PTextureParent*> mTextureMap;