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

Add API for renderer's crashes.

Browse source
This commit is contained in:
Cheng Zhao 2013-06-10 20:50:25 +08:00
parent e440ad2714
commit eaa03facee
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
browser/api/atom_api_window.cc
View file

@ -79,6 +79,10 @@ void Window::OnRendererResponsive() {
Emit("responsive"); Emit("responsive");
} }
void Window::OnRendererCrashed() {
Emit("crashed");
}
// static // static
v8::Handle<v8::Value> Window::New(const v8::Arguments &args) { v8::Handle<v8::Value> Window::New(const v8::Arguments &args) {
v8::HandleScope scope; v8::HandleScope scope;
@ -489,6 +493,13 @@ v8::Handle<v8::Value> Window::GetProcessID(const v8::Arguments &args) {
self->window_->GetWebContents()->GetRenderProcessHost()->GetID()); self->window_->GetWebContents()->GetRenderProcessHost()->GetID());
} }
// static
v8::Handle<v8::Value> Window::IsCrashed(const v8::Arguments &args) {
UNWRAP_WINDOW_AND_CHECK;
return v8::Boolean::New(self->window_->GetWebContents()->IsCrashed());
}
// static // static
v8::Handle<v8::Value> Window::LoadURL(const v8::Arguments &args) { v8::Handle<v8::Value> Window::LoadURL(const v8::Arguments &args) {
UNWRAP_WINDOW_AND_CHECK; UNWRAP_WINDOW_AND_CHECK;
@ -678,6 +689,7 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "stop", Stop); NODE_SET_PROTOTYPE_METHOD(t, "stop", Stop);
NODE_SET_PROTOTYPE_METHOD(t, "getRoutingId", GetRoutingID); NODE_SET_PROTOTYPE_METHOD(t, "getRoutingId", GetRoutingID);
NODE_SET_PROTOTYPE_METHOD(t, "getProcessId", GetProcessID); NODE_SET_PROTOTYPE_METHOD(t, "getProcessId", GetProcessID);
NODE_SET_PROTOTYPE_METHOD(t, "isCrashed", IsCrashed);
NODE_SET_PROTOTYPE_METHOD(t, "loadUrl", LoadURL); NODE_SET_PROTOTYPE_METHOD(t, "loadUrl", LoadURL);
NODE_SET_PROTOTYPE_METHOD(t, "getUrl", GetURL); NODE_SET_PROTOTYPE_METHOD(t, "getUrl", GetURL);

2
browser/api/atom_api_window.h
View file

@ -40,6 +40,7 @@ class Window : public EventEmitter,
virtual void OnWindowBlur() OVERRIDE; virtual void OnWindowBlur() OVERRIDE;
virtual void OnRendererUnresponsive() OVERRIDE; virtual void OnRendererUnresponsive() OVERRIDE;
virtual void OnRendererResponsive() OVERRIDE; virtual void OnRendererResponsive() OVERRIDE;
virtual void OnRendererCrashed() OVERRIDE;
private: private:
static v8::Handle<v8::Value> New(const v8::Arguments &args); static v8::Handle<v8::Value> New(const v8::Arguments &args);
@ -89,6 +90,7 @@ class Window : public EventEmitter,
static v8::Handle<v8::Value> Stop(const v8::Arguments &args); static v8::Handle<v8::Value> Stop(const v8::Arguments &args);
static v8::Handle<v8::Value> GetRoutingID(const v8::Arguments &args); static v8::Handle<v8::Value> GetRoutingID(const v8::Arguments &args);
static v8::Handle<v8::Value> GetProcessID(const v8::Arguments &args); static v8::Handle<v8::Value> GetProcessID(const v8::Arguments &args);
static v8::Handle<v8::Value> IsCrashed(const v8::Arguments &args);
// APIs for NavigationController. // APIs for NavigationController.
static v8::Handle<v8::Value> LoadURL(const v8::Arguments &args); static v8::Handle<v8::Value> LoadURL(const v8::Arguments &args);