Bug 1294133. Null check animated geometry root. r=mattwoodrow
authorTimothy Nikkel <tnikkel@gmail.com>
Thu, 11 Aug 2016 00:52:56 -0500
changeset 309119 0bd27824832d4213a90ec0ef08de422b33589358
parent 309118 b8117f4a3659120291ecbfcc07650fed632dda02
child 309120 422dd7521fa3e2d1712b5b011fc978e7d9e3cddd
push id30557
push userkwierso@gmail.com
push dateFri, 12 Aug 2016 20:45:15 +0000
treeherdermozilla-central@ef3a50774180 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow
bugs1294133
milestone51.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 1294133. Null check animated geometry root. r=mattwoodrow
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2192,17 +2192,17 @@ ContainerState::GetLayerCreationHint(Ani
   // Check creation hint inherited from our parent.
   if (mParameters.mLayerCreationHint == LayerManager::SCROLLABLE) {
     return LayerManager::SCROLLABLE;
   }
 
   // Check whether there's any active scroll frame on the animated geometry
   // root chain.
   for (AnimatedGeometryRoot* agr = aAnimatedGeometryRoot;
-       agr != mContainerAnimatedGeometryRoot;
+       agr && agr != mContainerAnimatedGeometryRoot;
        agr = agr->mParentAGR) {
     nsIFrame* fParent = nsLayoutUtils::GetCrossDocParentFrame(*agr);
     if (!fParent) {
       break;
     }
     nsIScrollableFrame* scrollable = do_QueryFrame(fParent);
     if (scrollable
   #ifdef MOZ_B2G