fixes

ampproject · Jun 24, 2019 · b35eaa5 · b35eaa5
1 parent f04221e
commit b35eaa5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/friendly-iframe-embed.js b/src/friendly-iframe-embed.js
@@ -121,7 +121,7 @@ export function getFriendlyIframeEmbedOptional(iframe) {
  * @param {!HTMLIFrameElement} iframe
  * @param {!Element} container
  * @param {!FriendlyIframeSpec} spec
- * @param {function(!Window, ?./service/ampdoc-impl.AmpDoc)=} opt_preinstallCallback
+ * @param {function(!Window, ?./service/ampdoc-impl.AmpDoc=)=} opt_preinstallCallback
  * @return {!Promise<!FriendlyIframeEmbed>}
  */
 export function installFriendlyIframeEmbed(
@@ -226,7 +226,7 @@ export function installFriendlyIframeEmbed(
     iframe[EMBED_PROP] = embed;
 
     // Add extensions.
-    if (ampdocFieExperimentOn) {
+    if (ampdoc && ampdocFieExperimentOn) {
       extensions.installExtensionsInFie(
         ampdoc,
         spec.extensionIds || [],

diff --git a/src/service/ampdoc-impl.js b/src/service/ampdoc-impl.js
@@ -239,7 +239,9 @@ export class AmpDocService {
   installFieDoc(url, childWin) {
     const doc = childWin.document;
     devAssert(!doc[AMPDOC_PROP], 'The fie already contains ampdoc');
-    const frameElement = getParentWindowFrameElement(doc, this.win);
+    const frameElement = /** @type {!Node} */ (devAssert(
+      getParentWindowFrameElement(doc, this.win)
+    ));
     const ampdoc = new AmpDocFie(childWin, url, this.getAmpDoc(frameElement));
     doc[AMPDOC_PROP] = ampdoc;
     return ampdoc;

diff --git a/src/service/extensions-impl.js b/src/service/extensions-impl.js
@@ -435,7 +435,7 @@ export class Extensions {
    * but before the first extension is installed.
    * @param {!./ampdoc-impl.AmpDocFie} ampdoc
    * @param {!Array<string>} extensionIds
-   * @param {function(!Window, ?./ampdoc-impl.AmpDoc)=} opt_preinstallCallback
+   * @param {function(!Window, ?./ampdoc-impl.AmpDoc=)=} opt_preinstallCallback
    * @return {!Promise}
    * @restricted
    */
@@ -452,7 +452,7 @@ export class Extensions {
    * but before the first extension is installed.
    * @param {!Window} childWin
    * @param {!Array<string>} extensionIds
-   * @param {function(!Window)=} opt_preinstallCallback
+   * @param {function(!Window, ?./ampdoc-impl.AmpDoc=)=} opt_preinstallCallback
    * @return {!Promise}
    * @restricted
    */