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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1137453002: content: Pass IOSurface references using Mach IPC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: static_assert Created 5 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 be0338ab34e6f7ff7ab76e78d4967ce39d495ffe..c1932efc516398c6079eb6c36af2d4362ecd32b1 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -97,6 +97,7 @@
#if defined(OS_MACOSX) && !defined(OS_IOS)
#include "base/memory/memory_pressure_monitor_mac.h"
#include "content/browser/bootstrap_sandbox_mac.h"
+#include "content/browser/browser_io_surface_manager_mac.h"
#include "content/browser/cocoa/system_hotkey_helper_mac.h"
#include "content/browser/compositor/browser_compositor_view_mac.h"
#include "content/browser/theme_helper_mac.h"
@@ -599,6 +600,13 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
}
#endif
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+ {
+ TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:IOSurfaceManager");
+ IOSurfaceManager::SetInstance(BrowserIOSurfaceManager::GetInstance());
+ }
+#endif
+
if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver");
memory_observer_.reset(new MemoryObserver());
« no previous file with comments | « content/browser/browser_io_surface_manager_mac_unittest.cc ('k') | content/browser/child_process_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698