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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/common/child_process_messages.h

Issue 302603004: Plumb GpuMemoryBuffer allocation to GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WIP Created 6 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
« no previous file with comments | « content/browser/renderer_host/render_message_filter.cc ('k') | content/common/gpu/client/gpu_channel_host.h » ('j') | ui/gfx/gpu_memory_buffer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/child_process_messages.h
diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h
index ecbd2014ca88916e09c98e21c35a7aebfb139505..004fde75a4e9791aca9a828f82f447d198c9dde6 100644
--- a/content/common/child_process_messages.h
+++ b/content/common/child_process_messages.h
@@ -60,22 +60,19 @@ IPC_STRUCT_TRAITS_END()
IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType,
gfx::GPU_MEMORY_BUFFER_TYPE_LAST)
-#if defined(OS_ANDROID)
-IPC_STRUCT_TRAITS_BEGIN(gfx::SurfaceTextureId)
+IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
IPC_STRUCT_TRAITS_MEMBER(primary_id)
IPC_STRUCT_TRAITS_MEMBER(secondary_id)
IPC_STRUCT_TRAITS_END()
-#endif
IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle)
IPC_STRUCT_TRAITS_MEMBER(type)
IPC_STRUCT_TRAITS_MEMBER(handle)
+ IPC_STRUCT_TRAITS_MEMBER(window)
#if defined(OS_MACOSX)
IPC_STRUCT_TRAITS_MEMBER(io_surface_id)
#endif
-#if defined(OS_ANDROID)
- IPC_STRUCT_TRAITS_MEMBER(surface_texture_id)
-#endif
+ IPC_STRUCT_TRAITS_MEMBER(gpu_memory_id)
IPC_STRUCT_TRAITS_END()
#undef IPC_MESSAGE_EXPORT
« no previous file with comments | « content/browser/renderer_host/render_message_filter.cc ('k') | content/common/gpu/client/gpu_channel_host.h » ('j') | ui/gfx/gpu_memory_buffer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698