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

Unified Diff: content/app/content_main_runner.cc

Issue 1137453002: content: Pass IOSurface references using Mach IPC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update comment 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/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 279536b09b983deec9ae5f22856e5c0bbb72f83a..ad1cb0d4eb5a034b987f9a29a5128eeef34234bb 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -87,6 +87,7 @@
#include "base/power_monitor/power_monitor_device_source.h"
#include "content/app/mac/mac_init.h"
#include "content/browser/mach_broker_mac.h"
+#include "content/child/child_io_surface_manager_mac.h"
#include "content/common/sandbox_init_mac.h"
#endif // !OS_IOS
#endif // OS_WIN
@@ -664,6 +665,11 @@ class ContentMainRunnerImpl : public ContentMainRunner {
(!delegate_ || delegate_->ShouldSendMachPort(process_type))) {
MachBroker::ChildSendTaskPortToParent();
}
+
+ if (!process_type.empty() && (process_type == switches::kRendererProcess ||
+ process_type == switches::kGpuProcess)) {
+ IOSurfaceManager::SetInstance(ChildIOSurfaceManager::GetInstance());
+ }
#elif defined(OS_WIN)
SetupCRT(command_line);
#endif
« no previous file with comments | « no previous file | content/browser/browser_io_surface_manager_mac.h » ('j') | content/browser/browser_io_surface_manager_mac.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698