From dcf9a395c241b6a7d0aea3ae48a3d88b8e931945 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 13 Jan 2017 12:54:23 -0800
Subject: [PATCH] Only create isolated context in main frame

---
 atom/renderer/atom_renderer_client.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 337b1d124cd6..7d5f2be6e334 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -139,7 +139,7 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
   }
 
   bool ShouldNotifyClient(int world_id) {
-    if (renderer_client_->isolated_world())
+    if (renderer_client_->isolated_world() && render_frame_->IsMainFrame())
       return IsIsolatedWorld(world_id);
     else
       return IsMainWorld(world_id);
@@ -151,7 +151,8 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
     if (ShouldNotifyClient(world_id))
       renderer_client_->DidCreateScriptContext(context, render_frame_);
 
-    if (renderer_client_->isolated_world() && IsMainWorld(world_id)) {
+    if (renderer_client_->isolated_world() && IsMainWorld(world_id)
+        && render_frame_->IsMainFrame()) {
       CreateIsolatedWorldContext();
       SetupMainWorldOverrides(context);
     }