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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 1408583002: Enable Skia tracing in browser process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Single process mode fix Created 5 years, 2 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 | « no previous file | skia/ext/event_tracer_impl.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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "content/public/common/result_codes.h" 62 #include "content/public/common/result_codes.h"
63 #include "device/battery/battery_status_service.h" 63 #include "device/battery/battery_status_service.h"
64 #include "media/audio/audio_manager.h" 64 #include "media/audio/audio_manager.h"
65 #include "media/base/media.h" 65 #include "media/base/media.h"
66 #include "media/base/user_input_monitor.h" 66 #include "media/base/user_input_monitor.h"
67 #include "media/midi/midi_manager.h" 67 #include "media/midi/midi_manager.h"
68 #include "net/base/network_change_notifier.h" 68 #include "net/base/network_change_notifier.h"
69 #include "net/socket/client_socket_factory.h" 69 #include "net/socket/client_socket_factory.h"
70 #include "net/ssl/ssl_config_service.h" 70 #include "net/ssl/ssl_config_service.h"
71 #include "ipc/mojo/scoped_ipc_support.h" 71 #include "ipc/mojo/scoped_ipc_support.h"
72 #include "skia/ext/event_tracer_impl.h"
72 #include "skia/ext/skia_memory_dump_provider.h" 73 #include "skia/ext/skia_memory_dump_provider.h"
73 #include "sql/sql_memory_dump_provider.h" 74 #include "sql/sql_memory_dump_provider.h"
74 #include "ui/base/clipboard/clipboard.h" 75 #include "ui/base/clipboard/clipboard.h"
75 76
76 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS)) 77 #if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS))
77 #include "content/browser/compositor/image_transport_factory.h" 78 #include "content/browser/compositor/image_transport_factory.h"
78 #endif 79 #endif
79 80
80 #if defined(USE_AURA) 81 #if defined(USE_AURA)
81 #include "content/public/browser/context_factory.h" 82 #include "content/public/browser/context_factory.h"
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 } 657 }
657 658
658 if (parsed_command_line_.HasSwitch( 659 if (parsed_command_line_.HasSwitch(
659 switches::kEnableAggressiveDOMStorageFlushing)) { 660 switches::kEnableAggressiveDOMStorageFlushing)) {
660 TRACE_EVENT0("startup", 661 TRACE_EVENT0("startup",
661 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay"); 662 "BrowserMainLoop::Subsystem:EnableAggressiveCommitDelay");
662 DOMStorageArea::EnableAggressiveCommitDelay(); 663 DOMStorageArea::EnableAggressiveCommitDelay();
663 } 664 }
664 665
665 // Enable memory-infra dump providers. 666 // Enable memory-infra dump providers.
667 InitSkiaEventTracer();
666 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 668 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
667 HostSharedBitmapManager::current()); 669 HostSharedBitmapManager::current());
668 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 670 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
669 skia::SkiaMemoryDumpProvider::GetInstance()); 671 skia::SkiaMemoryDumpProvider::GetInstance());
670 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( 672 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
671 sql::SqlMemoryDumpProvider::GetInstance()); 673 sql::SqlMemoryDumpProvider::GetInstance());
672 674
673 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) 675 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
674 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController( 676 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController(
675 base::MessageLoop::current()->task_runner(), 677 base::MessageLoop::current()->task_runner(),
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 DCHECK(is_tracing_startup_for_duration_); 1418 DCHECK(is_tracing_startup_for_duration_);
1417 1419
1418 is_tracing_startup_for_duration_ = false; 1420 is_tracing_startup_for_duration_ = false;
1419 TracingController::GetInstance()->DisableRecording( 1421 TracingController::GetInstance()->DisableRecording(
1420 TracingController::CreateFileSink( 1422 TracingController::CreateFileSink(
1421 startup_trace_file_, 1423 startup_trace_file_,
1422 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1424 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1423 } 1425 }
1424 1426
1425 } // namespace content 1427 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | skia/ext/event_tracer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698