Backed out changeset 4d417e2c21ff (bug 1265468) for asserting in LayerManagerComposite.cpp on OS X 10.10 debug with e10s. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 26 May 2016 10:45:39 +0200
changeset 299115 df861a9e766d0beb9daeeb192bf5b6f4cfeb3f02
parent 299114 1743abeb235253d455700289308b125e4de75483
child 299116 316d1c40f0fcf9c158cd3fcc8a86c7fdd0c76f59
push id77439
push userarchaeopteryx@coole-files.de
push dateThu, 26 May 2016 08:45:55 +0000
treeherdermozilla-inbound@df861a9e766d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1265468
milestone49.0a1
backs out4d417e2c21ff9a33aee9e53fd7ec7a8e3d96ec60
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 4d417e2c21ff (bug 1265468) for asserting in LayerManagerComposite.cpp on OS X 10.10 debug with e10s. r=backout
gfx/layers/composite/ContainerLayerComposite.h
gfx/layers/ipc/CompositorBridgeParent.cpp
gfx/layers/opengl/CompositorOGL.cpp
layout/ipc/RenderFrameParent.cpp
--- a/gfx/layers/composite/ContainerLayerComposite.h
+++ b/gfx/layers/composite/ContainerLayerComposite.h
@@ -63,17 +63,16 @@ protected:
 public:
   // LayerComposite Implementation
   virtual Layer* GetLayer() override { return this; }
 
   virtual void SetLayerManager(LayerManagerComposite* aManager) override
   {
     LayerComposite::SetLayerManager(aManager);
     mManager = aManager;
-    mLastIntermediateSurface = nullptr;
 
     for (Layer* l = GetFirstChild(); l; l = l->GetNextSibling()) {
       LayerComposite* child = l->AsLayerComposite();
       child->SetLayerManager(aManager);
     }
   }
 
   virtual void Destroy() override;
--- a/gfx/layers/ipc/CompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -1632,16 +1632,19 @@ CompositorBridgeParent::RecvAdoptChild(c
 {
   RefPtr<GeckoContentController> controller;
   {
     MonitorAutoLock lock(*sIndirectLayerTreesLock);
     NotifyChildCreated(child);
     if (sIndirectLayerTrees[child].mLayerTree) {
       sIndirectLayerTrees[child].mLayerTree->mLayerManager = mLayerManager;
     }
+    if (sIndirectLayerTrees[child].mRoot) {
+      sIndirectLayerTrees[child].mRoot->AsLayerComposite()->SetLayerManager(mLayerManager);
+    }
     controller = sIndirectLayerTrees[child].mController;
   }
 
   // Calling ChildAdopted on controller will acquire a lock, to avoid a
   // potential deadlock between that lock and sIndirectLayerTreesLock we
   // release sIndirectLayerTreesLock first before calling ChildAdopted.
   if (mApzcTreeManager && controller) {
     controller->ChildAdopted();
--- a/gfx/layers/opengl/CompositorOGL.cpp
+++ b/gfx/layers/opengl/CompositorOGL.cpp
@@ -1000,18 +1000,16 @@ CompositorOGL::DrawQuad(const Rect& aRec
   MOZ_ASSERT(mFrameInProgress, "frame not started");
   MOZ_ASSERT(mCurrentRenderTarget, "No destination");
 
   if (aEffectChain.mPrimaryEffect->mType == EffectTypes::VR_DISTORTION) {
     DrawVRDistortion(aRect, aClipRect, aEffectChain, aOpacity, aTransform);
     return;
   }
 
-  MakeCurrent();
-
   IntPoint offset = mCurrentRenderTarget->GetOrigin();
   IntSize size = mCurrentRenderTarget->GetSize();
 
   Rect renderBound(0, 0, size.width, size.height);
   renderBound.IntersectRect(renderBound, Rect(aClipRect));
   renderBound.MoveBy(offset);
 
   Rect destRect = aTransform.TransformAndClipBounds(aRect, renderBound);
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -207,17 +207,16 @@ RenderFrameParent::OwnerContentChanged(n
 {
   MOZ_ASSERT(!mFrameLoader || mFrameLoader->GetOwnerContent() == aContent,
              "Don't build new map if owner is same!");
 
   RefPtr<LayerManager> lm = mFrameLoader ? GetFrom(mFrameLoader) : nullptr;
   // Perhaps the document containing this frame currently has no presentation?
   if (lm && lm->AsClientLayerManager()) {
     lm->AsClientLayerManager()->GetRemoteRenderer()->SendAdoptChild(mLayersId);
-    FrameLayerBuilder::InvalidateAllLayers(lm);
   }
 }
 
 void
 RenderFrameParent::ActorDestroy(ActorDestroyReason why)
 {
   if (mLayersId != 0) {
     if (XRE_IsParentProcess()) {