mozilla-central: changeset 210840:cbf06fe7f47a049662b813109522b64198da7362

author	Nicholas Nethercote <nnethercote@mozilla.com>
	Thu, 16 Oct 2014 19:02:51 -0700
changeset 210840	cbf06fe7f47a049662b813109522b64198da7362
parent 210839	35da3c99e658095b737623ab8e543fb740f872a4
child 210841	83544b7dad714d493bb3a044a50a170e055185e0
push id	27661
push user	cbook@mozilla.com
push date	Fri, 17 Oct 2014 14:25:58 +0000
treeherder	mozilla-central@4e9c5f29fc5e [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bas
bugs	1083624
milestone	36.0a1
first release with	nightly linux32 92c87e95915e / 36.0a1 / 20141018030201 / files nightly linux64 92c87e95915e / 36.0a1 / 20141018030201 / files nightly mac 92c87e95915e / 36.0a1 / 20141018030201 / files nightly win32 92c87e95915e / 36.0a1 / 20141018030201 / files nightly win64 92c87e95915e / 36.0a1 / 20141018030201 / files
last release without	nightly linux32 a280a03c9f3c / 36.0a1 / 20141016030201 / files nightly linux64 a280a03c9f3c / 36.0a1 / 20141016030201 / files nightly mac a280a03c9f3c / 36.0a1 / 20141016030201 / files nightly win32 a280a03c9f3c / 36.0a1 / 20141016030201 / files nightly win64 a280a03c9f3c / 36.0a1 / 20141016030201 / files

--- a/gfx/2d/Factory.cpp
+++ b/gfx/2d/Factory.cpp
@@ -543,21 +543,22 @@ Factory::SetDirect3D10Device(ID3D10Devic
   // On Windows 8 error codes are the default, but on Windows 7 the
   // default is to throw (or perhaps only with some drivers?)
   aDevice->SetExceptionMode(0);
   mD3D10Device = aDevice;
 }
 
 ID3D10Device1*
 Factory::GetDirect3D10Device()
-
 {
 #ifdef DEBUG
-  UINT mode = mD3D10Device->GetExceptionMode();
-  MOZ_ASSERT(0 == mode);
+  if (mD3D10Device) {
+    UINT mode = mD3D10Device->GetExceptionMode();
+    MOZ_ASSERT(0 == mode);
+  }
 #endif
   return mD3D10Device;
 }
 
 #ifdef USE_D2D1_1
 TemporaryRef<DrawTarget>
 Factory::CreateDrawTargetForD3D11Texture(ID3D11Texture2D *aTexture, SurfaceFormat aFormat)
 {