| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // IPC Messages sent between compositor instances. | 5 // IPC Messages sent between compositor instances. |
| 6 | 6 |
| 7 #include "cc/output/compositor_frame.h" | 7 #include "cc/output/compositor_frame.h" |
| 8 #include "cc/output/compositor_frame_ack.h" | 8 #include "cc/output/compositor_frame_ack.h" |
| 9 #include "cc/output/filter_operation.h" |
| 9 #include "cc/quads/checkerboard_draw_quad.h" | 10 #include "cc/quads/checkerboard_draw_quad.h" |
| 10 #include "cc/quads/debug_border_draw_quad.h" | 11 #include "cc/quads/debug_border_draw_quad.h" |
| 11 #include "cc/quads/draw_quad.h" | 12 #include "cc/quads/draw_quad.h" |
| 12 #include "cc/quads/io_surface_draw_quad.h" | 13 #include "cc/quads/io_surface_draw_quad.h" |
| 13 #include "cc/quads/picture_draw_quad.h" | 14 #include "cc/quads/picture_draw_quad.h" |
| 14 #include "cc/quads/render_pass.h" | 15 #include "cc/quads/render_pass.h" |
| 15 #include "cc/quads/render_pass_draw_quad.h" | 16 #include "cc/quads/render_pass_draw_quad.h" |
| 16 #include "cc/quads/shared_quad_state.h" | 17 #include "cc/quads/shared_quad_state.h" |
| 17 #include "cc/quads/solid_color_draw_quad.h" | 18 #include "cc/quads/solid_color_draw_quad.h" |
| 18 #include "cc/quads/stream_video_draw_quad.h" | 19 #include "cc/quads/stream_video_draw_quad.h" |
| 19 #include "cc/quads/texture_draw_quad.h" | 20 #include "cc/quads/texture_draw_quad.h" |
| 20 #include "cc/quads/tile_draw_quad.h" | 21 #include "cc/quads/tile_draw_quad.h" |
| 21 #include "cc/quads/yuv_video_draw_quad.h" | 22 #include "cc/quads/yuv_video_draw_quad.h" |
| 22 #include "cc/resources/transferable_resource.h" | 23 #include "cc/resources/transferable_resource.h" |
| 23 #include "content/common/content_export.h" | 24 #include "content/common/content_export.h" |
| 24 #include "gpu/ipc/gpu_command_buffer_traits.h" | 25 #include "gpu/ipc/gpu_command_buffer_traits.h" |
| 25 #include "ipc/ipc_message_macros.h" | 26 #include "ipc/ipc_message_macros.h" |
| 26 #include "third_party/WebKit/public/platform/WebFilterOperation.h" | |
| 27 | 27 |
| 28 #ifndef CONTENT_COMMON_CC_MESSAGES_H_ | 28 #ifndef CONTENT_COMMON_CC_MESSAGES_H_ |
| 29 #define CONTENT_COMMON_CC_MESSAGES_H_ | 29 #define CONTENT_COMMON_CC_MESSAGES_H_ |
| 30 | 30 |
| 31 namespace gfx { | 31 namespace gfx { |
| 32 class Transform; | 32 class Transform; |
| 33 } | 33 } |
| 34 | 34 |
| 35 namespace WebKit { | 35 namespace cc { |
| 36 class WebFilterOperations; | 36 class FilterOperations; |
| 37 } | 37 } |
| 38 | 38 |
| 39 namespace IPC { | 39 namespace IPC { |
| 40 | 40 |
| 41 template <> | 41 template <> |
| 42 struct ParamTraits<WebKit::WebFilterOperation> { | 42 struct ParamTraits<cc::FilterOperation> { |
| 43 typedef WebKit::WebFilterOperation param_type; | 43 typedef cc::FilterOperation param_type; |
| 44 static void Write(Message* m, const param_type& p); | 44 static void Write(Message* m, const param_type& p); |
| 45 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 45 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| 46 static void Log(const param_type& p, std::string* l); | 46 static void Log(const param_type& p, std::string* l); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 template <> | 49 template <> |
| 50 struct ParamTraits<WebKit::WebFilterOperations> { | 50 struct ParamTraits<cc::FilterOperations> { |
| 51 typedef WebKit::WebFilterOperations param_type; | 51 typedef cc::FilterOperations param_type; |
| 52 static void Write(Message* m, const param_type& p); | 52 static void Write(Message* m, const param_type& p); |
| 53 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 53 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| 54 static void Log(const param_type& p, std::string* l); | 54 static void Log(const param_type& p, std::string* l); |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 template <> | 57 template <> |
| 58 struct ParamTraits<gfx::Transform> { | 58 struct ParamTraits<gfx::Transform> { |
| 59 typedef gfx::Transform param_type; | 59 typedef gfx::Transform param_type; |
| 60 static void Write(Message* m, const param_type& p); | 60 static void Write(Message* m, const param_type& p); |
| 61 static bool Read(const Message* m, PickleIterator* iter, param_type* r); | 61 static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 #endif // CONTENT_COMMON_CC_MESSAGES_H_ | 99 #endif // CONTENT_COMMON_CC_MESSAGES_H_ |
| 100 | 100 |
| 101 // Multiply-included message file, hence no include guard. | 101 // Multiply-included message file, hence no include guard. |
| 102 | 102 |
| 103 #define IPC_MESSAGE_START CCMsgStart | 103 #define IPC_MESSAGE_START CCMsgStart |
| 104 #undef IPC_MESSAGE_EXPORT | 104 #undef IPC_MESSAGE_EXPORT |
| 105 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 105 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 106 | 106 |
| 107 IPC_ENUM_TRAITS(cc::DrawQuad::Material) | 107 IPC_ENUM_TRAITS(cc::DrawQuad::Material) |
| 108 IPC_ENUM_TRAITS(cc::IOSurfaceDrawQuad::Orientation) | 108 IPC_ENUM_TRAITS(cc::IOSurfaceDrawQuad::Orientation) |
| 109 IPC_ENUM_TRAITS(WebKit::WebFilterOperation::FilterType) | 109 IPC_ENUM_TRAITS(cc::FilterOperation::FilterType) |
| 110 | 110 |
| 111 IPC_STRUCT_TRAITS_BEGIN(cc::RenderPass::Id) | 111 IPC_STRUCT_TRAITS_BEGIN(cc::RenderPass::Id) |
| 112 IPC_STRUCT_TRAITS_MEMBER(layer_id) | 112 IPC_STRUCT_TRAITS_MEMBER(layer_id) |
| 113 IPC_STRUCT_TRAITS_MEMBER(index) | 113 IPC_STRUCT_TRAITS_MEMBER(index) |
| 114 IPC_STRUCT_TRAITS_END() | 114 IPC_STRUCT_TRAITS_END() |
| 115 | 115 |
| 116 IPC_STRUCT_TRAITS_BEGIN(cc::DrawQuad) | 116 IPC_STRUCT_TRAITS_BEGIN(cc::DrawQuad) |
| 117 IPC_STRUCT_TRAITS_MEMBER(material) | 117 IPC_STRUCT_TRAITS_MEMBER(material) |
| 118 IPC_STRUCT_TRAITS_MEMBER(rect) | 118 IPC_STRUCT_TRAITS_MEMBER(rect) |
| 119 IPC_STRUCT_TRAITS_MEMBER(opaque_rect) | 119 IPC_STRUCT_TRAITS_MEMBER(opaque_rect) |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 IPC_STRUCT_TRAITS_MEMBER(size) | 232 IPC_STRUCT_TRAITS_MEMBER(size) |
| 233 IPC_STRUCT_TRAITS_MEMBER(sub_buffer_rect) | 233 IPC_STRUCT_TRAITS_MEMBER(sub_buffer_rect) |
| 234 IPC_STRUCT_TRAITS_END() | 234 IPC_STRUCT_TRAITS_END() |
| 235 | 235 |
| 236 IPC_STRUCT_TRAITS_BEGIN(cc::SoftwareFrameData) | 236 IPC_STRUCT_TRAITS_BEGIN(cc::SoftwareFrameData) |
| 237 IPC_STRUCT_TRAITS_MEMBER(id) | 237 IPC_STRUCT_TRAITS_MEMBER(id) |
| 238 IPC_STRUCT_TRAITS_MEMBER(size) | 238 IPC_STRUCT_TRAITS_MEMBER(size) |
| 239 IPC_STRUCT_TRAITS_MEMBER(damage_rect) | 239 IPC_STRUCT_TRAITS_MEMBER(damage_rect) |
| 240 IPC_STRUCT_TRAITS_MEMBER(handle) | 240 IPC_STRUCT_TRAITS_MEMBER(handle) |
| 241 IPC_STRUCT_TRAITS_END() | 241 IPC_STRUCT_TRAITS_END() |
| OLD | NEW |