Bug 1356262 - Don't assert if we get a GPU reset while a content process has a BasicLayerManager. r?dvander draft
authorKartikaya Gupta <kgupta@mozilla.com>
Thu, 13 Apr 2017 11:32:22 -0400
changeset 562169 ec01dc8e90eb3d7fe90bef6f899c31e6d95a6ce1
parent 562168 ec0e2532c1b00acee8852611a9e4d543ae41c9cb
child 624191 14db883586865119d99def1af267fb34ab80d4c2
push id53974
push userkgupta@mozilla.com
push dateThu, 13 Apr 2017 15:33:18 +0000
reviewersdvander
bugs1356262
milestone55.0a1
Bug 1356262 - Don't assert if we get a GPU reset while a content process has a BasicLayerManager. r?dvander MozReview-Commit-ID: HAUP4XsnuQY
dom/ipc/TabChild.cpp
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -3051,18 +3051,20 @@ TabChild::ClearCachedResources()
   mPuppetWidget->GetLayerManager()->ClearCachedResources();
 }
 
 void
 TabChild::InvalidateLayers()
 {
   MOZ_ASSERT(mPuppetWidget);
   MOZ_ASSERT(mPuppetWidget->GetLayerManager());
-  MOZ_ASSERT(mPuppetWidget->GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_CLIENT
-             || mPuppetWidget->GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_WR);
+  DebugOnly<LayersBackend> backend = mPuppetWidget->GetLayerManager()->GetBackendType();
+  MOZ_ASSERT(backend == LayersBackend::LAYERS_CLIENT ||
+             backend == LayersBackend::LAYERS_WR ||
+             backend == LayersBackend::LAYERS_BASIC);
 
   RefPtr<LayerManager> lm = mPuppetWidget->GetLayerManager();
   FrameLayerBuilder::InvalidateAllLayers(lm);
 }
 
 void
 TabChild::ReinitRendering()
 {