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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2873243002: Move components/display_compositor to components/viz/display_compositor (Closed)
Patch Set: Rebase and fix mac build Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 2425b673d72bcda28d237d3e3b22a49bab212a3b..46bd1dd91a343cd4bf2735d32400d8eddb1e3f44 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -46,11 +46,11 @@
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
#include "components/discardable_memory/service/discardable_shared_memory_manager.h"
-#include "components/display_compositor/host_shared_bitmap_manager.h"
#include "components/tracing/common/process_metrics_memory_dump_provider.h"
#include "components/tracing/common/trace_config_file.h"
#include "components/tracing/common/trace_to_console.h"
#include "components/tracing/common/tracing_switches.h"
+#include "components/viz/display_compositor/host_shared_bitmap_manager.h"
#include "content/browser/audio_manager_thread.h"
#include "content/browser/browser_thread_impl.h"
#include "content/browser/dom_storage/dom_storage_area.h"
@@ -808,8 +808,8 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess(
base::kNullProcessId);
base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
- display_compositor::HostSharedBitmapManager::current(),
- "display_compositor::HostSharedBitmapManager", nullptr);
+ viz::HostSharedBitmapManager::current(), "viz::HostSharedBitmapManager",
+ nullptr);
base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr);
base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(

Powered by Google App Engine
This is Rietveld 408576698