diff --git a/ads/google/a4a/utils.js b/ads/google/a4a/utils.js index e7a519a27ef2..5ef0fc00092e 100644 --- a/ads/google/a4a/utils.js +++ b/ads/google/a4a/utils.js @@ -47,13 +47,6 @@ const AmpAdImplementation = { AMP_AD_IFRAME_GET: '5', }; -/** @const {!{id: string, control: string, experiment: string}} */ -export const RENDER_ON_IDLE_FIX_EXP = { - id: 'render-on-idle-fix', - control: '21066311', - experiment: '21066312', -}; - /** @const {!{id: string, control: string, experiment: string}} */ export const STICKY_AD_PADDING_BOTTOM_EXP = { id: 'sticky-ad-padding-bottom', diff --git a/build-system/global-configs/prod-config.json b/build-system/global-configs/prod-config.json index fd5549bbbcc7..f5f653eae3e6 100644 --- a/build-system/global-configs/prod-config.json +++ b/build-system/global-configs/prod-config.json @@ -36,6 +36,5 @@ "version-locking": 1, "amp-ad-no-center-css": 0, "analytics-chunks": 1, - "sticky-ad-padding-bottom": 1, - "render-on-idle-fix": 1 + "sticky-ad-padding-bottom": 1 } diff --git a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js index 0d779f627b7f..fd5f1cde7fa2 100644 --- a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js +++ b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js @@ -26,7 +26,6 @@ import {CONSENT_POLICY_STATE} from '../../../src/consent-state'; import {Navigation} from '../../../src/service/navigation'; import { QQID_HEADER, - RENDER_ON_IDLE_FIX_EXP, SANDBOX_HEADER, STICKY_AD_PADDING_BOTTOM_EXP, ValidAdContainerTypes, @@ -222,14 +221,6 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A { */ divertExperiments() { const experimentInfoList = /** @type {!Array} */ ([ - { - experimentId: RENDER_ON_IDLE_FIX_EXP.id, - isTrafficEligible: () => true, - branches: [ - RENDER_ON_IDLE_FIX_EXP.control, - RENDER_ON_IDLE_FIX_EXP.experiment, - ], - }, { experimentId: NO_SIGNING_EXP.id, isTrafficEligible: () => true, diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js index c634664ee01a..61f25122fe0d 100644 --- a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js +++ b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js @@ -32,7 +32,6 @@ import { import { AmpAnalyticsConfigDef, QQID_HEADER, - RENDER_ON_IDLE_FIX_EXP, SANDBOX_HEADER, STICKY_AD_PADDING_BOTTOM_EXP, ValidAdContainerTypes, @@ -429,14 +428,6 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A { isTrafficEligible: () => true, branches: Object.values(ZINDEX_EXP_BRANCHES), }, - { - experimentId: RENDER_ON_IDLE_FIX_EXP.id, - isTrafficEligible: () => true, - branches: [ - RENDER_ON_IDLE_FIX_EXP.control, - RENDER_ON_IDLE_FIX_EXP.experiment, - ], - }, { experimentId: NO_SIGNING_EXP.id, isTrafficEligible: () => true, diff --git a/src/service/resources-impl.js b/src/service/resources-impl.js index 5fbc91a5fab3..24e7e347c478 100644 --- a/src/service/resources-impl.js +++ b/src/service/resources-impl.js @@ -26,17 +26,13 @@ import {VisibilityState} from '../visibility-state'; import {dev, devAssert} from '../log'; import {dict} from '../utils/object'; import {expandLayoutRect} from '../layout-rect'; -import { - getExperimentBranch, - isExperimentOn, - randomlySelectUnsetExperiments, -} from '../experiments'; import {getMode} from '../mode'; import {getSourceUrl} from '../url'; import {hasNextNodeInDocumentOrder, isIframed} from '../dom'; import {ieIntrinsicCheckAndFix} from './ie-intrinsic-bug'; import {ieMediaCheckAndFix} from './ie-media-bug'; import {isBlockedByConsent, reportError} from '../error'; +import {isExperimentOn} from '../experiments'; import {listen, loadPromise} from '../event-helper'; import {registerServiceBuilderForDoc} from '../service'; import {remove} from '../utils/array'; @@ -56,13 +52,6 @@ const FOCUS_HISTORY_TIMEOUT_ = 1000 * 60; // 1min const FOUR_FRAME_DELAY_ = 70; const MAX_BUILD_CHUNK_SIZE = 10; -/** @const {!{id: string, control: string, experiment: string}} */ -const RENDER_ON_IDLE_FIX_EXP = { - id: 'render-on-idle-fix', - control: '21066311', - experiment: '21066312', -}; - /** * @implements {ResourcesInterface} */ @@ -208,15 +197,9 @@ export class ResourcesImpl { /** @const @private {boolean} */ this.buildInChunks_ = isExperimentOn(this.win, 'build-in-chunks'); - /** @const @private {boolean} */ - this.renderOnIdleFix_ = isExperimentOn(this.win, 'render-on-idle-fix'); - /** @const @private {boolean} */ this.removeTaskTimeout_ = isExperimentOn(this.win, 'remove-task-timeout'); - /** @private {boolean} */ - this.divertedRenderOnIdleFixExperiment_ = false; - /** @const @private {!Deferred} */ this.firstPassDone_ = new Deferred(); @@ -1190,28 +1173,6 @@ export class ResourcesImpl { } } - /** - * Selects into an experiment for render-on-idle-fix. - * @private - */ - divertRenderOnIdleFixExperiment_() { - if (this.divertedRenderOnIdleFixExperiment_) { - return; - } - this.divertedRenderOnIdleFixExperiment_ = true; - const experimentInfoList = /** @type {!Array} */ ([ - { - experimentId: RENDER_ON_IDLE_FIX_EXP.id, - isTrafficEligible: () => true, - branches: [ - RENDER_ON_IDLE_FIX_EXP.control, - RENDER_ON_IDLE_FIX_EXP.experiment, - ], - }, - ]); - randomlySelectUnsetExperiments(this.win, experimentInfoList); - } - /** * Discovers work that needs to be done since the last pass. If viewport * has changed, it will try to build new elements, measure changed elements, @@ -1479,17 +1440,12 @@ export class ResourcesImpl { * @private */ isIdle_(now = Date.now()) { - this.divertRenderOnIdleFixExperiment_(); const lastDequeueTime = this.exec_.getLastDequeueTime(); return ( this.exec_.getSize() == 0 && this.queue_.getSize() == 0 && now > lastDequeueTime + 5000 && - (lastDequeueTime > 0 || - // TODO(powerivq): add tests for this fix once ready to launch - !this.renderOnIdleFix_ || - getExperimentBranch(this.win, RENDER_ON_IDLE_FIX_EXP.id) === - RENDER_ON_IDLE_FIX_EXP.control) + lastDequeueTime > 0 ); }