Commit 2b3ebd24 authored by Andrew Osmond's avatar Andrew Osmond
Browse files

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

parent eede494d

gfx/ipc/VsyncBridgeParent.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ private: 


private:

  bool mOpen;

  RefPtr<layers::CompositorThreadHolderDebug> mCompositorThreadRef;

  RefPtr<layers::CompositorThreadHolder> mCompositorThreadRef;

};



} // namespace gfx

gfx/layers/ipc/CompositorManagerParent.cpp

+1 −4
Original line number Diff line number Diff line
@@ -38,8 +38,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());



  // CompositorManagerParent::Bind would normally add a reference for IPDL but
@@ -64,8 +62,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",
@@ -116,6 +112,7 @@ CompositorManagerParent::CreateSameProcessWidgetCompositorBridge(CSSToLayoutDevi 
}



CompositorManagerParent::CompositorManagerParent()

  : mCompositorThreadHolder(CompositorThreadHolder::GetSingleton())

{

}

gfx/layers/ipc/CompositorManagerParent.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ namespace mozilla { 
namespace layers {



class CompositorBridgeParent;

class CompositorThreadHolderDebug;

class CompositorThreadHolder;



class CompositorManagerParent final : public PCompositorManagerParent

{
@@ -56,7 +56,7 @@ private: 


  void DeferredDestroy();



  RefPtr<CompositorThreadHolderDebug> mCompositorThreadHolder;

  RefPtr<CompositorThreadHolder> mCompositorThreadHolder;



  AutoTArray<RefPtr<CompositorBridgeParent>, 1> mPendingCompositorBridges;

};

gfx/layers/ipc/CompositorThread.cpp

+0 −30
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 
#include "CompositorBridgeParent.h"

#include "mozilla/layers/ImageBridgeParent.h"

#include "mozilla/media/MediaSystemResourceService.h"

#ifdef MOZ_CRASHREPORTER

#include "nsExceptionHandler.h"     // for CrashReporter

#endif



namespace mozilla {
@@ -22,33 +19,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("gfxCompositorThread:");

    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;