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

Unified Diff: content/child/child_thread_impl.cc

Issue 1137453002: content: Pass IOSurface references using Mach IPC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, remove extra DCHECKs and fix reply port typo 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/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index cc13a5bf0a566b683a331b7e35d361f45cf18fe7..0dd92fe6474b6f3cf698c4dfb87fa694cbe859c7 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -63,6 +63,10 @@
#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
#endif
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+#include "content/child/child_io_surface_manager_mac.h"
+#endif
+
using tracked_objects::ThreadData;
namespace content {
@@ -570,6 +574,10 @@ bool ChildThreadImpl::OnMessageReceived(const IPC::Message& msg) {
#if defined(USE_TCMALLOC)
IPC_MESSAGE_HANDLER(ChildProcessMsg_GetTcmallocStats, OnGetTcmallocStats)
#endif
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+ IPC_MESSAGE_HANDLER(ChildProcessMsg_SetIOSurfaceManagerMailbox,
+ OnSetIOSurfaceManagerMailbox)
+#endif
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
@@ -626,6 +634,13 @@ void ChildThreadImpl::OnGetTcmallocStats() {
}
#endif
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+void ChildThreadImpl::OnSetIOSurfaceManagerMailbox(
+ const gpu::Mailbox& mailbox) {
+ ChildIOSurfaceManager::GetInstance()->set_mailbox(mailbox);
+}
+#endif
+
ChildThreadImpl* ChildThreadImpl::current() {
return g_lazy_tls.Pointer()->Get();
}

Powered by Google App Engine
This is Rietveld 408576698