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

Side by Side Diff: chrome/test/chromedriver/logging.cc

Issue 454133003: [ChromeDriver] Implementing tracing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing nits Created 6 years, 4 months 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 | « chrome/test/chromedriver/logging.h ('k') | chrome/test/chromedriver/logging_unittest.cc » ('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 (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 "chrome/test/chromedriver/logging.h" 5 #include "chrome/test/chromedriver/logging.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 false, // enable_timestamp 232 false, // enable_timestamp
233 false); // enable_tickcount 233 false); // enable_tickcount
234 logging::SetLogMessageHandler(&HandleLogMessage); 234 logging::SetLogMessageHandler(&HandleLogMessage);
235 235
236 logging::LoggingSettings logging_settings; 236 logging::LoggingSettings logging_settings;
237 logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; 237 logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
238 return logging::InitLogging(logging_settings); 238 return logging::InitLogging(logging_settings);
239 } 239 }
240 240
241 Status CreateLogs(const Capabilities& capabilities, 241 Status CreateLogs(const Capabilities& capabilities,
242 const Session* session,
242 ScopedVector<WebDriverLog>* out_logs, 243 ScopedVector<WebDriverLog>* out_logs,
243 ScopedVector<DevToolsEventListener>* out_devtools_listeners, 244 ScopedVector<DevToolsEventListener>* out_devtools_listeners,
244 ScopedVector<CommandListener>* out_command_listeners) { 245 ScopedVector<CommandListener>* out_command_listeners) {
245 ScopedVector<WebDriverLog> logs; 246 ScopedVector<WebDriverLog> logs;
246 ScopedVector<DevToolsEventListener> devtools_listeners; 247 ScopedVector<DevToolsEventListener> devtools_listeners;
247 ScopedVector<CommandListener> command_listeners; 248 ScopedVector<CommandListener> command_listeners;
248 Log::Level browser_log_level = Log::kWarning; 249 Log::Level browser_log_level = Log::kWarning;
249 const LoggingPrefs& prefs = capabilities.logging_prefs; 250 const LoggingPrefs& prefs = capabilities.logging_prefs;
250 251
251 for (LoggingPrefs::const_iterator iter = prefs.begin(); 252 for (LoggingPrefs::const_iterator iter = prefs.begin();
252 iter != prefs.end(); 253 iter != prefs.end();
253 ++iter) { 254 ++iter) {
254 std::string type = iter->first; 255 std::string type = iter->first;
255 Log::Level level = iter->second; 256 Log::Level level = iter->second;
256 if (type == WebDriverLog::kPerformanceType) { 257 if (type == WebDriverLog::kPerformanceType) {
257 if (level != Log::kOff) { 258 if (level != Log::kOff) {
258 WebDriverLog* log = new WebDriverLog(type, Log::kAll); 259 WebDriverLog* log = new WebDriverLog(type, Log::kAll);
259 logs.push_back(log); 260 logs.push_back(log);
260 PerformanceLogger* perf_log = 261 PerformanceLogger* perf_log =
261 new PerformanceLogger(log, capabilities.perf_logging_prefs); 262 new PerformanceLogger(log, session,
263 capabilities.perf_logging_prefs);
262 // We use a proxy for |perf_log|'s |CommandListener| interface. 264 // We use a proxy for |perf_log|'s |CommandListener| interface.
263 // Otherwise, |perf_log| would be owned by both session->chrome and 265 // Otherwise, |perf_log| would be owned by both session->chrome and
264 // |session|, which would lead to memory errors on destruction. 266 // |session|, which would lead to memory errors on destruction.
265 // session->chrome will own |perf_log|, and |session| will own |proxy|. 267 // session->chrome will own |perf_log|, and |session| will own |proxy|.
266 // session->command_listeners (the proxy) will be destroyed first. 268 // session->command_listeners (the proxy) will be destroyed first.
267 CommandListenerProxy* proxy = new CommandListenerProxy(perf_log); 269 CommandListenerProxy* proxy = new CommandListenerProxy(perf_log);
268 devtools_listeners.push_back(perf_log); 270 devtools_listeners.push_back(perf_log);
269 command_listeners.push_back(proxy); 271 command_listeners.push_back(proxy);
270 } 272 }
271 } else if (type == WebDriverLog::kBrowserType) { 273 } else if (type == WebDriverLog::kBrowserType) {
(...skipping 11 matching lines...) Expand all
283 logs.push_back(browser_log); 285 logs.push_back(browser_log);
284 // If the level is OFF, don't even bother listening for DevTools events. 286 // If the level is OFF, don't even bother listening for DevTools events.
285 if (browser_log_level != Log::kOff) 287 if (browser_log_level != Log::kOff)
286 devtools_listeners.push_back(new ConsoleLogger(browser_log)); 288 devtools_listeners.push_back(new ConsoleLogger(browser_log));
287 289
288 out_logs->swap(logs); 290 out_logs->swap(logs);
289 out_devtools_listeners->swap(devtools_listeners); 291 out_devtools_listeners->swap(devtools_listeners);
290 out_command_listeners->swap(command_listeners); 292 out_command_listeners->swap(command_listeners);
291 return Status(kOk); 293 return Status(kOk);
292 } 294 }
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/logging.h ('k') | chrome/test/chromedriver/logging_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698