diff --git a/atom/renderer/renderer_client_base.cc b/atom/renderer/renderer_client_base.cc index 5c06305db00e..dc7b13962e7b 100644 --- a/atom/renderer/renderer_client_base.cc +++ b/atom/renderer/renderer_client_base.cc @@ -200,11 +200,11 @@ void RendererClientBase::AddSupportedKeySystems( } v8::Local RendererClientBase::GetContext( - blink::WebFrame* frame, v8::Isolate* isolate) { - if (isolated_world()) - return frame->worldScriptContext(isolate, World::ISOLATED_WORLD); - else - return frame->mainWorldScriptContext(); + blink::WebFrame* frame, v8::Isolate* isolate) { + if (isolated_world()) + return frame->worldScriptContext(isolate, World::ISOLATED_WORLD); + else + return frame->mainWorldScriptContext(); } } // namespace atom diff --git a/atom/renderer/renderer_client_base.h b/atom/renderer/renderer_client_base.h index af9c40437f38..d629739b80d5 100644 --- a/atom/renderer/renderer_client_base.h +++ b/atom/renderer/renderer_client_base.h @@ -30,7 +30,7 @@ class RendererClientBase : public content::ContentRendererClient { // Get the context that the Electron API is running in. v8::Local GetContext( - blink::WebFrame* frame, v8::Isolate* isolate); + blink::WebFrame* frame, v8::Isolate* isolate); protected: void AddRenderBindings(v8::Isolate* isolate, diff --git a/docs/api/sandbox-option.md b/docs/api/sandbox-option.md index c18d5d7b2691..b507427f8f0f 100644 --- a/docs/api/sandbox-option.md +++ b/docs/api/sandbox-option.md @@ -166,7 +166,11 @@ Currently the `require` function provided in the preload scope exposes the following modules: - `child_process` -- `electron` (crashReporter, remote, ipcRenderer, and webFrame) +- `electron` + - `crashReporter` + - `remote` + - `ipcRenderer` + - `webFrame` - `fs` - `os` - `timers`