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

Merge pull request #1839 from deepak1556/devtools_api_patch

Browse source 
devtools: initialise devtoolsWebContents when opened with inspect* apis
This commit is contained in:
Cheng Zhao 2015-06-03 18:31:25 +08:00
commit 912ed2ca10
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_window.cc
View file

@ -527,7 +527,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("_openDevTools", &Window::OpenDevTools) .SetMethod("_openDevTools", &Window::OpenDevTools)
.SetMethod("closeDevTools", &Window::CloseDevTools) .SetMethod("closeDevTools", &Window::CloseDevTools)
.SetMethod("isDevToolsOpened", &Window::IsDevToolsOpened) .SetMethod("isDevToolsOpened", &Window::IsDevToolsOpened)
.SetMethod("inspectElement", &Window::InspectElement) .SetMethod("_inspectElement", &Window::InspectElement)
.SetMethod("focusOnWebView", &Window::FocusOnWebView) .SetMethod("focusOnWebView", &Window::FocusOnWebView)
.SetMethod("blurWebView", &Window::BlurWebView) .SetMethod("blurWebView", &Window::BlurWebView)
.SetMethod("isWebViewFocused", &Window::IsWebViewFocused) .SetMethod("isWebViewFocused", &Window::IsWebViewFocused)
@ -549,7 +549,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
#endif #endif
.SetMethod("_getWebContents", &Window::GetWebContents) .SetMethod("_getWebContents", &Window::GetWebContents)
.SetMethod("_getDevToolsWebContents", &Window::GetDevToolsWebContents) .SetMethod("_getDevToolsWebContents", &Window::GetDevToolsWebContents)
.SetMethod("inspectServiceWorker", &Window::InspectServiceWorker); .SetMethod("_inspectServiceWorker", &Window::InspectServiceWorker);
} }
} // namespace api } // namespace api

8
atom/browser/api/lib/browser-window.coffee
View file

@ -55,6 +55,14 @@ BrowserWindow::openDevTools = (options={}) ->
BrowserWindow::toggleDevTools = -> BrowserWindow::toggleDevTools = ->
if @isDevToolsOpened() then @closeDevTools() else @openDevTools() if @isDevToolsOpened() then @closeDevTools() else @openDevTools()
BrowserWindow::inspectElement = (x, y) ->
@openDevTools true
@_inspectElement x, y
BrowserWindow::inspectServiceWorker = ->
@openDevTools true
@_inspectServiceWorker()
BrowserWindow::getWebContents = -> BrowserWindow::getWebContents = ->
wrapWebContents @_getWebContents() wrapWebContents @_getWebContents()

2
atom/browser/native_window.cc
View file

@ -308,7 +308,6 @@ bool NativeWindow::IsDevToolsOpened() {
} }
void NativeWindow::InspectElement(int x, int y) { void NativeWindow::InspectElement(int x, int y) {
OpenDevTools(true);
scoped_refptr<content::DevToolsAgentHost> agent( scoped_refptr<content::DevToolsAgentHost> agent(
content::DevToolsAgentHost::GetOrCreateFor(GetWebContents())); content::DevToolsAgentHost::GetOrCreateFor(GetWebContents()));
agent->InspectElement(x, y); agent->InspectElement(x, y);
@ -318,7 +317,6 @@ void NativeWindow::InspectServiceWorker() {
for (const auto& agent_host : content::DevToolsAgentHost::GetOrCreateAll()) { for (const auto& agent_host : content::DevToolsAgentHost::GetOrCreateAll()) {
if (agent_host->GetType() == if (agent_host->GetType() ==
content::DevToolsAgentHost::TYPE_SERVICE_WORKER) { content::DevToolsAgentHost::TYPE_SERVICE_WORKER) {
OpenDevTools(true);
inspectable_web_contents()->AttachTo(agent_host); inspectable_web_contents()->AttachTo(agent_host);
break; break;
} }