mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Make SetupMainWorldOverrides/isolated_world pure virtual.

Browse source 
Also implement stubs in AtomSandboxedRendererClient.
This commit is contained in:
Thiago de Arruda 2017-04-08 11:12:18 -03:00
parent f751335bf9
commit ef07e25f9d
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/renderer/atom_renderer_client.h
View file

@ -23,8 +23,6 @@ class AtomRendererClient : public RendererClientBase {
// 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);
void SetupMainWorldOverrides(v8::Handle<v8::Context> context);
bool isolated_world() { return isolated_world_; }
// atom::RendererClientBase: // atom::RendererClientBase:
void DidCreateScriptContext( void DidCreateScriptContext(
@ -33,6 +31,8 @@ class AtomRendererClient : public RendererClientBase {
void WillReleaseScriptContext( void WillReleaseScriptContext(
v8::Handle<v8::Context> context, v8::Handle<v8::Context> context,
content::RenderFrame* render_frame) override; content::RenderFrame* render_frame) override;
void SetupMainWorldOverrides(v8::Handle<v8::Context> context) override;
bool isolated_world() override { return isolated_world_; }
private: private:
enum NodeIntegration { enum NodeIntegration {

2
atom/renderer/atom_sandboxed_renderer_client.h
View file

@ -26,6 +26,8 @@ class AtomSandboxedRendererClient : public RendererClientBase {
void WillReleaseScriptContext( void WillReleaseScriptContext(
v8::Handle<v8::Context> context, v8::Handle<v8::Context> context,
content::RenderFrame* render_frame) override; content::RenderFrame* render_frame) override;
void SetupMainWorldOverrides(v8::Handle<v8::Context> context) override { }
bool isolated_world() override { return false; }
// content::ContentRendererClient: // content::ContentRendererClient:
void RenderFrameCreated(content::RenderFrame*) override; void RenderFrameCreated(content::RenderFrame*) override;
void RenderViewCreated(content::RenderView*) override; void RenderViewCreated(content::RenderView*) override;

2
atom/renderer/renderer_client_base.h
View file

@ -24,6 +24,8 @@ class RendererClientBase : public content::ContentRendererClient {
virtual void WillReleaseScriptContext( virtual void WillReleaseScriptContext(
v8::Handle<v8::Context> context, content::RenderFrame* render_frame) = 0; v8::Handle<v8::Context> context, content::RenderFrame* render_frame) = 0;
virtual void DidClearWindowObject(content::RenderFrame* render_frame); virtual void DidClearWindowObject(content::RenderFrame* render_frame);
virtual void SetupMainWorldOverrides(v8::Handle<v8::Context> context) = 0;
virtual bool isolated_world() = 0;
protected: protected:
void AddRenderBindings(v8::Isolate* isolate, void AddRenderBindings(v8::Isolate* isolate,