Bug 1294133 - Null check animated geometry root. r=mattwoodrow, a=gchang
authorTimothy Nikkel <tnikkel@gmail.com>
Thu, 11 Aug 2016 00:52:56 -0500
changeset 340327 03f719460bcc544ed0b48332f3babddc9a5c3ae4
parent 340326 81b1e4ba20f2aae574b8661909fe517ebfefa008
child 340328 3771c735e94512db676211ac6461c19d22365daa
push id6306
push userryanvm@gmail.com
push dateTue, 16 Aug 2016 15:01:52 +0000
treeherdermozilla-beta@03f719460bcc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow, gchang
bugs1294133
milestone49.0
Bug 1294133 - Null check animated geometry root. r=mattwoodrow, a=gchang
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2183,17 +2183,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