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

Side by Side Diff: components/ui_devtools/devtools_server.cc

Issue 2542243002: Add hovering feature to AshDevToolsDOMAgent (Closed)
Patch Set: Mask colors when converting RGBA to SkColor Created 4 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
« no previous file with comments | « components/ui_devtools/devtools_server.h ('k') | components/ui_devtools/protocol.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "components/ui_devtools/devtools_server.h" 5 #include "components/ui_devtools/devtools_server.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/format_macros.h" 10 #include "base/format_macros.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/threading/thread_task_runner_handle.h"
14 #include "base/values.h" 15 #include "base/values.h"
15 #include "components/ui_devtools/switches.h" 16 #include "components/ui_devtools/switches.h"
16 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
17 #include "net/log/net_log.h" 18 #include "net/log/net_log.h"
18 #include "net/server/http_server_request_info.h" 19 #include "net/server/http_server_request_info.h"
19 #include "net/socket/server_socket.h" 20 #include "net/socket/server_socket.h"
20 #include "net/socket/tcp_server_socket.h" 21 #include "net/socket/tcp_server_socket.h"
21 22
22 namespace ui { 23 namespace ui {
23 namespace devtools { 24 namespace devtools {
(...skipping 16 matching lines...) Expand all
40 &port)) 41 &port))
41 port = kDefaultPort; 42 port = kDefaultPort;
42 return port; 43 return port;
43 } 44 }
44 45
45 } // namespace 46 } // namespace
46 47
47 UiDevToolsServer* UiDevToolsServer::devtools_server_ = nullptr; 48 UiDevToolsServer* UiDevToolsServer::devtools_server_ = nullptr;
48 49
49 UiDevToolsServer::UiDevToolsServer( 50 UiDevToolsServer::UiDevToolsServer(
50 scoped_refptr<base::SingleThreadTaskRunner> task_runner) 51 scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner)
51 : task_runner_(task_runner) { 52 : io_thread_task_runner_(io_thread_task_runner) {
52 DCHECK(!devtools_server_); 53 DCHECK(!devtools_server_);
54 main_thread_task_runner_ = base::ThreadTaskRunnerHandle::Get();
53 devtools_server_ = this; 55 devtools_server_ = this;
54 if (task_runner_) 56 if (io_thread_task_runner_)
55 return; 57 return;
56 // If task_runner not passed in, create an I/O thread the server can run on 58 // If io_thread_task_runner not passed in, create an I/O thread
57 thread_.reset(new base::Thread("UiDevToolsServerThread")); 59 thread_.reset(new base::Thread("UiDevToolsServerThread"));
58 base::Thread::Options options; 60 base::Thread::Options options;
59 options.message_loop_type = base::MessageLoop::TYPE_IO; 61 options.message_loop_type = base::MessageLoop::TYPE_IO;
60 CHECK(thread_->StartWithOptions(options)); 62 CHECK(thread_->StartWithOptions(options));
61 task_runner_ = thread_->task_runner(); 63 io_thread_task_runner_ = thread_->task_runner();
62 } 64 }
63 65
64 UiDevToolsServer::~UiDevToolsServer() { 66 UiDevToolsServer::~UiDevToolsServer() {
65 devtools_server_ = nullptr; 67 devtools_server_ = nullptr;
66 } 68 }
67 69
68 // static 70 // static
69 std::unique_ptr<UiDevToolsServer> UiDevToolsServer::Create( 71 std::unique_ptr<UiDevToolsServer> UiDevToolsServer::Create(
70 scoped_refptr<base::SingleThreadTaskRunner> task_runner) { 72 scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner) {
71 std::unique_ptr<UiDevToolsServer> server; 73 std::unique_ptr<UiDevToolsServer> server;
72 if (IsUiDevToolsEnabled() && !devtools_server_) { 74 if (IsUiDevToolsEnabled() && !devtools_server_) {
73 // TODO(mhashmi): Change port if more than one inspectable clients 75 // TODO(mhashmi): Change port if more than one inspectable clients
74 server.reset(new UiDevToolsServer(task_runner)); 76 server.reset(new UiDevToolsServer(io_thread_task_runner));
75 server->Start("127.0.0.1", GetUiDevToolsPort()); 77 server->Start("127.0.0.1", GetUiDevToolsPort());
76 } 78 }
77 return server; 79 return server;
78 } 80 }
79 81
80 // static 82 // static
81 std::vector<UiDevToolsServer::NameUrlPair> 83 std::vector<UiDevToolsServer::NameUrlPair>
82 UiDevToolsServer::GetClientNamesAndUrls() { 84 UiDevToolsServer::GetClientNamesAndUrls() {
83 std::vector<NameUrlPair> pairs; 85 std::vector<NameUrlPair> pairs;
84 if (!devtools_server_) 86 if (!devtools_server_)
85 return pairs; 87 return pairs;
86 88
87 for (ClientsList::size_type i = 0; i != devtools_server_->clients_.size(); 89 for (ClientsList::size_type i = 0; i != devtools_server_->clients_.size();
88 i++) { 90 i++) {
89 pairs.push_back(std::pair<std::string, std::string>( 91 pairs.push_back(std::pair<std::string, std::string>(
90 devtools_server_->clients_[i]->name(), 92 devtools_server_->clients_[i]->name(),
91 base::StringPrintf("%slocalhost:%d/%" PRIuS, 93 base::StringPrintf("%slocalhost:%d/%" PRIuS,
92 kChromeDeveloperToolsPrefix, GetUiDevToolsPort(), 94 kChromeDeveloperToolsPrefix, GetUiDevToolsPort(),
93 i))); 95 i)));
94 } 96 }
95 return pairs; 97 return pairs;
96 } 98 }
97 99
98 void UiDevToolsServer::AttachClient(std::unique_ptr<UiDevToolsClient> client) { 100 void UiDevToolsServer::AttachClient(std::unique_ptr<UiDevToolsClient> client) {
99 clients_.push_back(std::move(client)); 101 clients_.push_back(std::move(client));
100 } 102 }
101 103
102 void UiDevToolsServer::SendOverWebSocket(int connection_id, 104 void UiDevToolsServer::SendOverWebSocket(int connection_id,
103 const String& message) { 105 const String& message) {
104 task_runner_->PostTask( 106 io_thread_task_runner_->PostTask(
105 FROM_HERE, 107 FROM_HERE,
106 base::Bind(&net::HttpServer::SendOverWebSocket, 108 base::Bind(&net::HttpServer::SendOverWebSocket,
107 base::Unretained(server_.get()), connection_id, message)); 109 base::Unretained(server_.get()), connection_id, message));
108 } 110 }
109 111
110 void UiDevToolsServer::Start(const std::string& address_string, uint16_t port) { 112 void UiDevToolsServer::Start(const std::string& address_string, uint16_t port) {
111 task_runner_->PostTask( 113 io_thread_task_runner_->PostTask(
112 FROM_HERE, base::Bind(&UiDevToolsServer::StartServer, 114 FROM_HERE, base::Bind(&UiDevToolsServer::StartServer,
113 base::Unretained(this), address_string, port)); 115 base::Unretained(this), address_string, port));
114 } 116 }
115 117
116 void UiDevToolsServer::StartServer(const std::string& address_string, 118 void UiDevToolsServer::StartServer(const std::string& address_string,
117 uint16_t port) { 119 uint16_t port) {
118 DCHECK(!server_); 120 DCHECK(!server_);
119 std::unique_ptr<net::ServerSocket> socket( 121 std::unique_ptr<net::ServerSocket> socket(
120 new net::TCPServerSocket(nullptr, net::NetLogSource())); 122 new net::TCPServerSocket(nullptr, net::NetLogSource()));
121 constexpr int kBacklog = 1; 123 constexpr int kBacklog = 1;
(...skipping 21 matching lines...) Expand all
143 !base::StringToSizeT(info.path.substr(1), &target_id) || 145 !base::StringToSizeT(info.path.substr(1), &target_id) ||
144 target_id > clients_.size()) 146 target_id > clients_.size())
145 return; 147 return;
146 148
147 UiDevToolsClient* client = clients_[target_id].get(); 149 UiDevToolsClient* client = clients_[target_id].get();
148 // Only one user can inspect the client at a time 150 // Only one user can inspect the client at a time
149 if (client->connected()) 151 if (client->connected())
150 return; 152 return;
151 client->set_connection_id(connection_id); 153 client->set_connection_id(connection_id);
152 connections_[connection_id] = client; 154 connections_[connection_id] = client;
153 task_runner_->PostTask( 155 io_thread_task_runner_->PostTask(
154 FROM_HERE, 156 FROM_HERE,
155 base::Bind(&net::HttpServer::AcceptWebSocket, 157 base::Bind(&net::HttpServer::AcceptWebSocket,
156 base::Unretained(server_.get()), connection_id, info)); 158 base::Unretained(server_.get()), connection_id, info));
157 } 159 }
158 160
159 void UiDevToolsServer::OnWebSocketMessage(int connection_id, 161 void UiDevToolsServer::OnWebSocketMessage(int connection_id,
160 const std::string& data) { 162 const std::string& data) {
161 ConnectionsMap::iterator it = connections_.find(connection_id); 163 ConnectionsMap::iterator it = connections_.find(connection_id);
162 DCHECK(it != connections_.end()); 164 DCHECK(it != connections_.end());
163 UiDevToolsClient* client = it->second; 165 UiDevToolsClient* client = it->second;
164 DCHECK(client); 166 DCHECK(client);
165 task_runner_->PostTask(FROM_HERE, base::Bind(&UiDevToolsClient::Dispatch, 167 main_thread_task_runner_->PostTask(
166 base::Unretained(client), data)); 168 FROM_HERE,
169 base::Bind(&UiDevToolsClient::Dispatch, base::Unretained(client), data));
167 } 170 }
168 171
169 void UiDevToolsServer::OnClose(int connection_id) { 172 void UiDevToolsServer::OnClose(int connection_id) {
170 ConnectionsMap::iterator it = connections_.find(connection_id); 173 ConnectionsMap::iterator it = connections_.find(connection_id);
171 if (it == connections_.end()) 174 if (it == connections_.end())
172 return; 175 return;
173 UiDevToolsClient* client = it->second; 176 UiDevToolsClient* client = it->second;
174 DCHECK(client); 177 DCHECK(client);
175 client->Disconnect(); 178 main_thread_task_runner_->PostTask(
179 FROM_HERE,
180 base::Bind(&UiDevToolsClient::Disconnect, base::Unretained(client)));
176 connections_.erase(it); 181 connections_.erase(it);
177 } 182 }
178 183
179 } // namespace devtools 184 } // namespace devtools
180 } // namespace ui 185 } // namespace ui
OLDNEW
« no previous file with comments | « components/ui_devtools/devtools_server.h ('k') | components/ui_devtools/protocol.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698