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

fix api and docs

Browse source
This commit is contained in:
Robo 2016-01-22 10:27:25 +05:30
parent 0e2323c9c8
commit df5bad3f89
4 changed files with 27 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

23
atom/browser/api/atom_api_debugger.cc
View file

@ -1,4 +1,4 @@
// Copyright (c) 2015 GitHub, Inc.
// Copyright (c) 2016 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
@ -33,8 +33,7 @@ void Debugger::AgentHostClosed(DevToolsAgentHost* agent_host,
std::string detach_reason = "target closed";
if (replaced_with_another_client)
detach_reason = "replaced with devtools";
if (!detach_callback_.is_null())
detach_callback_.Run(detach_reason);
Emit("detach", detach_reason);
}
void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
@ -54,8 +53,7 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
return;
base::DictionaryValue* params = nullptr;
dict->GetDictionary("params", &params);
if (!response_callback_.is_null())
response_callback_.Run(method, *params);
Emit("message", method, *params);
} else {
auto send_command_callback = pending_requests_[id];
pending_requests_.erase(id);
@ -90,7 +88,10 @@ void Debugger::Attach(mate::Arguments* args) {
}
void Debugger::Detach() {
if (!agent_host_.get())
return;
agent_host_->DetachClient();
AgentHostClosed(agent_host_.get(), false);
agent_host_ = nullptr;
}
@ -121,14 +122,6 @@ void Debugger::SendCommand(mate::Arguments* args) {
agent_host_->DispatchProtocolMessage(json_args);
}
void Debugger::OnDetach(const DetachCallback& callback) {
detach_callback_ = callback;
}
void Debugger::OnEvent(const ResponseCallback& callback) {
response_callback_ = callback;
}
// static
mate::Handle<Debugger> Debugger::Create(
v8::Isolate* isolate,
@ -142,9 +135,7 @@ void Debugger::BuildPrototype(v8::Isolate* isolate,
mate::ObjectTemplateBuilder(isolate, prototype)
.SetMethod("attach", &Debugger::Attach)
.SetMethod("detach", &Debugger::Detach)
.SetMethod("sendCommand", &Debugger::SendCommand)
.SetMethod("onDetach", &Debugger::OnDetach)
.SetMethod("onEvent", &Debugger::OnEvent);
.SetMethod("sendCommand", &Debugger::SendCommand);
}
} // namespace api

10
atom/browser/api/atom_api_debugger.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2015 GitHub, Inc.
// Copyright (c) 2016 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
@ -30,11 +30,8 @@ namespace api {
class Debugger: public mate::TrackableObject<Debugger>,
public content::DevToolsAgentHostClient {
public:
using ResponseCallback =
base::Callback<void(const std::string&, const base::DictionaryValue&)>;
using SendCommandCallback =
base::Callback<void(const base::DictionaryValue&)>;
using DetachCallback = base::Callback<void(const std::string&)>;
static mate::Handle<Debugger> Create(
v8::Isolate* isolate, content::WebContents* web_contents);
@ -59,15 +56,10 @@ class Debugger: public mate::TrackableObject<Debugger>,
void Attach(mate::Arguments* args);
void Detach();
void SendCommand(mate::Arguments* args);
void OnDetach(const DetachCallback& callback);
void OnEvent(const ResponseCallback& callback);
content::WebContents* web_contents_; // Weak Reference.
scoped_refptr<content::DevToolsAgentHost> agent_host_;
DetachCallback detach_callback_;
ResponseCallback response_callback_;
PendingRequestMap pending_requests_;
int previous_request_id_;

3
atom/browser/api/lib/web-contents.js
View file

@ -70,6 +70,9 @@ let wrapWebContents = function(webContents) {
var controller, method, name, ref1;
webContents.__proto__ = EventEmitter.prototype;
// webContents.debugger is an EventEmitter.
webContents.debugger.__proto__ = EventEmitter.prototype;
// Every remote callback from renderer process would add a listenter to the
// render-view-deleted event, so ignore the listenters warning.
webContents.setMaxListeners(0);