Bug 1230149 - check bigImgIter to see if it's not null. r=jmuizelaar
authorBogdan Postelnicu <bogdan.postelnicu>
Thu, 03 Dec 2015 06:46:00 +0100
changeset 275885 ecdefe80c366986377373daed8b21cafc147a477
parent 275884 3394473d21016267c9f430a269c209cf623646bd
child 275886 1208659f1a9710806b9348d3c0ba624c7819f2a8
push id68971
push usercbook@mozilla.com
push dateTue, 08 Dec 2015 08:50:40 +0000
treeherdermozilla-inbound@1208659f1a97 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmuizelaar
bugs1230149
milestone45.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
Bug 1230149 - check bigImgIter to see if it's not null. r=jmuizelaar
gfx/layers/composite/ContentHost.cpp
--- a/gfx/layers/composite/ContentHost.cpp
+++ b/gfx/layers/composite/ContentHost.cpp
@@ -127,17 +127,17 @@ ContentHostTexture::Composite(LayerCompo
                "Tile count mismatch on component alpha texture");
     if (iterOnWhite) {
       iterOnWhite->BeginBigImageIteration();
     }
   }
 
   bool usingTiles = (bigImgIter && bigImgIter->GetTileCount() > 1);
   do {
-    if (iterOnWhite) {
+    if (iterOnWhite && bigImgIter) {
       MOZ_ASSERT(iterOnWhite->GetTileRect() == bigImgIter->GetTileRect(),
                  "component alpha textures should be the same size.");
     }
 
     IntRect texRect = bigImgIter ? bigImgIter->GetTileRect()
                                  : IntRect(0, 0,
                                              texSize.width,
                                              texSize.height);