resources: remove intersect-resources experiment

build-system/global-configs/canary-config.json

@@ -10,7 +10,6 @@
   "dfp-render-on-idle-cwv-exp": 1,
   "expand-json-targeting": 1,
   "flexAdSlots": 0.05,
-  "intersect-resources": 0,
   "ios-fixed-no-transfer": 1,
   "visibility-trigger-improvements": 1,
   "ads-initialIntersection": 1,

build-system/global-configs/prod-config.json

@@ -9,7 +9,6 @@
   "doubleclickSraReportExcludedBlock": 0.1,
   "expand-json-targeting": 1,
   "flexAdSlots": 0.05,
-  "intersect-resources": 0,
   "ios-fixed-no-transfer": 0,
   "visibility-trigger-improvements": 1,
   "layout-aspect-ratio-css": 0,

src/inabox/inabox-resources.js

@@ -201,11 +201,6 @@ export class InaboxResources {
     return this.firstPassDone_.promise;
   }
 
-  /** @override */
-  isIntersectionExperimentOn() {
-    return false;
-  }
-
   /**
    * @private
    */

src/service/mutator-impl.js

@@ -58,9 +58,6 @@ export class MutatorImpl {
     this.activeHistory_.onFocus((element) => {
       this.checkPendingChangeSize_(element);
     });
-
-    /** @private @const {boolean} */
-    this.intersect_ = this.resources_.isIntersectionExperimentOn();
   }
 
   /** @override */
