Handle failed SendPCompositable. (bug 1313770 part 4, r=mattwoodrow)
authorDavid Anderson <danderson@mozilla.com>
Fri, 28 Oct 2016 15:48:35 -0700
changeset 320096 d2f30ab32eceb03b2e2d55aed36711c94f894c58
parent 320095 a8e078e03894e144487e04d0eef507def1a0d50d
child 320097 b555a8f33edb7ac95555ab341d5b8281ae5b234f
push id20749
push userryanvm@gmail.com
push dateSat, 29 Oct 2016 13:21:21 +0000
treeherderfx-team@1b170b39ed6b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow
bugs1313770
milestone52.0a1
Handle failed SendPCompositable. (bug 1313770 part 4, r=mattwoodrow)
gfx/layers/ipc/ShadowLayers.cpp
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -770,17 +770,19 @@ ShadowLayerForwarder::Connect(Compositab
 #endif
   MOZ_ASSERT(aCompositable);
   MOZ_ASSERT(mShadowManager);
   if (!IPCOpen()) {
     return;
   }
   PCompositableChild* actor =
     mShadowManager->SendPCompositableConstructor(aCompositable->GetTextureInfo());
-  MOZ_ASSERT(actor);
+  if (!actor) {
+    return;
+  }
   aCompositable->InitIPDLActor(actor);
 }
 
 void ShadowLayerForwarder::Attach(CompositableClient* aCompositable,
                                   ShadowableLayer* aLayer)
 {
   MOZ_ASSERT(aLayer);
   MOZ_ASSERT(aCompositable);