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 347677 3776dd28c3cb1c70c8626c31291a01dffdae0b3b
parent 347676 0ccf48273f8e8a882a9776b467a6b3c6d6dc5bd0
child 347678 8b47af8a1ad296295a0f9bfb61d6280265a5f109
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow, gchang
bugs1294133
milestone50.0a2
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
@@ -2187,17 +2187,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