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

Add the debugDevTools JS API.

Browse source
This commit is contained in:
Cheng Zhao 2014-02-24 12:08:33 +08:00
parent 8b9d35d84e
commit eaedac2536
4 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
browser/api/atom_api_window.cc
View file

@ -414,6 +414,12 @@ void Window::InspectElement(const v8::FunctionCallbackInfo<v8::Value>& args) {
self->window_->InspectElement(x, y); self->window_->InspectElement(x, y);
} }
// static
void Window::DebugDevTools(const v8::FunctionCallbackInfo<v8::Value>& args) {
UNWRAP_WINDOW_AND_CHECK;
self->window_->DebugDevTools();
}
// static // static
void Window::FocusOnWebView(const v8::FunctionCallbackInfo<v8::Value>& args) { void Window::FocusOnWebView(const v8::FunctionCallbackInfo<v8::Value>& args) {
UNWRAP_WINDOW_AND_CHECK; UNWRAP_WINDOW_AND_CHECK;
@ -663,6 +669,7 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "closeDevTools", CloseDevTools); NODE_SET_PROTOTYPE_METHOD(t, "closeDevTools", CloseDevTools);
NODE_SET_PROTOTYPE_METHOD(t, "isDevToolsOpened", IsDevToolsOpened); NODE_SET_PROTOTYPE_METHOD(t, "isDevToolsOpened", IsDevToolsOpened);
NODE_SET_PROTOTYPE_METHOD(t, "inspectElement", InspectElement); NODE_SET_PROTOTYPE_METHOD(t, "inspectElement", InspectElement);
NODE_SET_PROTOTYPE_METHOD(t, "debugDevTools", DebugDevTools);
NODE_SET_PROTOTYPE_METHOD(t, "focusOnWebView", FocusOnWebView); NODE_SET_PROTOTYPE_METHOD(t, "focusOnWebView", FocusOnWebView);
NODE_SET_PROTOTYPE_METHOD(t, "blurWebView", BlurWebView); NODE_SET_PROTOTYPE_METHOD(t, "blurWebView", BlurWebView);
NODE_SET_PROTOTYPE_METHOD(t, "isWebViewFocused", IsWebViewFocused); NODE_SET_PROTOTYPE_METHOD(t, "isWebViewFocused", IsWebViewFocused);

1
browser/api/atom_api_window.h
View file

@ -86,6 +86,7 @@ class Window : public EventEmitter,
static void CloseDevTools(const v8::FunctionCallbackInfo<v8::Value>& args); static void CloseDevTools(const v8::FunctionCallbackInfo<v8::Value>& args);
static void IsDevToolsOpened(const v8::FunctionCallbackInfo<v8::Value>& args); static void IsDevToolsOpened(const v8::FunctionCallbackInfo<v8::Value>& args);
static void InspectElement(const v8::FunctionCallbackInfo<v8::Value>& args); static void InspectElement(const v8::FunctionCallbackInfo<v8::Value>& args);
static void DebugDevTools(const v8::FunctionCallbackInfo<v8::Value>& args);
static void FocusOnWebView(const v8::FunctionCallbackInfo<v8::Value>& args); static void FocusOnWebView(const v8::FunctionCallbackInfo<v8::Value>& args);
static void BlurWebView(const v8::FunctionCallbackInfo<v8::Value>& args); static void BlurWebView(const v8::FunctionCallbackInfo<v8::Value>& args);
static void IsWebViewFocused(const v8::FunctionCallbackInfo<v8::Value>& args); static void IsWebViewFocused(const v8::FunctionCallbackInfo<v8::Value>& args);

18
browser/native_window.cc
View file

@ -167,8 +167,6 @@ bool NativeWindow::HasModalDialog() {
void NativeWindow::OpenDevTools() { void NativeWindow::OpenDevTools() {
inspectable_web_contents()->ShowDevTools(); inspectable_web_contents()->ShowDevTools();
DebugDevTools();
} }
void NativeWindow::CloseDevTools() { void NativeWindow::CloseDevTools() {
@ -187,14 +185,16 @@ void NativeWindow::InspectElement(int x, int y) {
agent->InspectElement(x, y); agent->InspectElement(x, y);
} }
void NativeWindow::DebugDevTools() { scoped_ptr<NativeWindow> NativeWindow::DebugDevTools() {
if (!IsDevToolsOpened()) scoped_ptr<NativeWindow> window;
return; if (IsDevToolsOpened()) {
base::DictionaryValue options;
window.reset(NativeWindow::Create(&options));
window->devtools_delegate_.reset(new DevToolsDelegate(
window.get(), GetDevToolsWebContents()));
}
base::DictionaryValue options; return window.Pass();
NativeWindow* window = NativeWindow::Create(&options);
window->devtools_delegate_.reset(new DevToolsDelegate(
window, GetDevToolsWebContents()));
} }
void NativeWindow::FocusOnWebView() { void NativeWindow::FocusOnWebView() {

4
browser/native_window.h
View file

@ -128,7 +128,9 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
virtual void CloseDevTools(); virtual void CloseDevTools();
virtual bool IsDevToolsOpened(); virtual bool IsDevToolsOpened();
virtual void InspectElement(int x, int y); virtual void InspectElement(int x, int y);
virtual void DebugDevTools();
// Creates a new window to debug the devtools.
virtual scoped_ptr<NativeWindow> DebugDevTools();
virtual void FocusOnWebView(); virtual void FocusOnWebView();
virtual void BlurWebView(); virtual void BlurWebView();