From 99c14084df3eaa2272019447ceba8c14c439859f Mon Sep 17 00:00:00 2001
From: iGerchak <34220204+iGerchak@users.noreply.github.com>
Date: Tue, 17 Jul 2018 18:32:18 +0300
Subject: [PATCH 1/3] Fix blocked a frame with origin

---
 .../view/frontend/web/js/page-cache.js          | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
index fccc8510ffc70..08e23d0f4d3f5 100644
--- a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
+++ b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
@@ -53,7 +53,22 @@ define([
                 }
             }
 
-            $(element).contents().each(function (index, el) {
+            // rewrite jQuery contents()
+             var contents = function (element) {
+                return $.map(element, function (elem) {
+                    try {
+                        return $.nodeName(elem, "iframe") ?
+                               elem.contentDocument || (elem.contentWindow ? elem.contentWindow.document : []) :
+                               $.merge([], elem.childNodes);
+                    } catch (e) {
+                        return [];
+                    }
+                });
+            };
+
+            var elementContents = contents($(element));
+
+            $.each(elementContents, function (index, el) {
                 switch (el.nodeType) {
                     case 1: // ELEMENT_NODE
                         lookup(el);

From 85660e6ad8dfad744d97c591c8bd543c9289422e Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 14 Sep 2018 08:51:24 +0300
Subject: [PATCH 2/3] magento/magento2#16887  Fix blocked a frame with origin

Add logging of exception
---
 app/code/Magento/PageCache/view/frontend/web/js/page-cache.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
index 08e23d0f4d3f5..e455102d3bf7e 100644
--- a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
+++ b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
@@ -6,6 +6,7 @@
 define([
     'jquery',
     'domReady',
+    'consoleLogger',
     'jquery/ui',
     'mage/cookies'
 ], function ($, domReady) {
@@ -61,6 +62,7 @@ define([
                                elem.contentDocument || (elem.contentWindow ? elem.contentWindow.document : []) :
                                $.merge([], elem.childNodes);
                     } catch (e) {
+                        consoleLogger.error(e);
                         return [];
                     }
                 });

From 3bf066a5a5d5ba17d8b0c38bbc981af974d2b244 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 14 Sep 2018 08:53:55 +0300
Subject: [PATCH 3/3] magento/magento2#16887 Fix blocked a frame with origin

Add logging of exception
---
 app/code/Magento/PageCache/view/frontend/web/js/page-cache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
index e455102d3bf7e..2a43ff29a3593 100644
--- a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
+++ b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
@@ -9,7 +9,7 @@ define([
     'consoleLogger',
     'jquery/ui',
     'mage/cookies'
-], function ($, domReady) {
+], function ($, domReady, consoleLogger) {
     'use strict';
 
     /**