Merge latest master

Author: kristoferbaxter

.eslintrc

@@ -131,7 +131,6 @@
     "local/prefer-unnested-spread-objects": 2,
     "local/private-prop-names": 2,
     "local/query-selector": 2,
-    "local/split-single-pass-comment": 2,
     "local/todo-format": 0,
     "local/unused-private-field": 2,
     "local/vsync": 0,

.travis.yml

@@ -25,9 +25,6 @@ before_install:
 branches:
   only:
     - master
-    - release
-    - canary
-    - nightly
     - /^amp-release-.*$/
 addons:
   apt:
@@ -77,10 +74,6 @@ jobs:
       name: 'Module Dist, Bundle Size'
       script:
         - unbuffer node build-system/pr-check/module-dist-bundle-size.js
-    - stage: test
-      name: 'Single Pass Tests'
-      script:
-        - unbuffer node build-system/pr-check/single-pass-tests.js
     - stage: test
       name: 'Visual Diff Tests'
       script:

3p/README.md

@@ -58,8 +58,8 @@ Review the [ads/README](../ads/README.md) for further details on ad integration.
 - AMP allows inclusion of fonts via the `@font-face` directive.
 - JavaScript can not be involved with the initiation of font loading.
 - Font loading gets controlled (but not initiated) by [`<amp-font>`](https://github.com/ampproject/amphtml/issues/648).
-- AMP by default does not allow inclusion of external stylesheets, but it is happy to allowlist URL prefixes of font providers for font inclusion via link tags. These link tags and their fonts must be served via HTTPS.
-- If a font provider does referrer based "security" it needs to allowlist the AMP proxy origins before being included in the link tag allowlist. AMP proxy sends the appropriate referrer header such as `https://cdn.ampproject.org`.
+- AMP by default does not allow inclusion of external stylesheets, but it is happy to allow URL prefixes of font providers for font inclusion via link tags. These link tags and their fonts must be served via HTTPS.
+- If a font provider does referrer based "security" it needs to allow the AMP proxy origins before being included in the link tag allowlist. AMP proxy sends the appropriate referrer header such as `https://cdn.ampproject.org`.
 
 # Adding proper integration tests
 

3p/ampcontext.js

@@ -180,7 +180,7 @@ export class AbstractAmpContext {
   /**
    *  Requests HTML snippet from the parent window.
    *  @param {string} selector CSS selector
-   *  @param {!Array<string>} attributes allowlisted attributes to be kept
+   *  @param {!Array<string>} attributes permissible attributes to be kept
    *    in the returned HTML string
    *  @param {function(*)} callback to be invoked with the HTML string
    */

3p/embedly.js

@@ -37,7 +37,7 @@ const RESIZE_EVENT_NAME = 'card.resize';
 const CARD_CSS_CLASS = 'embedly-card';
 
 /**
- * Allowlisted card options.
+ * Allowed card options.
  *
  * - Key is in camel case as received in "data".
  * - The value is in the format expected by embedly.
@@ -81,7 +81,7 @@ export function embedly(global, data) {
   card.href = data.url;
   card.classList.add(CARD_CSS_CLASS);
 
-  // Add allowlisted data attributes and values to card
+  // Add permissible data attributes and values to card
   // when these are provided by component.
   for (const key in CardOptions) {
     if (hasOwn(CardOptions, key) && typeof data[key] !== 'undefined') {

3p/integration.js

@@ -771,13 +771,13 @@ export function validateAllowedTypes(window, type, allowedTypes) {
   }
   userAssert(
     allowedTypes && allowedTypes.indexOf(type) != -1,
-    'Non-allowlisted 3p type for custom iframe: %s',
+    '3p type for custom iframe not allowed: %s',
     type
   );
 }
 
 /**
- * Check that parent host name was allowlisted.
+ * Check that parent host name was allowed.
  * @param {!Window} window
  * @param {!Array<string>} allowedHostnames Suffixes of allowed host names.
  * @visibleForTesting
@@ -799,11 +799,11 @@ export function validateAllowedEmbeddingOrigins(window, allowedHostnames) {
       .hostname;
   }
   for (let i = 0; i < allowedHostnames.length; i++) {
-    // Either the hostname is exactly as allowlisted…
+    // Either the hostname is allowed
     if (allowedHostnames[i] == hostname) {
       return;
     }
-    // Or it ends in .$hostname (aka is a sub domain of the allowlisted domain.
+    // Or it ends in .$hostname (aka is a sub domain of an allowed domain.
     if (endsWith(hostname, '.' + allowedHostnames[i])) {
       return;
     }

ads/_a4a-config.js

@@ -44,7 +44,7 @@ export function getA4ARegistry() {
       'fake': () => true,
       // TODO: Add new ad network implementation "is enabled" functions here.
       // Note: if you add a function here that requires a new "import", above,
-      // you'll probably also need to add a allowlist exception to
+      // you'll probably also need to add an exception to
       // build-system/test-configs/dep-check-config.js in the
       // "filesMatching: 'ads/**/*.js'" rule.
     });

ads/google/a4a/traffic-experiments.js

@@ -38,16 +38,6 @@ export let A4aExperimentBranches;
 /** @type {string} @private */
 export const MANUAL_EXPERIMENT_ID = '117152632';
 
-/**
- * Experiment IDs used to identify single pass experiments.
- *
- * @enum {string}
- */
-export const SINGLE_PASS_EXPERIMENT_IDS = {
-  MULTI_PASS: '21063529',
-  SINGLE_PASS: '21063530',
-};
-
 /**
  * @param {!Window} win
  * @param {!Element} element Ad tag Element.

ads/google/utils.js

@@ -26,7 +26,11 @@ import {user} from '../../src/log';
  * Approved height for AdSense full-width responsive ads.
  * @const {number}
  */
+<<<<<<< HEAD
 export const ADSENSE_RSPV_ALLOWLISTED_HEIGHT = 320;
+=======
+export const ADSENSE_RSPV_ALLOWED_HEIGHT = 320;
+>>>>>>> 212190879e0a01fca5664ada96f05465a287de32
 
 /**
  * The attribute value for AdSense data-auto-format tag.

ads/inabox/inabox-messaging-host.js

@@ -143,7 +143,7 @@ export class InaboxMessagingHost {
       ? allowedTypes.split(/\s*,\s*/)
       : READ_ONLY_MESSAGES;
     if (allowedTypesList.indexOf(request['type']) === -1) {
-      dev().info(TAG, 'Ignored non-allowlisted message type:', message);
+      dev().info(TAG, 'Message type ignored:', message);
       return false;
     }
 
@@ -201,10 +201,10 @@ export class InaboxMessagingHost {
     source./*OK*/ postMessage(
       serializeMessage(MessageType.POSITION, request.sentinel, data),
       // We don't need to restrict what origin we send the data to because (a)
-      // we've already verified that this iframe is allowlisted and allowed to
-      // learn its position, and (b) we're post messaging back directly to the
-      // requesting frame.  If we did restrict the origin this would not work
-      // with implementations that use a null origin to render ads.
+      // we've already verified that this iframe is allowed to learn its position,
+      // and (b) we're post messaging back directly to the requesting frame.
+      // If we did restrict the origin this would not work with implementations
+      // that use a null origin to render ads.
       '*'
     );
   }