Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: content/renderer/devtools/devtools_client.cc

Issue 1504763004: [DevTools] Fix frontend host race and assert. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: documentObjectCleared Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/devtools/devtools_client.h" 5 #include "content/renderer/devtools/devtools_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/common/devtools_messages.h" 10 #include "content/common/devtools_messages.h"
11 #include "content/public/common/content_switches.h" 11 #include "content/public/common/content_switches.h"
12 #include "content/public/common/url_constants.h" 12 #include "content/public/common/url_constants.h"
13 #include "content/renderer/render_thread_impl.h" 13 #include "content/renderer/render_thread_impl.h"
14 #include "content/renderer/render_view_impl.h" 14 #include "content/renderer/render_view_impl.h"
15 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 15 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
16 #include "third_party/WebKit/public/platform/WebString.h" 16 #include "third_party/WebKit/public/platform/WebString.h"
17 #include "third_party/WebKit/public/web/WebDevToolsFrontend.h" 17 #include "third_party/WebKit/public/web/WebDevToolsFrontend.h"
18 #include "ui/base/ui_base_switches.h" 18 #include "ui/base/ui_base_switches.h"
19 19
20 using blink::WebDevToolsFrontend; 20 using blink::WebDevToolsFrontend;
21 using blink::WebString; 21 using blink::WebString;
22 22
23 namespace content { 23 namespace content {
24 24
25 DevToolsClient::DevToolsClient( 25 DevToolsClient::DevToolsClient(
26 RenderFrame* main_render_frame, 26 RenderFrame* main_render_frame,
27 const std::string& compatibility_script) 27 const std::string& compatibility_script)
28 : RenderFrameObserver(main_render_frame), 28 : RenderFrameObserver(main_render_frame),
29 compatibility_script_(compatibility_script) { 29 compatibility_script_(compatibility_script),
30 const base::CommandLine& command_line = 30 web_tools_frontend_(
31 *base::CommandLine::ForCurrentProcess(); 31 WebDevToolsFrontend::create(main_render_frame->GetWebFrame(), this)) {
32 web_tools_frontend_.reset(WebDevToolsFrontend::create(
33 main_render_frame->GetRenderView()->GetWebView(), this,
34 base::ASCIIToUTF16(command_line.GetSwitchValueASCII(switches::kLang))));
35 } 32 }
36 33
37 DevToolsClient::~DevToolsClient() { 34 DevToolsClient::~DevToolsClient() {
38 } 35 }
39 36
40 void DevToolsClient::DidClearWindowObject() { 37 void DevToolsClient::DidClearWindowObject() {
41 if (!compatibility_script_.empty()) 38 if (!compatibility_script_.empty())
42 render_frame()->ExecuteJavaScript(base::UTF8ToUTF16(compatibility_script_)); 39 render_frame()->ExecuteJavaScript(base::UTF8ToUTF16(compatibility_script_));
43 } 40 }
44 41
45 void DevToolsClient::sendMessageToEmbedder(const WebString& message) { 42 void DevToolsClient::sendMessageToEmbedder(const WebString& message) {
46 Send(new DevToolsHostMsg_DispatchOnEmbedder(routing_id(), 43 Send(new DevToolsHostMsg_DispatchOnEmbedder(routing_id(),
47 message.utf8())); 44 message.utf8()));
48 } 45 }
49 46
50 bool DevToolsClient::isUnderTest() { 47 bool DevToolsClient::isUnderTest() {
51 return RenderThreadImpl::current()->layout_test_mode(); 48 return RenderThreadImpl::current()->layout_test_mode();
52 } 49 }
53 50
54 } // namespace content 51 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698