| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/memory/shared_memory_handle.h" | 7 #include "base/memory/shared_memory_handle.h" |
| 8 #include "cc/output/begin_frame_args.h" | 8 #include "cc/output/begin_frame_args.h" |
| 9 #include "cc/output/compositor_frame.h" | 9 #include "cc/output/compositor_frame.h" |
| 10 #include "cc/output/compositor_frame_ack.h" | 10 #include "cc/output/compositor_frame_ack.h" |
| 11 #include "content/common/content_export.h" | 11 #include "content/common/content_export.h" |
| 12 #include "content/common/content_param_traits.h" | 12 #include "content/common/content_param_traits.h" |
| 13 #include "content/common/input/did_overscroll_params.h" | 13 #include "content/common/input/did_overscroll_params.h" |
| 14 #include "content/common/input/input_event_ack_state.h" | 14 #include "content/common/input/input_event_ack_state.h" |
| 15 #include "ipc/ipc_message_macros.h" | 15 #include "ipc/ipc_message_macros.h" |
| 16 #include "third_party/WebKit/public/web/WebInputEvent.h" | 16 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 17 #include "ui/gfx/geometry/point.h" | 17 #include "ui/gfx/geometry/point.h" |
| 18 #include "ui/gfx/geometry/scroll_offset.h" | 18 #include "ui/gfx/geometry/scroll_offset.h" |
| 19 | 19 |
| 20 #ifndef CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_ | 20 #ifndef CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_ |
| 21 #define CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_ | 21 #define CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_ |
| 22 | 22 |
| 23 namespace content { | 23 namespace content { |
| 24 | 24 |
| 25 struct SyncCompositorCommonBrowserParams { | 25 struct SyncCompositorCommonBrowserParams { |
| 26 SyncCompositorCommonBrowserParams(); | 26 SyncCompositorCommonBrowserParams(); |
| 27 ~SyncCompositorCommonBrowserParams(); | 27 ~SyncCompositorCommonBrowserParams(); |
| 28 | 28 |
| 29 uint32_t bytes_limit; | 29 uint32_t bytes_limit; |
| 30 uint32_t output_surface_id_for_returned_resources; | |
| 31 cc::CompositorFrameAck ack; | |
| 32 gfx::ScrollOffset root_scroll_offset; | 30 gfx::ScrollOffset root_scroll_offset; |
| 33 bool update_root_scroll_offset; | 31 bool update_root_scroll_offset; |
| 34 bool begin_frame_source_paused; | 32 bool begin_frame_source_paused; |
| 35 }; | 33 }; |
| 36 | 34 |
| 37 struct SyncCompositorDemandDrawHwParams { | 35 struct SyncCompositorDemandDrawHwParams { |
| 38 SyncCompositorDemandDrawHwParams(); | 36 SyncCompositorDemandDrawHwParams(); |
| 39 SyncCompositorDemandDrawHwParams( | 37 SyncCompositorDemandDrawHwParams( |
| 40 const gfx::Size& surface_size, | 38 const gfx::Size& surface_size, |
| 41 const gfx::Transform& transform, | 39 const gfx::Transform& transform, |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 #endif // CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_ | 89 #endif // CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_ |
| 92 | 90 |
| 93 // Multiply-included message file, hence no include guard. | 91 // Multiply-included message file, hence no include guard. |
| 94 | 92 |
| 95 #undef IPC_MESSAGE_EXPORT | 93 #undef IPC_MESSAGE_EXPORT |
| 96 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 94 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 97 #define IPC_MESSAGE_START SyncCompositorMsgStart | 95 #define IPC_MESSAGE_START SyncCompositorMsgStart |
| 98 | 96 |
| 99 IPC_STRUCT_TRAITS_BEGIN(content::SyncCompositorCommonBrowserParams) | 97 IPC_STRUCT_TRAITS_BEGIN(content::SyncCompositorCommonBrowserParams) |
| 100 IPC_STRUCT_TRAITS_MEMBER(bytes_limit) | 98 IPC_STRUCT_TRAITS_MEMBER(bytes_limit) |
| 101 IPC_STRUCT_TRAITS_MEMBER(output_surface_id_for_returned_resources) | |
| 102 IPC_STRUCT_TRAITS_MEMBER(ack) | |
| 103 IPC_STRUCT_TRAITS_MEMBER(root_scroll_offset) | 99 IPC_STRUCT_TRAITS_MEMBER(root_scroll_offset) |
| 104 IPC_STRUCT_TRAITS_MEMBER(update_root_scroll_offset) | 100 IPC_STRUCT_TRAITS_MEMBER(update_root_scroll_offset) |
| 105 IPC_STRUCT_TRAITS_MEMBER(begin_frame_source_paused) | 101 IPC_STRUCT_TRAITS_MEMBER(begin_frame_source_paused) |
| 106 IPC_STRUCT_TRAITS_END() | 102 IPC_STRUCT_TRAITS_END() |
| 107 | 103 |
| 108 IPC_STRUCT_TRAITS_BEGIN(content::SyncCompositorDemandDrawHwParams) | 104 IPC_STRUCT_TRAITS_BEGIN(content::SyncCompositorDemandDrawHwParams) |
| 109 IPC_STRUCT_TRAITS_MEMBER(surface_size) | 105 IPC_STRUCT_TRAITS_MEMBER(surface_size) |
| 110 IPC_STRUCT_TRAITS_MEMBER(transform) | 106 IPC_STRUCT_TRAITS_MEMBER(transform) |
| 111 IPC_STRUCT_TRAITS_MEMBER(viewport) | 107 IPC_STRUCT_TRAITS_MEMBER(viewport) |
| 112 IPC_STRUCT_TRAITS_MEMBER(clip) | 108 IPC_STRUCT_TRAITS_MEMBER(clip) |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 | 178 |
| 183 IPC_MESSAGE_ROUTED1(SyncCompositorMsg_UpdateState, | 179 IPC_MESSAGE_ROUTED1(SyncCompositorMsg_UpdateState, |
| 184 content::SyncCompositorCommonBrowserParams) | 180 content::SyncCompositorCommonBrowserParams) |
| 185 | 181 |
| 186 IPC_SYNC_MESSAGE_ROUTED3_1(SyncCompositorMsg_ZoomBy, | 182 IPC_SYNC_MESSAGE_ROUTED3_1(SyncCompositorMsg_ZoomBy, |
| 187 content::SyncCompositorCommonBrowserParams, | 183 content::SyncCompositorCommonBrowserParams, |
| 188 float /* delta */, | 184 float /* delta */, |
| 189 gfx::Point /* anchor */, | 185 gfx::Point /* anchor */, |
| 190 content::SyncCompositorCommonRendererParams) | 186 content::SyncCompositorCommonRendererParams) |
| 191 | 187 |
| 188 IPC_MESSAGE_ROUTED2(SyncCompositorMsg_ReclaimResources, |
| 189 uint32_t /* output_surface_id */, |
| 190 cc::CompositorFrameAck); |
| 191 |
| 192 // ----------------------------------------------------------------------------- | 192 // ----------------------------------------------------------------------------- |
| 193 // Messages sent from the renderer to the browser. | 193 // Messages sent from the renderer to the browser. |
| 194 | 194 |
| 195 IPC_MESSAGE_ROUTED1(SyncCompositorHostMsg_UpdateState, | 195 IPC_MESSAGE_ROUTED1(SyncCompositorHostMsg_UpdateState, |
| 196 content::SyncCompositorCommonRendererParams) | 196 content::SyncCompositorCommonRendererParams) |
| 197 | 197 |
| 198 IPC_MESSAGE_ROUTED2(SyncCompositorHostMsg_OverScroll, | 198 IPC_MESSAGE_ROUTED2(SyncCompositorHostMsg_OverScroll, |
| 199 content::SyncCompositorCommonRendererParams, | 199 content::SyncCompositorCommonRendererParams, |
| 200 content::DidOverscrollParams) | 200 content::DidOverscrollParams) |
| OLD | NEW |