mozilla-inbound: changeset 321568:1d01138a95d9607d534808bc47eba1bc70f0f9fb

author	Milan Sreckovic <milan@mozilla.com>
	Mon, 07 Nov 2016 13:06:01 -0500
changeset 321568	1d01138a95d9607d534808bc47eba1bc70f0f9fb
parent 321567	2a77ca1fae251af0e4600c43c07912fcdb6dc071
child 321569	0440791609bd3a6f4b525f8ab754518573de1a3f
push id	83647
push user	kwierso@gmail.com
push date	Tue, 08 Nov 2016 22:08:41 +0000
treeherder	mozilla-inbound@1d0b02250149 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	gw280
bugs	1315651
milestone	52.0a1
first release with	nightly linux32 783356f1476e / 52.0a1 / 20161109030210 / files nightly linux64 783356f1476e / 52.0a1 / 20161109030210 / files nightly mac 783356f1476e / 52.0a1 / 20161109030210 / files nightly win32 783356f1476e / 52.0a1 / 20161109030210 / files nightly win64 783356f1476e / 52.0a1 / 20161109030210 / files
last release without	nightly linux32 908557c762f7 / 52.0a1 / 20161107030203 / files nightly linux64 908557c762f7 / 52.0a1 / 20161107030203 / files nightly mac 908557c762f7 / 52.0a1 / 20161107030203 / files nightly win32 908557c762f7 / 52.0a1 / 20161107030203 / files nightly win64 908557c762f7 / 52.0a1 / 20161107030203 / files

--- a/dom/html/HTMLCanvasElement.cpp
+++ b/dom/html/HTMLCanvasElement.cpp
@@ -1299,17 +1299,19 @@ HTMLCanvasElement::GetAsyncCanvasRendere
 }
 
 layers::LayersBackend
 HTMLCanvasElement::GetCompositorBackendType() const
 {
   nsIWidget* docWidget = nsContentUtils::WidgetForDocument(OwnerDoc());
   if (docWidget) {
     layers::LayerManager* layerManager = docWidget->GetLayerManager();
-    return layerManager->GetCompositorBackendType();
+    if (layerManager) {
+      return layerManager->GetCompositorBackendType();
+    }
   }
 
   return LayersBackend::LAYERS_NONE;
 }
 
 void
 HTMLCanvasElement::OnVisibilityChange()
 {