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

Implement GuestViewInternal.createGuest and destroyGuest

Browse source
This commit is contained in:
Cheng Zhao 2014-10-23 17:54:52 +08:00
parent d34cff2eef
commit a22a5c67bd
8 changed files with 124 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

48
atom/browser/api/atom_api_web_contents.cc
View file

@ -30,10 +30,14 @@ v8::Persistent<v8::ObjectTemplate> template_;
} // namespace
WebContents::WebContents(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {
: content::WebContentsObserver(web_contents),
guest_instance_id_(-1) {
}
WebContents::WebContents(const mate::Dictionary& options) {
WebContents::WebContents(const mate::Dictionary& options)
: guest_instance_id_(-1) {
options.Get("guestInstances", &guest_instance_id_);
content::WebContents::CreateParams params(AtomBrowserContext::Get());
bool is_guest;
if (options.Get("isGuest", &is_guest) && is_guest)
@ -44,6 +48,7 @@ WebContents::WebContents(const mate::Dictionary& options) {
}
WebContents::~WebContents() {
Destroy();
}
void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
@ -95,8 +100,47 @@ void WebContents::WebContentsDestroyed() {
Emit("destroyed");
}
void WebContents::WillAttach(content::WebContents* embedder_web_contents,
const base::DictionaryValue& extra_params) {
LOG(ERROR) << "WillAttach";
}
void WebContents::DidAttach() {
LOG(ERROR) << "DidAttach";
}
int WebContents::GetGuestInstanceID() const {
return guest_instance_id_;
}
void WebContents::ElementSizeChanged(const gfx::Size& old_size,
const gfx::Size& new_size) {
LOG(ERROR) << "ElementSizeChanged";
}
void WebContents::GuestSizeChanged(const gfx::Size& old_size,
const gfx::Size& new_size) {
LOG(ERROR) << "GuestSizeChanged";
}
void WebContents::RequestPointerLockPermission(
bool user_gesture,
bool last_unlocked_by_target,
const base::Callback<void(bool)>& callback) {
callback.Run(true);
}
void WebContents::RegisterDestructionCallback(
const DestructionCallback& callback) {
LOG(ERROR) << "RegisterDestructionCallback";
destruction_callback_ = callback;
}
void WebContents::Destroy() {
if (storage_) {
if (!destruction_callback_.is_null())
destruction_callback_.Run();
Observe(nullptr);
storage_.reset();
}

25
atom/browser/api/atom_api_web_contents.h
View file

@ -59,11 +59,11 @@ class WebContents : public mate::EventEmitter,
explicit WebContents(const mate::Dictionary& options);
~WebContents();
// mate::Wrappable implementations:
// mate::Wrappable:
virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
v8::Isolate* isolate) OVERRIDE;
// content::WebContentsObserver implementations:
// content::WebContentsObserver:
virtual void RenderViewDeleted(content::RenderViewHost*) OVERRIDE;
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
@ -75,6 +75,22 @@ class WebContents : public mate::EventEmitter,
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual void WebContentsDestroyed() OVERRIDE;
// content::BrowserPluginGuestDelegate:
virtual void WillAttach(content::WebContents* embedder_web_contents,
const base::DictionaryValue& extra_params) final;
virtual void DidAttach() final;
virtual int GetGuestInstanceID() const final;
virtual void ElementSizeChanged(const gfx::Size& old_size,
const gfx::Size& new_size) final;
virtual void GuestSizeChanged(const gfx::Size& old_size,
const gfx::Size& new_size) final;
virtual void RequestPointerLockPermission(
bool user_gesture,
bool last_unlocked_by_target,
const base::Callback<void(bool)>& callback) final;
virtual void RegisterDestructionCallback(
const DestructionCallback& callback) final;
private:
// Called when received a message from renderer.
void OnRendererMessage(const base::string16& channel,
@ -85,6 +101,11 @@ class WebContents : public mate::EventEmitter,
const base::ListValue& args,
IPC::Message* message);
// Unique ID for a guest WebContents.
int guest_instance_id_;
DestructionCallback destruction_callback_;
// Stores the WebContents that managed by this class.
scoped_ptr<content::WebContents> storage_;