From ebedb606843056bab9f16946a0812432e437c8f2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 31 Aug 2015 21:59:13 +0800
Subject: [PATCH] Insert node integration for all main frames

---
 atom/renderer/atom_renderer_client.cc | 9 +++------
 atom/renderer/atom_renderer_client.h  | 3 ---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 21ced4aedb..e17e8bf3db 100644
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -109,8 +109,7 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
 
 AtomRendererClient::AtomRendererClient()
     : node_bindings_(NodeBindings::Create(false)),
-      atom_bindings_(new AtomBindings),
-      main_frame_(nullptr) {
+      atom_bindings_(new AtomBindings) {
 }
 
 AtomRendererClient::~AtomRendererClient() {
@@ -185,12 +184,10 @@ bool AtomRendererClient::OverrideCreatePlugin(
 void AtomRendererClient::DidCreateScriptContext(
     blink::WebFrame* frame,
     v8::Handle<v8::Context> context) {
-  if (main_frame_)
+  // Only insert node integration for the main frame.
+  if (frame->parent())
     return;
 
-  // The first web frame is the main frame.
-  main_frame_ = frame;
-
   // Give the node loop a run to make sure everything is ready.
   node_bindings_->RunMessageLoop();
 
diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h
index 68201f3cd4..e59547cf8e 100644
--- a/atom/renderer/atom_renderer_client.h
+++ b/atom/renderer/atom_renderer_client.h
@@ -64,9 +64,6 @@ class AtomRendererClient : public content::ContentRendererClient,
   scoped_ptr<NodeBindings> node_bindings_;
   scoped_ptr<AtomBindings> atom_bindings_;
 
-  // The main frame.
-  blink::WebFrame* main_frame_;
-
   DISALLOW_COPY_AND_ASSIGN(AtomRendererClient);
 };