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

Ensure that a document has been created before sending IPC messages

Browse source 
* Reverts 370476c4af in favor of moving the previous logic to the new RenderFrameObserver instead of RenderViewObserver

Fixes #12045
This commit is contained in:
Samuel Attard 2018-03-09 14:22:44 +11:00
parent 5f48f91d94
commit a9dcce82ed
5 changed files with 135 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/renderer/atom_render_frame_observer.h
View file

@ -6,6 +6,7 @@
#define ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
#include "atom/renderer/renderer_client_base.h"
#include "base/values.h"
#include "content/public/renderer/render_frame_observer.h"
namespace atom {
@ -31,15 +32,28 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
void WillReleaseScriptContext(v8::Local<v8::Context> context,
int world_id) override;
void OnDestruct() override;
bool OnMessageReceived(const IPC::Message& message) override;
void DidCreateDocumentElement() override;
protected:
virtual void EmitIPCEvent(blink::WebLocalFrame* frame,
const base::string16& channel,
const base::ListValue& args);
private:
bool ShouldNotifyClient(int world_id);
void CreateIsolatedWorldContext();
bool IsMainWorld(int world_id);
bool IsIsolatedWorld(int world_id);
void OnBrowserMessage(bool send_to_all,
const base::string16& channel,
const base::ListValue& args);
void OnOffscreen();
content::RenderFrame* render_frame_;
RendererClientBase* renderer_client_;
bool document_created_;
DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
};