mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
use spaces instead of hard tabs for indentation and add the supported modules as a sub-list
This commit is contained in:
@@ -200,11 +200,11 @@ void RendererClientBase::AddSupportedKeySystems(
|
||||
}
|
||||
|
||||
v8::Local<v8::Context> 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
|
||||
|
||||
@@ -30,7 +30,7 @@ class RendererClientBase : public content::ContentRendererClient {
|
||||
|
||||
// Get the context that the Electron API is running in.
|
||||
v8::Local<v8::Context> GetContext(
|
||||
blink::WebFrame* frame, v8::Isolate* isolate);
|
||||
blink::WebFrame* frame, v8::Isolate* isolate);
|
||||
|
||||
protected:
|
||||
void AddRenderBindings(v8::Isolate* isolate,
|
||||
|
||||
@@ -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`
|
||||
|
||||
Reference in New Issue
Block a user