From 66180dc4c1d2d3ee6eea0922a3a9f6d64be2e300 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Thu, 21 Mar 2013 16:27:02 +1300
Subject: [PATCH] Bug 822086 - Handle a nullptr ContainerLayer in
 nsDisplayTransform::BuildLayer. r=bustage CLOSED TREE

---
 layout/base/nsDisplayList.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 34760f08057..54027722c2e 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -4019,6 +4019,10 @@ already_AddRefed<Layer> nsDisplayTransform::BuildLayer(nsDisplayListBuilder *aBu
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, *mStoredList.GetChildren(),
                            aContainerParameters, &newTransformMatrix);
 
+  if (!container) {
+    return nullptr;
+  }
+
   // Add the preserve-3d flag for this layer, BuildContainerLayerFor clears all flags,
   // so we never need to explicitely unset this flag.
   if (mFrame->Preserves3D() || mFrame->Preserves3DChildren()) {