Commit 9a72acc5 authored by Phil Ringnalda's avatar Phil Ringnalda
Browse files

Back out 7bffc102114e (bug 737437) for Android native talos bustage

parent e8f67db0

gfx/layers/ipc/CompositorParent.cpp

+2 −12
Original line number Diff line number Diff line
@@ -78,24 +78,14 @@ CompositorParent::Destroy() 
  NS_ABORT_IF_FALSE(ManagedPLayersParent().Length() == 0,

                    "CompositorParent destroyed before managed PLayersParent");



  // Ensure that the layer manager is destructed on the compositor thread.

  // Ensure that the layer manager is destroyed on the compositor thread.

  mLayerManager = NULL;

}



bool

CompositorParent::RecvWillStop()

{

  mPaused = true;



  // Ensure that the layer manager is destroyed before CompositorChild.

  mLayerManager->Destroy();



  return true;

}



bool

CompositorParent::RecvStop()

{

  mPaused = true;

  Destroy();

  return true;

}

gfx/layers/ipc/CompositorParent.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ public: 
  CompositorParent(nsIWidget* aWidget, base::Thread* aCompositorThread);

  virtual ~CompositorParent();



  virtual bool RecvWillStop() MOZ_OVERRIDE;

  virtual bool RecvStop() MOZ_OVERRIDE;

  virtual bool RecvPause() MOZ_OVERRIDE;

  virtual bool RecvResume() MOZ_OVERRIDE;

gfx/layers/ipc/PCompositor.ipdl

+1 −4
Original line number Diff line number Diff line
@@ -61,10 +61,7 @@ rpc protocol PCompositor 


parent:  



  // The child is about to be destroyed, so perform any necessary cleanup.

  sync WillStop();



  // Clean up in preparation for own destruction.

  // Clean up in preparation for destruction.

  sync Stop();



  // Pause/resume the compositor. These are intended to be used on mobile, when

widget/xpwidgets/nsBaseWidget.cpp

+0 −2
Original line number Diff line number Diff line
@@ -153,8 +153,6 @@ nsBaseWidget::~nsBaseWidget() 
  }



  if (mCompositorChild) {

    mCompositorChild->SendWillStop();

    MessageLoop::current()->RunAllPending();

    mCompositorChild->Destroy();

    delete mCompositorThread;

  }