Backed out changeset dd4bf41ca47d (bug 1389021) for bustage

gfx/layers/ipc/CompositorBridgeParent.cpp

@@ -500,7 +500,6 @@ CompositorBridgeParent::RecvWillClose()
 void CompositorBridgeParent::DeferredDestroy()
 {
   MOZ_ASSERT(!NS_IsMainThread());
-  mCompositorManager = nullptr;
   mSelfRef = nullptr;
 }
 

gfx/layers/ipc/CompositorBridgeParent.h

@@ -168,6 +168,7 @@ protected:
 
   bool mCanSend;
 
+private:
   RefPtr<CompositorManagerParent> mCompositorManager;
 };
 

gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp

@@ -19,7 +19,6 @@
 #include "mozilla/layers/APZCTreeManagerParent.h"  // for APZCTreeManagerParent
 #include "mozilla/layers/APZThreadUtils.h"  // for APZCTreeManager
 #include "mozilla/layers/AsyncCompositionManager.h"
-#include "mozilla/layers/CompositorManagerParent.h" // for CompositorManagerParent
 #include "mozilla/layers/CompositorOptions.h"
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/LayerManagerComposite.h"
@@ -520,7 +519,6 @@ CrossProcessCompositorBridgeParent::GetCompositionManager(LayerTransactionParent
 void
 CrossProcessCompositorBridgeParent::DeferredDestroy()
 {
-  mCompositorManager = nullptr;
   mSelfRef = nullptr;
 }