Ensure added code only runs when using a Compositor, not in e10s.
authorAli Juma <ajuma@mozilla.com>
Thu, 15 Dec 2011 16:16:38 -0500
changeset 89014 17e4dbb62bbeed7a7d54b38f2ecbd95b51d87fdc
parent 89013 ac3508466177cebca2b38377b1d6fa80835a45ef
child 89015 df720caee3c59c528aee6e3cd6017836c5c07cd1
push id22242
push userkgupta@mozilla.com
push dateWed, 14 Mar 2012 15:19:09 +0000
treeherdermozilla-central@936ef50fa498 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone11.0a1
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
Ensure added code only runs when using a Compositor, not in e10s.
gfx/layers/ipc/ShadowLayersParent.cpp
--- a/gfx/layers/ipc/ShadowLayersParent.cpp
+++ b/gfx/layers/ipc/ShadowLayersParent.cpp
@@ -282,17 +282,19 @@ ShadowLayersParent::RecvUpdate(const Inf
       break;
     }
 
       // Tree ops
     case Edit::TOpSetRoot: {
       MOZ_LAYERS_LOG(("[ParentSide] SetRoot"));
 
       mRoot = AsShadowLayer(edit.get_OpSetRoot())->AsContainer();
-      mLayerManager->SetRoot(mRoot);
+      if (mHost->GetCompositorParent()) {
+        mLayerManager->SetRoot(mRoot);
+      }
       break;
     }
     case Edit::TOpInsertAfter: {
       MOZ_LAYERS_LOG(("[ParentSide] InsertAfter"));
 
       const OpInsertAfter& oia = edit.get_OpInsertAfter();
       ShadowContainer(oia)->AsContainer()->InsertAfter(
         ShadowChild(oia)->AsLayer(), ShadowAfter(oia)->AsLayer());