use spaces instead of hard tabs for indentation and add the supported modules as a sub-list

This commit is contained in:
sungpark 2017-08-08 17:10:44 -07:00
parent eca7ff986c
commit f984bd2ff5
3 changed files with 11 additions and 7 deletions

View file

@ -200,11 +200,11 @@ void RendererClientBase::AddSupportedKeySystems(
} }
v8::Local<v8::Context> RendererClientBase::GetContext( v8::Local<v8::Context> RendererClientBase::GetContext(
blink::WebFrame* frame, v8::Isolate* isolate) { blink::WebFrame* frame, v8::Isolate* isolate) {
if (isolated_world()) if (isolated_world())
return frame->worldScriptContext(isolate, World::ISOLATED_WORLD); return frame->worldScriptContext(isolate, World::ISOLATED_WORLD);
else else
return frame->mainWorldScriptContext(); return frame->mainWorldScriptContext();
} }
} // namespace atom } // namespace atom

View file

@ -30,7 +30,7 @@ class RendererClientBase : public content::ContentRendererClient {
// Get the context that the Electron API is running in. // Get the context that the Electron API is running in.
v8::Local<v8::Context> GetContext( v8::Local<v8::Context> GetContext(
blink::WebFrame* frame, v8::Isolate* isolate); blink::WebFrame* frame, v8::Isolate* isolate);
protected: protected:
void AddRenderBindings(v8::Isolate* isolate, void AddRenderBindings(v8::Isolate* isolate,

View file

@ -166,7 +166,11 @@ Currently the `require` function provided in the preload scope exposes the
following modules: following modules:
- `child_process` - `child_process`
- `electron` (crashReporter, remote, ipcRenderer, and webFrame) - `electron`
- `crashReporter`
- `remote`
- `ipcRenderer`
- `webFrame`
- `fs` - `fs`
- `os` - `os`
- `timers` - `timers`