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

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

Issue 429693003: [ChromeDriver] Implementing PerfLoggingPrefs for perf log (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing memory leak 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
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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 250
251 for (LoggingPrefs::const_iterator iter = prefs.begin(); 251 for (LoggingPrefs::const_iterator iter = prefs.begin();
252 iter != prefs.end(); 252 iter != prefs.end();
253 ++iter) { 253 ++iter) {
254 std::string type = iter->first; 254 std::string type = iter->first;
255 Log::Level level = iter->second; 255 Log::Level level = iter->second;
256 if (type == WebDriverLog::kPerformanceType) { 256 if (type == WebDriverLog::kPerformanceType) {
257 if (level != Log::kOff) { 257 if (level != Log::kOff) {
258 WebDriverLog* log = new WebDriverLog(type, Log::kAll); 258 WebDriverLog* log = new WebDriverLog(type, Log::kAll);
259 logs.push_back(log); 259 logs.push_back(log);
260 PerformanceLogger* perf_log = new PerformanceLogger(log); 260 PerformanceLogger* perf_log =
261 new PerformanceLogger(log, capabilities.perf_logging_prefs);
261 // We use a proxy for |perf_log|'s |CommandListener| interface. 262 // We use a proxy for |perf_log|'s |CommandListener| interface.
262 // Otherwise, |perf_log| would be owned by both session->chrome and 263 // Otherwise, |perf_log| would be owned by both session->chrome and
263 // |session|, which would lead to memory errors on destruction. 264 // |session|, which would lead to memory errors on destruction.
264 // session->chrome will own |perf_log|, and |session| will own |proxy|. 265 // session->chrome will own |perf_log|, and |session| will own |proxy|.
265 // session->command_listeners (the proxy) will be destroyed first. 266 // session->command_listeners (the proxy) will be destroyed first.
266 CommandListenerProxy* proxy = new CommandListenerProxy(perf_log); 267 CommandListenerProxy* proxy = new CommandListenerProxy(perf_log);
267 devtools_listeners.push_back(perf_log); 268 devtools_listeners.push_back(perf_log);
268 command_listeners.push_back(proxy); 269 command_listeners.push_back(proxy);
269 } 270 }
270 } else if (type == WebDriverLog::kBrowserType) { 271 } else if (type == WebDriverLog::kBrowserType) {
(...skipping 11 matching lines...) Expand all
282 logs.push_back(browser_log); 283 logs.push_back(browser_log);
283 // If the level is OFF, don't even bother listening for DevTools events. 284 // If the level is OFF, don't even bother listening for DevTools events.
284 if (browser_log_level != Log::kOff) 285 if (browser_log_level != Log::kOff)
285 devtools_listeners.push_back(new ConsoleLogger(browser_log)); 286 devtools_listeners.push_back(new ConsoleLogger(browser_log));
286 287
287 out_logs->swap(logs); 288 out_logs->swap(logs);
288 out_devtools_listeners->swap(devtools_listeners); 289 out_devtools_listeners->swap(devtools_listeners);
289 out_command_listeners->swap(command_listeners); 290 out_command_listeners->swap(command_listeners);
290 return Status(kOk); 291 return Status(kOk);
291 } 292 }
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/chrome_launcher.cc ('k') | chrome/test/chromedriver/performance_logger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698