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

Move AtomRenderFrameObserver creation to RendererClientBase.

Browse source 
Also remove AtomSandboxedRenderFrameObserver class.
This commit is contained in:
Thiago de Arruda 2017-04-08 11:54:58 -03:00
parent 72781e38c8
commit 039aaba758
3 changed files with 2 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/renderer/atom_renderer_client.cc
View file

@ -58,7 +58,6 @@ void AtomRendererClient::RenderThreadStarted() {
void AtomRendererClient::RenderFrameCreated( void AtomRendererClient::RenderFrameCreated(
content::RenderFrame* render_frame) { content::RenderFrame* render_frame) {
new AtomRenderFrameObserver(render_frame, this);
RendererClientBase::RenderFrameCreated(render_frame); RendererClientBase::RenderFrameCreated(render_frame);
} }

44
atom/renderer/atom_sandboxed_renderer_client.cc
View file

@ -20,7 +20,6 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "chrome/renderer/printing/print_web_view_helper.h" #include "chrome/renderer/printing/print_web_view_helper.h"
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_frame_observer.h"
#include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view.h"
#include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer.h"
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
@ -89,48 +88,6 @@ void InitializeBindings(v8::Local<v8::Object> binding,
b.SetMethod("crash", AtomBindings::Crash); b.SetMethod("crash", AtomBindings::Crash);
} }
class AtomSandboxedRenderFrameObserver : public content::RenderFrameObserver {
public:
AtomSandboxedRenderFrameObserver(content::RenderFrame* frame,
AtomSandboxedRendererClient* renderer_client)
: content::RenderFrameObserver(frame),
render_frame_(frame),
world_id_(-1),
renderer_client_(renderer_client) {}
// content::RenderFrameObserver:
void DidClearWindowObject() override {
renderer_client_->DidClearWindowObject(render_frame_);
}
void DidCreateScriptContext(v8::Handle<v8::Context> context,
int extension_group,
int world_id) override {
if (world_id_ != -1 && world_id_ != world_id)
return;
world_id_ = world_id;
renderer_client_->DidCreateScriptContext(context, render_frame_);
}
void WillReleaseScriptContext(v8::Local<v8::Context> context,
int world_id) override {
if (world_id_ != world_id)
return;
renderer_client_->WillReleaseScriptContext(context, render_frame_);
}
void OnDestruct() override {
delete this;
}
private:
content::RenderFrame* render_frame_;
int world_id_;
AtomSandboxedRendererClient* renderer_client_;
DISALLOW_COPY_AND_ASSIGN(AtomSandboxedRenderFrameObserver);
};
class AtomSandboxedRenderViewObserver : public AtomRenderViewObserver { class AtomSandboxedRenderViewObserver : public AtomRenderViewObserver {
public: public:
AtomSandboxedRenderViewObserver(content::RenderView* render_view, AtomSandboxedRenderViewObserver(content::RenderView* render_view,
@ -179,7 +136,6 @@ AtomSandboxedRendererClient::~AtomSandboxedRendererClient() {
void AtomSandboxedRendererClient::RenderFrameCreated( void AtomSandboxedRendererClient::RenderFrameCreated(
content::RenderFrame* render_frame) { content::RenderFrame* render_frame) {
new AtomSandboxedRenderFrameObserver(render_frame, this);
RendererClientBase::RenderFrameCreated(render_frame); RendererClientBase::RenderFrameCreated(render_frame);
} }

2
atom/renderer/renderer_client_base.cc
View file

@ -11,6 +11,7 @@
#include "atom/common/color_util.h" #include "atom/common/color_util.h"
#include "atom/common/native_mate_converters/value_converter.h" #include "atom/common/native_mate_converters/value_converter.h"
#include "atom/common/options_switches.h" #include "atom/common/options_switches.h"
#include "atom/renderer/atom_render_frame_observer.h"
#include "atom/renderer/content_settings_observer.h" #include "atom/renderer/content_settings_observer.h"
#include "atom/renderer/guest_view_container.h" #include "atom/renderer/guest_view_container.h"
#include "atom/renderer/preferences_manager.h" #include "atom/renderer/preferences_manager.h"
@ -112,6 +113,7 @@ void RendererClientBase::RenderThreadStarted() {
void RendererClientBase::RenderFrameCreated( void RendererClientBase::RenderFrameCreated(
content::RenderFrame* render_frame) { content::RenderFrame* render_frame) {
new AtomRenderFrameObserver(render_frame, this);
new PepperHelper(render_frame); new PepperHelper(render_frame);
new ContentSettingsObserver(render_frame); new ContentSettingsObserver(render_frame);
new printing::PrintWebViewHelper(render_frame); new printing::PrintWebViewHelper(render_frame);