trunk/src/content/common/frame_param_macros.h - Issue 163433008: Revert 251207 "Use gpu::Mailbox instead of std:string in IPCs"

Side by Side Diff: trunk/src/content/common/frame_param_macros.h

Issue 163433008: Revert 251207 "Use gpu::Mailbox instead of std:string in IPCs" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | trunk/src/content/common/gpu/gpu_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 // Allows for sharing of IPC param structures between BrowserPlugin code and	5 // Allows for sharing of IPC param structures between BrowserPlugin code and

6 // RenderFrame code. All these should be folded directly back into the IPCs in	6 // RenderFrame code. All these should be folded directly back into the IPCs in

7 // frame_messages.h once BrowserPlugin has been fully converted over to use	7 // frame_messages.h once BrowserPlugin has been fully converted over to use

8 // the RenderFrame infrastructure.	8 // the RenderFrame infrastructure.

9 //	9 //

10 // TODO(ajwong): Remove once BrowserPlugin has been converted to use	10 // TODO(ajwong): Remove once BrowserPlugin has been converted to use

11 // RenderFrames. http://crbug.com/330264	11 // RenderFrames. http://crbug.com/330264

12	12

13 #ifndef CONTENT_COMMON_FRAME_PARAM_MACROS_H_	13 #ifndef CONTENT_COMMON_FRAME_PARAM_MACROS_H_

14 #define CONTENT_COMMON_FRAME_PARAM_MACROS_H_	14 #define CONTENT_COMMON_FRAME_PARAM_MACROS_H_

15	15

16 #include "cc/output/compositor_frame_ack.h"	16 #include "cc/output/compositor_frame_ack.h"

17 #include "cc/output/compositor_frame.h"	17 #include "cc/output/compositor_frame.h"

18 #include "content/public/common/common_param_traits.h"	18 #include "content/public/common/common_param_traits.h"

19 #include "ipc/ipc_message_macros.h"	19 #include "ipc/ipc_message_macros.h"

20	20

21 #undef IPC_MESSAGE_EXPORT	21 #undef IPC_MESSAGE_EXPORT

22 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT	22 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT

23	23

24 IPC_STRUCT_BEGIN(FrameMsg_BuffersSwapped_Params)	24 IPC_STRUCT_BEGIN(FrameMsg_BuffersSwapped_Params)

25 IPC_STRUCT_MEMBER(int, gpu_host_id)	25 IPC_STRUCT_MEMBER(int, gpu_host_id)

26 IPC_STRUCT_MEMBER(int, gpu_route_id)	26 IPC_STRUCT_MEMBER(int, gpu_route_id)

27 IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox)	27 IPC_STRUCT_MEMBER(std::string, mailbox_name)

28 IPC_STRUCT_MEMBER(gfx::Size, size)	28 IPC_STRUCT_MEMBER(gfx::Size, size)

29 IPC_STRUCT_END()	29 IPC_STRUCT_END()

30	30

31 IPC_STRUCT_BEGIN(FrameMsg_CompositorFrameSwapped_Params)	31 IPC_STRUCT_BEGIN(FrameMsg_CompositorFrameSwapped_Params)

32 // Specifies which RenderWidget produced the CompositorFrame.	32 // Specifies which RenderWidget produced the CompositorFrame.

33 IPC_STRUCT_MEMBER(int, producing_host_id)	33 IPC_STRUCT_MEMBER(int, producing_host_id)

34 IPC_STRUCT_MEMBER(int, producing_route_id)	34 IPC_STRUCT_MEMBER(int, producing_route_id)

35	35

36 IPC_STRUCT_MEMBER(cc::CompositorFrame, frame)	36 IPC_STRUCT_MEMBER(cc::CompositorFrame, frame)

37 IPC_STRUCT_MEMBER(uint32, output_surface_id)	37 IPC_STRUCT_MEMBER(uint32, output_surface_id)

38 IPC_STRUCT_END()	38 IPC_STRUCT_END()

39	39

40 IPC_STRUCT_BEGIN(FrameHostMsg_BuffersSwappedACK_Params)	40 IPC_STRUCT_BEGIN(FrameHostMsg_BuffersSwappedACK_Params)

41 IPC_STRUCT_MEMBER(int, gpu_host_id)	41 IPC_STRUCT_MEMBER(int, gpu_host_id)

42 IPC_STRUCT_MEMBER(int, gpu_route_id)	42 IPC_STRUCT_MEMBER(int, gpu_route_id)

43 IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox)	43 IPC_STRUCT_MEMBER(std::string, mailbox_name)

44 IPC_STRUCT_MEMBER(uint32, sync_point)	44 IPC_STRUCT_MEMBER(uint32, sync_point)

45 IPC_STRUCT_END()	45 IPC_STRUCT_END()

46	46

47 IPC_STRUCT_BEGIN(FrameHostMsg_CompositorFrameSwappedACK_Params)	47 IPC_STRUCT_BEGIN(FrameHostMsg_CompositorFrameSwappedACK_Params)

48 // Specifies which RenderWidget produced the CompositorFrame.	48 // Specifies which RenderWidget produced the CompositorFrame.

49 IPC_STRUCT_MEMBER(int, producing_host_id)	49 IPC_STRUCT_MEMBER(int, producing_host_id)

50 IPC_STRUCT_MEMBER(int, producing_route_id)	50 IPC_STRUCT_MEMBER(int, producing_route_id)

51	51

52 IPC_STRUCT_MEMBER(uint32, output_surface_id)	52 IPC_STRUCT_MEMBER(uint32, output_surface_id)

53 IPC_STRUCT_MEMBER(cc::CompositorFrameAck, ack)	53 IPC_STRUCT_MEMBER(cc::CompositorFrameAck, ack)

54 IPC_STRUCT_END()	54 IPC_STRUCT_END()

55	55

56 IPC_STRUCT_BEGIN(FrameHostMsg_ReclaimCompositorResources_Params)	56 IPC_STRUCT_BEGIN(FrameHostMsg_ReclaimCompositorResources_Params)

57 IPC_STRUCT_MEMBER(int, route_id)	57 IPC_STRUCT_MEMBER(int, route_id)

58 IPC_STRUCT_MEMBER(uint32, output_surface_id)	58 IPC_STRUCT_MEMBER(uint32, output_surface_id)

59 IPC_STRUCT_MEMBER(int, renderer_host_id)	59 IPC_STRUCT_MEMBER(int, renderer_host_id)

60 IPC_STRUCT_MEMBER(cc::CompositorFrameAck, ack)	60 IPC_STRUCT_MEMBER(cc::CompositorFrameAck, ack)

61 IPC_STRUCT_END()	61 IPC_STRUCT_END()

62	62

63 #endif // CONTENT_COMMON_FRAME_PARAM_MACROS_H_	63 #endif // CONTENT_COMMON_FRAME_PARAM_MACROS_H_

OLD	NEW