Addressed comments'

bradfrizzell · bradfrizzell · commit a61ddf8d4ec3 · 2017-02-01T17:56:02.000-05:00
diff --git a/3p/ampcontext.js b/3p/ampcontext.js
@@ -29,7 +29,7 @@ export class AmpContext {
     // if the window sentinel is set directly, that means we are running
     // in a situation where we couldn't attach the name attribute before
     // creating the iframe, so don't try to parse the metadata
-    if (!this.getWindowSentinel_()) {
+    if (!this.hasSafeframeSentinel_()) {
       this.setupMetadata_();
     }
     this.client_ = new IframeMessagingClient(win);
@@ -151,7 +151,7 @@ export class AmpContext {
    *  sentinel value, sets it, and returns true if so.
    *  @private
    */
-  getWindowSentinel_() {
+  hasSafeframeSentinel_() {
     this.sentinel = this.win_.SAFEFRAME_SENTINEL || null;
     return !!this.sentinel;
   }
diff --git a/src/iframe-helper.js b/src/iframe-helper.js
@@ -126,12 +126,6 @@ function getListenForEvents(parentWin, sentinel, origin, triggerWin) {
     const contentWindow = we.frame.contentWindow;
     if (!contentWindow) {
       setTimeout(dropListenSentinel, 0, listenSentinel);
-    } else if (sentinel === 'amp') {
-      // A non-3P code path, origin must match.
-      if (we.origin === origin && contentWindow == triggerWin) {
-        windowEvents = we;
-        break;
-      }
     } else if (triggerWin == contentWindow ||
                isDescendantWindow(contentWindow, triggerWin)) {
       // 3P code path, we may accept messages from nested frames.
@@ -199,7 +193,7 @@ function registerGlobalListenerIfNeeded(parentWin) {
     if (!event.data) {
       return;
     }
-    const data = parseIfNeeded(event.data);
+    const data = deserializeMessage(event.data);
     if (!data.sentinel) {
       return;
     }
@@ -378,30 +372,6 @@ function getSentinel_(iframe, opt_is3P) {
   return opt_is3P ? iframe.getAttribute('data-amp-3p-sentinel') : 'amp';
 }
 
-/**
- * Json parses event.data if it needs to be
- * @returns {!Object} object message
- * @private
- */
-function parseIfNeeded(data) {
-  const shouldBeParsed = typeof data === 'string'
-      && data.charAt(0) === '{';
-  let msg;
-  if (shouldBeParsed) {
-    try {
-      data = JSON.parse(data);
-    } catch (e) {
-      dev().warn('IFRAME-HELPER', 'Postmessage could not be parsed. ' +
-          'Is it in a valid JSON format?', e);
-    }
-  } else {
-    msg = deserializeMessage(data);
-  }
-  return msg ? msg : /** @type {!Object} */ (data) ;
-}
-
-
-
 /**
  * Manages a postMessage API for an iframe with a subscription message and
  * a way to broadcast messages to all subscribed windows, which
