review fixes

build-system/global-configs/experiments-const.json

@@ -1,6 +1,6 @@
 {
   "BENTO_AUTO_UPGRADE": false,
   "INI_LOAD_INOB": false,
-  "V1_IMG_VIDEO": false,
+  "V1_IMG_DEFERRED_BUILD": false,
   "WITHIN_VIEWPORT_INOB": false
 }

builtins/amp-img.js

@@ -48,7 +48,7 @@ const ATTRIBUTES_TO_PROPAGATE = [
 export class AmpImg extends BaseElement {
   /** @override @nocollapse */
   static V1() {
-    return V1_IMG_VIDEO;
+    return V1_IMG_DEFERRED_BUILD;
   }
 
   /** @override @nocollapse */
@@ -340,7 +340,7 @@ export class AmpImg extends BaseElement {
 
   /** @override */
   unlayoutCallback() {
-    if (!AmpImg.V1()) {
+    if (AmpImg.V1()) {
       return;
     }
 

src/service/builder.js

@@ -127,7 +127,12 @@ export class Builder {
   /** @private */
   docVisibilityChanged_() {
     const vs = this.ampdoc_.getVisibilityState();
-    if (vs != VisibilityState.PAUSED && vs != VisibilityState.INACTIVE) {
+    if (
+      (vs =
+        VisibilityState.VISIBLE ||
+        vs == VisibilityState.HIDDEN ||
+        vs == VisibilityState.PRERENDER)
+    ) {
       this.targets_.forEach((_, target) => this.maybeBuild_(target));
     }
   }
@@ -138,8 +143,10 @@ export class Builder {
    */
   waitParsing_(target) {
     const parsingTargets = this.parsingTargets_;
-    if (parsingTargets && !parsingTargets.includes(target)) {
-      parsingTargets.push(target);
+    if (parsingTargets) {
+      if (!parsingTargets.includes(target)) {
+        parsingTargets.push(target);
+      }
       this.checkParsing_();
     } else {
       this.maybeBuild_(target);

testing/intersection-observer-stub.js

@@ -24,6 +24,10 @@ export function installIntersectionObserverStub(sandbox, win) {
 }
 
 class IntersectionObservers {
+  /**
+   * @param {!Object} sandbox
+   * @param {!Window} win
+   */
   constructor(sandbox, win) {
     const observers = new Set();
     this.observers = observers;
@@ -37,16 +41,19 @@ class IntersectionObservers {
     });
   }
 
+  /**
+   * @param {!Element} target
+   * @return {boolean}
+   */
   isObserved(target) {
-    let found = false;
-    this.observers.forEach((observer) => {
-      if (observer.elements.has(target)) {
-        found = true;
-      }
-    });
-    return found;
+    return Array.from(this.observers).some((observer) =>
+      observer.elements.has(target)
+    );
   }
 
+  /**
+   * @param {!IntersectionObserverEntry|!Array<IntersectionObserverEntry>} entryOrEntries
+   */
   notifySync(entryOrEntries) {
     const entries = Array.isArray(entryOrEntries)
       ? entryOrEntries
@@ -74,10 +81,16 @@ class IntersectionObserverStub {
     onDisconnect();
   }
 
+  /**
+   * @param {!Element} element
+   */
   observe(element) {
     this.elements.add(element);
   }
 
+  /**
+   * @param {!Element} element
+   */
   unobserve(element) {
     this.elements.delete(element);
   }