@@ -129,16 +126,12 @@ export class MutatorImpl {
 
   /** @override */
   collapseElement(element) {
-    // With IntersectionObserver, no need to relayout or remeasure
-    // due to a single element collapse (similar to "relayout top").
-    if (!this.intersect_) {
-      const box = this.viewport_.getLayoutRect(element);
-      if (box.width != 0 && box.height != 0) {
-        if (isExperimentOn(this.win, 'dirty-collapse-element')) {
-          this.dirtyElement(element);
-        } else {
-          this.resources_.setRelayoutTop(box.top);
-        }
+    const box = this.viewport_.getLayoutRect(element);
+    if (box.width != 0 && box.height != 0) {
+      if (isExperimentOn(this.win, 'dirty-collapse-element')) {
+        this.dirtyElement(element);
+      } else {
+        this.resources_.setRelayoutTop(box.top);
       }
     }
 
@@ -147,9 +140,7 @@ export class MutatorImpl {
 
     // Unlike completeExpand(), there's no requestMeasure() call here that
     // requires another pass (with IntersectionObserver).
-    if (!this.intersect_) {
-      this.resources_.schedulePass(FOUR_FRAME_DELAY_);
-    }
+    this.resources_.schedulePass(FOUR_FRAME_DELAY_);
   }
 
   /** @override */
@@ -217,9 +208,8 @@ export class MutatorImpl {
         if (measurer) {
           measurer();
         }
-        // With IntersectionObserver, "relayout top" is no longer needed since
-        // relative positional changes won't affect correctness.
-        if (!this.intersect_ && !skipRemeasure) {
+
+        if (!skipRemeasure) {
           relayoutTop = calcRelayoutTop();
         }
       },
@@ -243,12 +233,6 @@ export class MutatorImpl {
         }
         this.resources_.schedulePass(FOUR_FRAME_DELAY_);
 
-        // With IntersectionObserver, no need to set relayout top.
-        if (this.intersect_) {
-          this.resources_.maybeHeightChanged();
-          return;
-        }
-
         if (relayoutTop != -1) {
           this.resources_.setRelayoutTop(relayoutTop);
         }
@@ -279,7 +263,6 @@ export class MutatorImpl {
    * @param {!Element} element
    */
   dirtyElement(element) {
-    devAssert(!this.intersect_);
     let relayoutAll = false;
     const isAmpElement = element.classList.contains('i-amphtml-element');
     if (isAmpElement) {

src/service/resource.js

@@ -222,9 +222,6 @@ export class Resource {
     /** @private {?Function} */
     this.loadPromiseResolve_ = deferred.resolve;
 
-    /** @const @private {boolean} */
-    this.intersect_ = resources.isIntersectionExperimentOn();
-
     // TODO(#30620): remove isInViewport_ and whenWithinViewport.
     /** @const @private {boolean} */
     this.isInViewport_ = false;
@@ -344,20 +341,7 @@ export class Resource {
     return this.element.buildInternal().then(
       () => {
         this.isBuilding_ = false;
-        // With IntersectionObserver, measure can happen before build
-        // so check if we're "ready for layout" (measured and built) here.
-        if (this.intersect_ && this.hasBeenMeasured()) {
-          this.state_ = ResourceState.READY_FOR_LAYOUT;
-          // The InOb premeasurement couldn't account for fixed position since
-          // implementation wasn't loaded yet. Perform a remeasure now that we know it
-          // is fixed.
-          if (this.element.isAlwaysFixed() && !this.isFixed_) {
-            this.requestMeasure();
-          }
-          this.element.onMeasure(/* sizeChanged */ true);
-        } else {
-          this.state_ = ResourceState.NOT_LAID_OUT;
-        }
+        this.state_ = ResourceState.NOT_LAID_OUT;
         // TODO(dvoytenko): merge with the standard BUILT signal.
         this.element.signals().signal('res-built');
       },
@@ -443,16 +427,6 @@ export class Resource {
     return this.element.getUpgradeDelayMs();
   }
 
-  /**
-   * Stores a client rect that was "premeasured" by an IntersectionObserver.
-   * Should only be used in IntersectionObserver mode.
-   * @param {!ClientRect} clientRect
-   */
-  premeasure(clientRect) {
-    devAssert(this.intersect_);
-    this.premeasuredRect_ = clientRect;
-  }
-
   /** Removes the premeasured rect, likely forcing a manual measure. */
   invalidatePremeasurementAndRequestMeasure() {
     this.premeasuredRect_ = null;
@@ -631,14 +605,6 @@ export class Resource {
     return !!this.initialLayoutBox_;
   }
 
-  /**
-   * @return {boolean}
-   */
-  hasBeenPremeasured() {
-    devAssert(this.intersect_);
-    return !!this.premeasuredRect_;
-  }
-
   /**
    * Requests the element to be remeasured on the next pass.
    */
@@ -689,21 +655,16 @@ export class Resource {
   /**
    * Whether the resource is displayed, i.e. if it has non-zero width and
    * height.
-   * @param {boolean} usePremeasuredRect If true and a premeasured rect is
-   *     available, use it. Otherwise, use the cached layout box.
    * @return {boolean}
    */
-  isDisplayed(usePremeasuredRect = false) {
+  isDisplayed() {
     const isConnected =
       this.element.ownerDocument && this.element.ownerDocument.defaultView;
     if (!isConnected) {
       return false;
     }
-    devAssert(!usePremeasuredRect || this.intersect_);
     const isFluid = this.element.getLayout() == Layout.FLUID;
-    const box = usePremeasuredRect
-      ? devAssert(this.premeasuredRect_)
-      : this.getLayoutBox();
+    const box = this.getLayoutBox();
     const hasNonZeroSize = box.height > 0 && box.width > 0;
     return isFluid || hasNonZeroSize;
   }
@@ -885,13 +846,9 @@ export class Resource {
    * Undoes `layoutScheduled`.
    */
   layoutCanceled() {
-    if (this.intersect_) {
-      this.state_ = ResourceState.READY_FOR_LAYOUT;
-    } else {
-      this.state_ = this.hasBeenMeasured()
-        ? ResourceState.READY_FOR_LAYOUT
-        : ResourceState.NOT_LAID_OUT;
-    }
+    this.state_ = this.hasBeenMeasured()
+      ? ResourceState.READY_FOR_LAYOUT
+      : ResourceState.NOT_LAID_OUT;
   }
 
   /**
@@ -1064,13 +1021,7 @@ export class Resource {
     this.setInViewport(false);
     if (this.element.unlayoutCallback()) {
       this.element.togglePlaceholder(true);
-      // With IntersectionObserver, the element won't receive another
-      // measurement if/when the document becomes active again.
-      // Therefore, its post-unlayout state must be READY_FOR_LAYOUT
-      // (built and measured) to become eligible for relayout later.
-      this.state_ = this.intersect_
-        ? ResourceState.READY_FOR_LAYOUT
-        : ResourceState.NOT_LAID_OUT;
+      this.state_ = ResourceState.NOT_LAID_OUT;
       this.layoutCount_ = 0;
       this.layoutPromise_ = null;
     }