Bug 1548483 - Don't assert that we have an invalidated frame when we encouter a new displayport, since it can have changed on an earlier paint if we didn't have display items. r=tnikkel
authorMatt Woodrow <mwoodrow@mozilla.com>
Mon, 06 May 2019 09:13:00 +0000
changeset 531594 ea3a73c7788e2b9752d7f00976c8119183e3da18
parent 531593 ef8c4674d0b0f402b5ca674300e239b196b0becd
child 531595 5d97da3c65b5376c9bc6df4add1646fc63937693
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstnikkel
bugs1548483
milestone68.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 1548483 - Don't assert that we have an invalidated frame when we encouter a new displayport, since it can have changed on an earlier paint if we didn't have display items. r=tnikkel Differential Revision: https://phabricator.services.mozilla.com/D29975
layout/generic/nsGfxScrollFrame.cpp
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -3926,20 +3926,16 @@ bool ScrollFrameHelper::DecideScrollable
   // so that APZ can implement scroll grabbing.
   mWillBuildScrollableLayer =
       usingDisplayPort || nsContentUtils::HasScrollgrab(content);
 
   // The cached animated geometry root for the display builder is out of
   // date if we just introduced a new animated geometry root.
   if (oldWillBuildScrollableLayer != mWillBuildScrollableLayer) {
     aBuilder->RecomputeCurrentAnimatedGeometryRoot();
-    MOZ_DIAGNOSTIC_ASSERT(!aBuilder->IsPartialUpdate() ||
-                              aBuilder->InInvalidSubtree() ||
-                              mOuter->IsFrameModified(),
-                          "Displayport changed without an invalidation");
   }
 
   mIsScrollableLayerInRootContainer =
       gfxPrefs::LayoutUseContainersForRootFrames() &&
       mWillBuildScrollableLayer && mIsRoot;
   return mWillBuildScrollableLayer;
 }