intersect-resources: Fix bad devAssert (#27737)

* Print 'force remeasure' for dev, enable in canary. * Fix bad assert. * Revert canary config. * Oops.
ampproject · Apr 14, 2020 · 3a2059b · 3a2059b
1 parent c083d2c
commit 3a2059b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/service/resource.js b/src/service/resource.js
@@ -678,7 +678,7 @@ export class Resource {
    * @return {boolean}
    */
   isDisplayed(usePremeasuredRect = false) {
-    devAssert(!usePremeasuredRect || !this.intersect_);
+    devAssert(!usePremeasuredRect || this.intersect_);
     const isFluid = this.element.getLayout() == Layout.FLUID;
     const box = usePremeasuredRect
       ? devAssert(this.premeasuredRect_)

diff --git a/src/service/resources-impl.js b/src/service/resources-impl.js
@@ -1195,9 +1195,12 @@ export class ResourcesImpl {
         }
         // Difference: if we have a "premeasured" client rect, consume it
         // as the element's new measurements even if the element isn't built.
+        const requested = r.isMeasureRequested();
+        if (requested) {
+          dev().fine(TAG_, 'force remeasure:', r.debugid);
+        }
         const premeasured = r.hasBeenPremeasured();
-        const needsMeasure =
-          premeasured || this.relayoutAll_ || r.isMeasureRequested();
+        const needsMeasure = premeasured || requested || this.relayoutAll_;
         if (needsMeasure) {
           const isDisplayed = this.measureResource_(
             r,