github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add world id constants

Browse Source
This commit is contained in:
Kevin Sawicki
2016-12-08 16:06:17 -08:00
parent d194a84ae4
commit 073d8c2177
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
atom/renderer/atom_renderer_client.cc
View File

@@ -78,19 +78,15 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
void CreateIsolatedWorldContext() {
blink::WebScriptSource source("void 0");
render_frame_->GetWebFrame()->executeScriptInIsolatedWorld(
1,
&source,
1,
1,
nullptr);
kIsolatedWorldId, &source, 1, 1);
}
bool IsMainWorld(int world_id) {
return world_id == 0;
return world_id == kMainWorldId;
}
bool IsIsolatedWorld(int world_id) {
return world_id == 1;
return world_id == kIsolatedWorldId;
}
void DidCreateScriptContext(v8::Handle<v8::Context> context,
@@ -133,6 +129,9 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
bool isolated_context_created_;
AtomRendererClient* renderer_client_;
const int kMainWorldId = 0;
const int kIsolatedWorldId = 999;
DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
};