From 41d406d1d0f45db9447cc3ae92ad8900ea8df6b9 Mon Sep 17 00:00:00 2001
From: protonate <ncozi@appnexus.com>
Date: Mon, 10 Oct 2016 07:45:54 -0700
Subject: [PATCH 1/9] and postMessage listener and handler

---
 src/prebid.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/prebid.js b/src/prebid.js
index 5ee59e25ad8..90c0ca4d84e 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -517,6 +517,35 @@ $$PREBID_GLOBAL$$.clearAuction = function() {
   }
 };
 
+var sendAdToCreative = function (ev) {
+  var key = ev.message ? "message" : "data";
+  var data = {};
+  try {
+    data = JSON.parse(ev[key]);
+  } catch (e) {
+    // Do nothing.  No ad found.
+  }
+  if (data.adId) {
+    var adObject = $$PREBID_GLOBAL$$._bidsReceived.find(function (bid) {
+      return bid.adId === data.adId;
+    });
+    var ad = adObject.ad;
+    var adUrl = adObject.adUrl;
+    var message = JSON.stringify({
+      message: 'send ad',
+      ad: ad,
+      adUrl: adUrl
+    });
+    ev.source.postMessage(message, 'https://amp.prebidapp.com:5000');
+
+    // document.getElementsByTagName('iframe')[0].contentWindow.postMessage(message, 'https://prebid.org');
+  }
+};
+
+var listenAdRequestFromCreative = function () {
+  addEventListener('message', sendAdToCreative, false);
+};
+
 /**
  *
  * @param bidsBackHandler
@@ -571,6 +600,7 @@ $$PREBID_GLOBAL$$.requestBids = function ({ bidsBackHandler, timeout, adUnits, a
   }
 
   adaptermanager.callBids({ adUnits, adUnitCodes, cbTimeout });
+  listenAdRequestFromCreative();
 };
 
 /**

From 657604c89d167c48d0e8fb496de83a86f0ee945f Mon Sep 17 00:00:00 2001
From: protonate <ncozi@appnexus.com>
Date: Mon, 10 Oct 2016 22:22:19 -0700
Subject: [PATCH 2/9] edit to sandbox domain

---
 src/prebid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/prebid.js b/src/prebid.js
index 90c0ca4d84e..99edc4bad30 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -536,7 +536,7 @@ var sendAdToCreative = function (ev) {
       ad: ad,
       adUrl: adUrl
     });
-    ev.source.postMessage(message, 'https://amp.prebidapp.com:5000');
+    ev.source.postMessage(message, 'https://securepubads.g.doubleclick.net');
 
     // document.getElementsByTagName('iframe')[0].contentWindow.postMessage(message, 'https://prebid.org');
   }

From b0d81b168733cae3ad8bf3ecda84bdc0b4c066cb Mon Sep 17 00:00:00 2001
From: protonate <ncozi@appnexus.com>
Date: Mon, 10 Oct 2016 23:55:27 -0700
Subject: [PATCH 3/9] update postMessage domain

---
 src/prebid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/prebid.js b/src/prebid.js
index 99edc4bad30..90c0ca4d84e 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -536,7 +536,7 @@ var sendAdToCreative = function (ev) {
       ad: ad,
       adUrl: adUrl
     });
-    ev.source.postMessage(message, 'https://securepubads.g.doubleclick.net');
+    ev.source.postMessage(message, 'https://amp.prebidapp.com:5000');
 
     // document.getElementsByTagName('iframe')[0].contentWindow.postMessage(message, 'https://prebid.org');
   }

From b78ac77267f5925485e45fadeac00334224cb0bb Mon Sep 17 00:00:00 2001
From: protonate <ncozi@appnexus.com>
Date: Tue, 11 Oct 2016 00:28:16 -0700
Subject: [PATCH 4/9] update postMessage domain

---
 src/prebid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/prebid.js b/src/prebid.js
index 90c0ca4d84e..99edc4bad30 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -536,7 +536,7 @@ var sendAdToCreative = function (ev) {
       ad: ad,
       adUrl: adUrl
     });
-    ev.source.postMessage(message, 'https://amp.prebidapp.com:5000');
+    ev.source.postMessage(message, 'https://securepubads.g.doubleclick.net');
 
     // document.getElementsByTagName('iframe')[0].contentWindow.postMessage(message, 'https://prebid.org');
   }

From 787fb462be0f2905432a2095bf4994b6e5d0d807 Mon Sep 17 00:00:00 2001
From: protonate <ncozi@appnexus.com>
Date: Tue, 11 Oct 2016 12:31:04 -0700
Subject: [PATCH 5/9] work on render second ad bug

---
 src/prebid.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/prebid.js b/src/prebid.js
index 99edc4bad30..97d7c76bd1f 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -526,17 +526,18 @@ var sendAdToCreative = function (ev) {
     // Do nothing.  No ad found.
   }
   if (data.adId) {
+    console.log('sendAdToCreative ev: ', ev);
     var adObject = $$PREBID_GLOBAL$$._bidsReceived.find(function (bid) {
       return bid.adId === data.adId;
     });
     var ad = adObject.ad;
     var adUrl = adObject.adUrl;
     var message = JSON.stringify({
-      message: 'send ad',
+      message: 'send ad ' + data.adID,
       ad: ad,
       adUrl: adUrl
     });
-    ev.source.postMessage(message, 'https://securepubads.g.doubleclick.net');
+    ev.source.postMessage(message, '*');
 
     // document.getElementsByTagName('iframe')[0].contentWindow.postMessage(message, 'https://prebid.org');
   }

From 4011153190d9efeecd0dc2b58357234fbdd497a4 Mon Sep 17 00:00:00 2001
From: protonate <ncozi@appnexus.com>
Date: Sat, 29 Oct 2016 23:24:09 -0700
Subject: [PATCH 6/9] rollback changes to match master

---
 src/prebid.js | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/src/prebid.js b/src/prebid.js
index 97d7c76bd1f..5ee59e25ad8 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -517,36 +517,6 @@ $$PREBID_GLOBAL$$.clearAuction = function() {
   }
 };
 
-var sendAdToCreative = function (ev) {
-  var key = ev.message ? "message" : "data";
-  var data = {};
-  try {
-    data = JSON.parse(ev[key]);
-  } catch (e) {
-    // Do nothing.  No ad found.
-  }
-  if (data.adId) {
-    console.log('sendAdToCreative ev: ', ev);
-    var adObject = $$PREBID_GLOBAL$$._bidsReceived.find(function (bid) {
-      return bid.adId === data.adId;
-    });
-    var ad = adObject.ad;
-    var adUrl = adObject.adUrl;
-    var message = JSON.stringify({
-      message: 'send ad ' + data.adID,
-      ad: ad,
-      adUrl: adUrl
-    });
-    ev.source.postMessage(message, '*');
-
-    // document.getElementsByTagName('iframe')[0].contentWindow.postMessage(message, 'https://prebid.org');
-  }
-};
-
-var listenAdRequestFromCreative = function () {
-  addEventListener('message', sendAdToCreative, false);
-};
-
 /**
  *
  * @param bidsBackHandler
@@ -601,7 +571,6 @@ $$PREBID_GLOBAL$$.requestBids = function ({ bidsBackHandler, timeout, adUnits, a
   }
 
   adaptermanager.callBids({ adUnits, adUnitCodes, cbTimeout });
-  listenAdRequestFromCreative();
 };
 
 /**

From 2a4284f907e82853bab023e4abbf9ac1fafd5683 Mon Sep 17 00:00:00 2001
From: protonate <ncozi@appnexus.com>
Date: Sun, 30 Oct 2016 00:05:54 -0700
Subject: [PATCH 7/9] add AMP example

---
 integrationExamples/gpt/amp/amp_page.html |  59 ++++++
 integrationExamples/gpt/amp/creative.html |  38 ++++
 integrationExamples/gpt/amp/gulpfile.js   |  12 ++
 integrationExamples/gpt/amp/remote.html   | 207 ++++++++++++++++++++++
 4 files changed, 316 insertions(+)
 create mode 100644 integrationExamples/gpt/amp/amp_page.html
 create mode 100644 integrationExamples/gpt/amp/creative.html
 create mode 100644 integrationExamples/gpt/amp/gulpfile.js
 create mode 100644 integrationExamples/gpt/amp/remote.html

diff --git a/integrationExamples/gpt/amp/amp_page.html b/integrationExamples/gpt/amp/amp_page.html
new file mode 100644
index 00000000000..027e83e4ca4
--- /dev/null
+++ b/integrationExamples/gpt/amp/amp_page.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<html amp lang="en">
+  <head>
+      <!--
+      This is an example AMP page. Set the  amp-3p-iframe-src meta tag to your
+      x-domain host for remote.html and set your content, `amp-ad` and other components.
+      -->
+    <meta charset="utf-8">
+    <title>Hello, AMPs</title>
+    <link rel="canonical" href="http://example.ampproject.org/article-metadata.html" />
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <meta name="amp-3p-iframe-src" content="https://amp.prebidapp.com:5000/remote.html">
+    <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
+    <script type="application/ld+json">
+      {
+        "@context": "http://schema.org",
+        "@type": "NewsArticle",
+        "headline": "Open-source framework for publishing content",
+        "datePublished": "2015-10-07T12:02:41Z",
+        "image": [
+          "logo.jpg"
+        ]
+      }
+    </script>
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+  </head>
+  <body>
+    <h1>Welcome to the mobile web</h1>
+
+    <amp-ad
+      width="300"
+      height="250"
+      layout="fixed"
+      type="doubleclick"
+      data-slot="/19968336/header-bid-tag-1">
+    </amp-ad>
+
+    <amp-ad
+      width="300"
+      height="250"
+      layout="fixed"
+      type="doubleclick"
+      data-slot="/19968336/header-bid-tag-2">
+    </amp-ad>
+
+  <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam aliquam ac orci vitae cursus.
+         Nulla rutrum egestas felis ut bibendum. Maecenas blandit tellus eu turpis posuere condimentum sit amet eget eros. Donec sollicitudin sit amet enim ut ultricies. Nunc semper enim a dignissim convallis. Vestibulum faucibus eget ante non pellentesque. Maecenas convallis consectetur dolor, non facilisis felis interdum id. Cras ac leo et massa facilisis porttitor ut vitae dolor. Phasellus odio felis, pharetra vel sem vitae, ultricies ornare sapien. In sodales semper ultricies.
+
+Suspendisse potenti. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Integer tempus rutrum libero, sit amet finibus sapien rutrum sed. Vestibulum accumsan turpis vel est cursus vulputate. Nam id risus ligula. Praesent metus elit, iaculis sit amet egestas id, interdum id nibh. Nullam egestas tempor lorem at consectetur. Fusce sit amet mattis massa, id semper elit. Mauris blandit lectus a orci lobortis malesuada.
+
+Donec id turpis quam. Morbi fringilla justo nisi, et mattis nibh laoreet non. Aliquam orci eros, tincidunt a feugiat id, gravida ut nisl. Morbi et arcu facilisis, congue mauris ut, ultricies ligula. Vivamus vulputate est non facilisis iaculis. Phasellus quis auctor odio. Nulla facilisi. Sed convallis feugiat erat, sit amet tincidunt justo bibendum ut. Sed maximus justo sit amet pharetra tincidunt. Vivamus laoreet nisi vel est feugiat, sed egestas ante congue.
+
+Nunc ultricies sodales dolor eget semper. Phasellus ac ligula ac mi fermentum ornare sed et lacus. Curabitur ante enim, maximus ac lacus in, hendrerit mollis enim. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas posuere nisl ac nisl sagittis faucibus. Quisque pellentesque vehicula lectus, ac malesuada dui mollis pulvinar. Nam in lectus placerat eros feugiat dictum ut vel quam. Etiam magna mauris, euismod in felis sodales, interdum ultricies nisl. Nunc elit mi, pellentesque vel est nec, tempus dignissim purus. Praesent pharetra, odio ut cursus dictum, erat felis gravida lorem, at pretium justo dolor quis odio. Mauris tincidunt accumsan mi, gravida condimentum enim vulputate at. Phasellus pretium hendrerit commodo. Quisque blandit rhoncus erat, sed tincidunt dolor rutrum et.
+
+Nunc nec condimentum mauris, vel porta sem. Donec finibus sapien lacus, quis faucibus neque lobortis non. Nam faucibus nunc odio. Aliquam dolor nisl, placerat sed ipsum quis, facilisis sollicitudin nisi. Nullam sed ultrices enim. Ut sollicitudin mi dignissim, faucibus massa in, pellentesque velit. Donec auctor vel libero in posuere. Ut venenatis odio nec euismod egestas. Nunc posuere pretium sapien finibus sagittis. Nunc volutpat ante eget eleifend consequat. Donec sed quam sit amet quam venenatis pulvinar. Nullam in ex id magna pellentesque tempus.
+</div>
+  </body>
+</html>
diff --git a/integrationExamples/gpt/amp/creative.html b/integrationExamples/gpt/amp/creative.html
new file mode 100644
index 00000000000..e62d7791477
--- /dev/null
+++ b/integrationExamples/gpt/amp/creative.html
@@ -0,0 +1,38 @@
+<!-- This script tag should be returned by your ad server -->
+
+<script>
+    // This is the `renderAd` function from Prebid.js moved within the creative iframe
+  var renderAd = function (ev) {
+    var key = ev.message ? "message" : "data";
+    var data = {};
+    try {
+      data = JSON.parse(ev[key]);
+    } catch (e) {
+      // Do nothing.  No ad found.
+    }
+    if (data.ad || data.adUrl) {
+      if (data.ad) {
+        document.write(data.ad);
+        document.close();
+      } else if (data.adUrl) {
+        document.write('<IFRAME SRC="' + data.adUrl + '" FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true"></IFRAME>');
+        document.close();
+      }
+    }
+  };
+
+  var requestAdFromPrebid = function () {
+    var message = JSON.stringify({
+      message: 'Prebid creative requested: %%PATTERN:hb_adid%%',
+      adId: '%%PATTERN:hb_adid%%'
+    });
+    window.parent.postMessage(message, '*');
+  };
+
+  var listenAdFromPrebid = function () {
+    window.addEventListener("message", renderAd, false);
+  };
+
+  listenAdFromPrebid();
+  requestAdFromPrebid();
+</script>
diff --git a/integrationExamples/gpt/amp/gulpfile.js b/integrationExamples/gpt/amp/gulpfile.js
new file mode 100644
index 00000000000..47338182473
--- /dev/null
+++ b/integrationExamples/gpt/amp/gulpfile.js
@@ -0,0 +1,12 @@
+var gulp = require('gulp');
+var connect = require('gulp-connect');
+var port = 5000;
+
+gulp.task('serve', function() {
+  connect.server({
+    port: port,
+    root: './',
+    livereload: true,
+    https: true
+  });
+});
diff --git a/integrationExamples/gpt/amp/remote.html b/integrationExamples/gpt/amp/remote.html
new file mode 100644
index 00000000000..a74f86bda43
--- /dev/null
+++ b/integrationExamples/gpt/amp/remote.html
@@ -0,0 +1,207 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="robots" content="noindex">
+<script>
+
+    /** AMP x-domain iframe custom source file
+     *  host this file on a remote domain from your AMP pages,
+     *  set the `amp-3p-iframe-src` meta tag on your AMP pages
+     *  (see `./amp_page.html`)
+     *
+     *
+     *  see "Enhance incoming ad configuration" section of AMP docs
+     *  https://www.ampproject.org/docs/reference/components/amp-ad
+     */
+
+    (function() {
+var v = location.search.substr(1);
+if (!(/^\d+(-canary)?$/.test(v))) return;
+var u = 'https://3p.ampproject.net/'+encodeURIComponent(v)+'/f.js';
+document.write('<script'+' src="'+encodeURI(u)+'"><'+'/script>');
+})();
+</script>
+<script>
+    // The Prebid global must match Prebid.js setting
+    var $$PREBID_GLOBAL$$ = pbjs;
+
+    // Standard Prebid.js setup
+    var rightSlotSizes = [[300, 250], [300, 600], [300, 250], [100, 100]];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+    var PREBID_TIMEOUT = 3000;
+
+    var date = new Date().getTime();
+
+    // wrap the rest of the setup in a function that will be called by the
+    // AMP `draw3p` hook
+    function loadPrebidJS() {
+
+        setTimeout(function() {
+            return initAdserver;
+        }(), PREBID_TIMEOUT);
+
+
+        pbjs.que.push(function () {
+
+            pbjs.logging = true;
+
+            var adUnits = [
+                {
+                    code: '/19968336/header-bid-tag-1',
+                    sizes: rightSlotSizes,
+                    bids: [
+                        {
+                            bidder: 'appnexusAst',
+                            params: {
+                                placementId: '4799418',
+                                dealId: 'some deal!'
+                            }
+                        },
+                        {
+                            bidder: 'aol',
+                            params: {
+                                network: '10077.1',
+                                placement: 3671670
+                            }
+                        },
+                        {
+                            bidder: 'sovrn',
+                            params: {
+                                tagid: "315045"
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: '/19968336/header-bid-tag-2',
+                    sizes: rightSlotSizes,
+                    bids: [
+                        {
+                            bidder: 'appnexusAst',
+                            params: {
+                                placementId: '4799418',
+                                dealId: 'some deal!'
+                            }
+                        },
+                        {
+                            bidder: 'aol',
+                            params: {
+                                network: '10077.1',
+                                placement: 3671670
+                            }
+                        },
+                        {
+                            bidder: 'sovrn',
+                            params: {
+                                tagid: "315045"
+                            }
+                        }
+                        ]
+                }
+            ];
+
+            pbjs.addAdUnits(adUnits);
+
+            pbjs.requestBids({
+                bidsBackHandler: function (bidResponses) {
+                    initAdserver();
+                    console.log('bidsBackHandler responses: ', bidResponses);
+                },
+                timeout: 3000
+            });
+        });
+
+        // load Prebid.js
+       (function () {
+            var d = document, pbs = d.createElement("script"), pro = d.location.protocal;
+            pbs.type = "text/javascript";
+            pbs.src = 'https://localhost:9999/build/dev/prebid.js';
+            var target = document.getElementsByTagName("head")[0];
+            target.insertBefore(pbs, target.firstChild);
+        })();
+    }
+
+    /**
+     *
+     * @param config
+     * @param done
+     */
+    function setTargeting(config, done) {
+        config.targeting = getTargeting(config.slot);
+        done(config);
+    }
+
+    function getTargeting(slot) {
+        var targeting = window.context.master.pbjs.getAdserverTargeting()[slot];
+        for (var key in targeting) {
+            if (targeting.hasOwnProperty(key)) {
+                targeting[key] = [targeting[key]];
+            }
+        }
+        targeting['prebid_amp'] = ['true'];
+        return targeting;
+    }
+
+    function initAdserver() {
+      var i;
+      var adCalls = window.context.master.adCalls;
+      var adCallsLength = adCalls.length;
+      for (i = 0; i < adCallsLength; i++) {
+        adCalls.pop()();
+      }
+    }
+
+    function listenAdRequestFromCreative() {
+      addEventListener('message', sendAdToCreative, false);
+    }
+
+    function sendAdToCreative(ev) {
+      var key = ev.message ? 'message' : 'data';
+      var data = {};
+      try {
+        data = JSON.parse(ev[key]);
+      } catch (e) {
+        // Do nothing.  No ad found.
+      }
+      if (data.adId) {
+          // AMP ads a `context` object to `window`s and that is used to find the
+          // `master` iframe where Prebid is loaded
+        var adObject = window.context.master.pbjs._bidsReceived.find(function (bid) {
+          return bid.adId === data.adId;
+        });
+
+        var ad = adObject.ad;
+        var adUrl = adObject.adUrl;
+        var message = JSON.stringify({
+          message: 'Prebid creative sent: ' + data.adId,
+          ad: ad,
+          adUrl: adUrl
+        });
+        ev.source.postMessage(message, '*');
+      }
+    }
+</script>
+</head>
+<body style="margin:0">
+<div id="c" style="position:absolute;top:0;left:0;bottom:0;right:0;">
+  <script>
+    draw3p(function(config, done) {
+      if (typeof window.context.master.adCalls === 'undefined') {
+        window.context.master.adCalls = [];
+      }
+        if (window.context && window.context.isMaster) {
+            loadPrebidJS();
+        }
+        window.context.master.adCalls.push(setTargeting.bind(null, config, done));
+    }, ['doubleclick'], ['prebidapp.com']);
+
+    listenAdRequestFromCreative();
+  </script>
+</div>
+
+<script>if (window.docEndCallback) window.docEndCallback()</script>
+</body>
+</html>

From 086fe6cb95f4e306eee3337cd197f7b5dd7a39cb Mon Sep 17 00:00:00 2001
From: protonate <ncozi@appnexus.com>
Date: Tue, 1 Nov 2016 00:44:43 -0700
Subject: [PATCH 8/9] updates to address review notes

---
 integrationExamples/gpt/amp/gulpfile.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/integrationExamples/gpt/amp/gulpfile.js b/integrationExamples/gpt/amp/gulpfile.js
index 47338182473..30dae86bb0a 100644
--- a/integrationExamples/gpt/amp/gulpfile.js
+++ b/integrationExamples/gpt/amp/gulpfile.js
@@ -1,3 +1,8 @@
+/** Run `gulp serve` to serve files from this directory in development
+ * Set two different entries in hosts to use x-domain iframes
+ * AMP requires https
+ */
+
 var gulp = require('gulp');
 var connect = require('gulp-connect');
 var port = 5000;

From d1ddd97834c6dc71e658fa832c3c0dd305b830c5 Mon Sep 17 00:00:00 2001
From: protonate <ncozi@appnexus.com>
Date: Tue, 1 Nov 2016 00:46:10 -0700
Subject: [PATCH 9/9] updates to address review notes

---
 integrationExamples/gpt/amp/amp_page.html |  28 +++-
 integrationExamples/gpt/amp/remote.html   | 166 +++++++++++-----------
 2 files changed, 105 insertions(+), 89 deletions(-)

diff --git a/integrationExamples/gpt/amp/amp_page.html b/integrationExamples/gpt/amp/amp_page.html
index 027e83e4ca4..995b23174bf 100644
--- a/integrationExamples/gpt/amp/amp_page.html
+++ b/integrationExamples/gpt/amp/amp_page.html
@@ -2,14 +2,36 @@
 <html amp lang="en">
   <head>
       <!--
-      This is an example AMP page. Set the  amp-3p-iframe-src meta tag to your
-      x-domain host for remote.html and set your content, `amp-ad` and other components.
+      This is an example AMP page. This example includes:
+
+      amp_page.html     host on publisher's amp domain (amp.publisher.com)
+      amp_page.html     (canonical) host on publisher's main domain (publisher.com -- implied, not
+                            part of example)
+      remote.html       host on publisher's amp-x-domain domain (amp-x-domain.publisher.com)
+      creative.html     script tag returned by ad server to fill with Prebid demand
+
       -->
     <meta charset="utf-8">
     <title>Hello, AMPs</title>
     <link rel="canonical" href="http://example.ampproject.org/article-metadata.html" />
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-    <meta name="amp-3p-iframe-src" content="https://amp.prebidapp.com:5000/remote.html">
+
+      <!-- The following meta tag specifies the path to the publisher-hosted file to use as the
+        AMP x-domain host. The domain for ./remote.html must be different from the domain for
+        ./amp_page.html to be a cross domain (secure, unfriendly) iframe.  In this example the
+        domains and ports are:
+            https://publisher.com:9999/amp_page.html
+                and
+            https://amp.publisher.com:5000/remote.html
+
+            Further reading
+            AMP documentation <amp-ad> spec
+            https://www.ampproject.org/docs/reference/components/amp-ad
+            See sections on "Running ads from a custom domain" and "Enhance incoming ad
+            configuration" for more details on techniques used here.
+         -->
+    <meta name="amp-3p-iframe-src" content="https://amp.publisher.com:5000/remote.html">
+
     <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
     <script type="application/ld+json">
       {
diff --git a/integrationExamples/gpt/amp/remote.html b/integrationExamples/gpt/amp/remote.html
index a74f86bda43..c47c8b8c507 100644
--- a/integrationExamples/gpt/amp/remote.html
+++ b/integrationExamples/gpt/amp/remote.html
@@ -5,12 +5,11 @@
 <meta name="robots" content="noindex">
 <script>
 
-    /** AMP x-domain iframe custom source file
-     *  host this file on a remote domain from your AMP pages,
+    /** This file is the AMP x-domain iframe source file.
+     *  Host this file on a cross-domain from your AMP pages,
      *  set the `amp-3p-iframe-src` meta tag on your AMP pages
      *  (see `./amp_page.html`)
      *
-     *
      *  see "Enhance incoming ad configuration" section of AMP docs
      *  https://www.ampproject.org/docs/reference/components/amp-ad
      */
@@ -22,12 +21,77 @@
 document.write('<script'+' src="'+encodeURI(u)+'"><'+'/script>');
 })();
 </script>
+
+<!-- start Prebid.js AMP integration -->
+
 <script>
     // The Prebid global must match Prebid.js setting
     var $$PREBID_GLOBAL$$ = pbjs;
-
-    // Standard Prebid.js setup
+    var prebidSrc = 'https://publisher.com:9999/build/dev/prebid.js';
     var rightSlotSizes = [[300, 250], [300, 600], [300, 250], [100, 100]];
+    var adUnits = [
+        {
+            code: '/19968336/header-bid-tag-1',
+            sizes: rightSlotSizes,
+            bids: [
+                {
+                    bidder: 'appnexusAst',
+                    params: {
+                        placementId: '4799418',
+                        dealId: 'some deal!'
+                    }
+                },
+                {
+                    bidder: 'aol',
+                    params: {
+                        network: '10077.1',
+                        placement: 3671670
+                    }
+                },
+                {
+                    bidder: 'sovrn',
+                    params: {
+                        tagid: "315045"
+                    }
+                }
+            ]
+        },
+        {
+            code: '/19968336/header-bid-tag-2',
+            sizes: rightSlotSizes,
+            bids: [
+                {
+                    bidder: 'appnexusAst',
+                    params: {
+                        placementId: '4799418',
+                        dealId: 'some deal!'
+                    }
+                },
+                {
+                    bidder: 'aol',
+                    params: {
+                        network: '10077.1',
+                        placement: 3671670
+                    }
+                },
+                {
+                    bidder: 'sovrn',
+                    params: {
+                        tagid: "315045"
+                    }
+                }
+                ]
+        }
+    ];
+
+    // load Prebid.js
+    (function () {
+        var d = document, pbs = d.createElement("script"), pro = d.location.protocal;
+        pbs.type = "text/javascript";
+        pbs.src = prebidSrc;
+        var target = document.getElementsByTagName("head")[0];
+        target.insertBefore(pbs, target.firstChild);
+    })();
 
     var pbjs = pbjs || {};
     pbjs.que = pbjs.que || [];
@@ -35,74 +99,14 @@
 
     var date = new Date().getTime();
 
-    // wrap the rest of the setup in a function that will be called by the
-    // AMP `draw3p` hook
-    function loadPrebidJS() {
-
-        setTimeout(function() {
-            return initAdserver;
-        }(), PREBID_TIMEOUT);
-
-
+    /** wrap the rest of the setup in a function that will be called by the
+     * AMP `draw3p` hook see
+     * this example for more info:
+     * https://dfp-amp-testing-1185.appspot.com/amp_tests/dfp-3p-iframe.html
+     * */
+     function loadPrebidJS() {
         pbjs.que.push(function () {
-
             pbjs.logging = true;
-
-            var adUnits = [
-                {
-                    code: '/19968336/header-bid-tag-1',
-                    sizes: rightSlotSizes,
-                    bids: [
-                        {
-                            bidder: 'appnexusAst',
-                            params: {
-                                placementId: '4799418',
-                                dealId: 'some deal!'
-                            }
-                        },
-                        {
-                            bidder: 'aol',
-                            params: {
-                                network: '10077.1',
-                                placement: 3671670
-                            }
-                        },
-                        {
-                            bidder: 'sovrn',
-                            params: {
-                                tagid: "315045"
-                            }
-                        }
-                    ]
-                },
-                {
-                    code: '/19968336/header-bid-tag-2',
-                    sizes: rightSlotSizes,
-                    bids: [
-                        {
-                            bidder: 'appnexusAst',
-                            params: {
-                                placementId: '4799418',
-                                dealId: 'some deal!'
-                            }
-                        },
-                        {
-                            bidder: 'aol',
-                            params: {
-                                network: '10077.1',
-                                placement: 3671670
-                            }
-                        },
-                        {
-                            bidder: 'sovrn',
-                            params: {
-                                tagid: "315045"
-                            }
-                        }
-                        ]
-                }
-            ];
-
             pbjs.addAdUnits(adUnits);
 
             pbjs.requestBids({
@@ -113,22 +117,8 @@
                 timeout: 3000
             });
         });
-
-        // load Prebid.js
-       (function () {
-            var d = document, pbs = d.createElement("script"), pro = d.location.protocal;
-            pbs.type = "text/javascript";
-            pbs.src = 'https://localhost:9999/build/dev/prebid.js';
-            var target = document.getElementsByTagName("head")[0];
-            target.insertBefore(pbs, target.firstChild);
-        })();
     }
 
-    /**
-     *
-     * @param config
-     * @param done
-     */
     function setTargeting(config, done) {
         config.targeting = getTargeting(config.slot);
         done(config);
@@ -188,6 +178,9 @@
 <body style="margin:0">
 <div id="c" style="position:absolute;top:0;left:0;bottom:0;right:0;">
   <script>
+      /** The draw3p function is the integration point between AMP and content in third party
+        * iframes. For more info see: https://github.com/ampproject/amphtml/blob/e5501a30adf15c8fef049729f5e0e3137dbb18ca/3p/integration.js#L252
+        */
     draw3p(function(config, done) {
       if (typeof window.context.master.adCalls === 'undefined') {
         window.context.master.adCalls = [];
@@ -196,7 +189,8 @@
             loadPrebidJS();
         }
         window.context.master.adCalls.push(setTargeting.bind(null, config, done));
-    }, ['doubleclick'], ['prebidapp.com']);
+    }, ['doubleclick'], ['publisher.com']);
+// the first array contains ad networks used, the second domains allows to load this file in an iframe
 
     listenAdRequestFromCreative();
   </script>