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

Side by Side Diff: content/common/cc_messages.h

Issue 1142343008: cc: Rework overlays to not use the ResourceProvider and pass texture size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix more tests Created 5 years, 6 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
OLDNEW
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/begin_frame_args.h" 7 #include "cc/output/begin_frame_args.h"
8 #include "cc/output/compositor_frame.h" 8 #include "cc/output/compositor_frame.h"
9 #include "cc/output/compositor_frame_ack.h" 9 #include "cc/output/compositor_frame_ack.h"
10 #include "cc/output/filter_operation.h" 10 #include "cc/output/filter_operation.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 }; 119 };
120 120
121 template <> 121 template <>
122 struct CONTENT_EXPORT ParamTraits<cc::DrawQuad::Resources> { 122 struct CONTENT_EXPORT ParamTraits<cc::DrawQuad::Resources> {
123 typedef cc::DrawQuad::Resources param_type; 123 typedef cc::DrawQuad::Resources param_type;
124 static void Write(Message* m, const param_type& p); 124 static void Write(Message* m, const param_type& p);
125 static bool Read(const Message* m, base::PickleIterator* iter, param_type* p); 125 static bool Read(const Message* m, base::PickleIterator* iter, param_type* p);
126 static void Log(const param_type& p, std::string* l); 126 static void Log(const param_type& p, std::string* l);
127 }; 127 };
128 128
129 template <>
130 struct CONTENT_EXPORT ParamTraits<cc::StreamVideoDrawQuad::OverlayResources> {
131 typedef cc::StreamVideoDrawQuad::OverlayResources param_type;
132 static void Write(Message* m, const param_type& p);
133 static bool Read(const Message* m, base::PickleIterator* iter, param_type* p);
134 static void Log(const param_type& p, std::string* l);
135 };
136
137 template <>
138 struct CONTENT_EXPORT ParamTraits<cc::TextureDrawQuad::OverlayResources> {
139 typedef cc::TextureDrawQuad::OverlayResources param_type;
140 static void Write(Message* m, const param_type& p);
141 static bool Read(const Message* m, base::PickleIterator* iter, param_type* p);
142 static void Log(const param_type& p, std::string* l);
143 };
144
129 } // namespace IPC 145 } // namespace IPC
130 146
131 #endif // CONTENT_COMMON_CC_MESSAGES_H_ 147 #endif // CONTENT_COMMON_CC_MESSAGES_H_
132 148
133 // Multiply-included message file, hence no include guard. 149 // Multiply-included message file, hence no include guard.
134 150
135 #define IPC_MESSAGE_START CCMsgStart 151 #define IPC_MESSAGE_START CCMsgStart
136 #undef IPC_MESSAGE_EXPORT 152 #undef IPC_MESSAGE_EXPORT
137 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT 153 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
138 154
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 IPC_STRUCT_TRAITS_END() 215 IPC_STRUCT_TRAITS_END()
200 216
201 IPC_STRUCT_TRAITS_BEGIN(cc::SolidColorDrawQuad) 217 IPC_STRUCT_TRAITS_BEGIN(cc::SolidColorDrawQuad)
202 IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad) 218 IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad)
203 IPC_STRUCT_TRAITS_MEMBER(color) 219 IPC_STRUCT_TRAITS_MEMBER(color)
204 IPC_STRUCT_TRAITS_MEMBER(force_anti_aliasing_off) 220 IPC_STRUCT_TRAITS_MEMBER(force_anti_aliasing_off)
205 IPC_STRUCT_TRAITS_END() 221 IPC_STRUCT_TRAITS_END()
206 222
207 IPC_STRUCT_TRAITS_BEGIN(cc::StreamVideoDrawQuad) 223 IPC_STRUCT_TRAITS_BEGIN(cc::StreamVideoDrawQuad)
208 IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad) 224 IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad)
225 IPC_STRUCT_TRAITS_MEMBER(overlay_resources)
209 IPC_STRUCT_TRAITS_MEMBER(matrix) 226 IPC_STRUCT_TRAITS_MEMBER(matrix)
210 IPC_STRUCT_TRAITS_END() 227 IPC_STRUCT_TRAITS_END()
211 228
212 IPC_STRUCT_TRAITS_BEGIN(cc::SurfaceDrawQuad) 229 IPC_STRUCT_TRAITS_BEGIN(cc::SurfaceDrawQuad)
213 IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad) 230 IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad)
214 IPC_STRUCT_TRAITS_MEMBER(surface_id) 231 IPC_STRUCT_TRAITS_MEMBER(surface_id)
215 IPC_STRUCT_TRAITS_END() 232 IPC_STRUCT_TRAITS_END()
216 233
217 IPC_STRUCT_TRAITS_BEGIN(cc::TextureDrawQuad) 234 IPC_STRUCT_TRAITS_BEGIN(cc::TextureDrawQuad)
218 IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad) 235 IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad)
236 IPC_STRUCT_TRAITS_MEMBER(overlay_resources)
219 IPC_STRUCT_TRAITS_MEMBER(premultiplied_alpha) 237 IPC_STRUCT_TRAITS_MEMBER(premultiplied_alpha)
220 IPC_STRUCT_TRAITS_MEMBER(uv_top_left) 238 IPC_STRUCT_TRAITS_MEMBER(uv_top_left)
221 IPC_STRUCT_TRAITS_MEMBER(uv_bottom_right) 239 IPC_STRUCT_TRAITS_MEMBER(uv_bottom_right)
222 IPC_STRUCT_TRAITS_MEMBER(background_color) 240 IPC_STRUCT_TRAITS_MEMBER(background_color)
223 IPC_STRUCT_TRAITS_MEMBER(vertex_opacity[0]) 241 IPC_STRUCT_TRAITS_MEMBER(vertex_opacity[0])
224 IPC_STRUCT_TRAITS_MEMBER(vertex_opacity[1]) 242 IPC_STRUCT_TRAITS_MEMBER(vertex_opacity[1])
225 IPC_STRUCT_TRAITS_MEMBER(vertex_opacity[2]) 243 IPC_STRUCT_TRAITS_MEMBER(vertex_opacity[2])
226 IPC_STRUCT_TRAITS_MEMBER(vertex_opacity[3]) 244 IPC_STRUCT_TRAITS_MEMBER(vertex_opacity[3])
227 IPC_STRUCT_TRAITS_MEMBER(y_flipped) 245 IPC_STRUCT_TRAITS_MEMBER(y_flipped)
228 IPC_STRUCT_TRAITS_MEMBER(nearest_neighbor) 246 IPC_STRUCT_TRAITS_MEMBER(nearest_neighbor)
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 IPC_STRUCT_TRAITS_MEMBER(latency_info) 333 IPC_STRUCT_TRAITS_MEMBER(latency_info)
316 IPC_STRUCT_TRAITS_MEMBER(satisfies_sequences) 334 IPC_STRUCT_TRAITS_MEMBER(satisfies_sequences)
317 IPC_STRUCT_TRAITS_END() 335 IPC_STRUCT_TRAITS_END()
318 336
319 IPC_STRUCT_TRAITS_BEGIN(cc::GLFrameData) 337 IPC_STRUCT_TRAITS_BEGIN(cc::GLFrameData)
320 IPC_STRUCT_TRAITS_MEMBER(mailbox) 338 IPC_STRUCT_TRAITS_MEMBER(mailbox)
321 IPC_STRUCT_TRAITS_MEMBER(sync_point) 339 IPC_STRUCT_TRAITS_MEMBER(sync_point)
322 IPC_STRUCT_TRAITS_MEMBER(size) 340 IPC_STRUCT_TRAITS_MEMBER(size)
323 IPC_STRUCT_TRAITS_MEMBER(sub_buffer_rect) 341 IPC_STRUCT_TRAITS_MEMBER(sub_buffer_rect)
324 IPC_STRUCT_TRAITS_END() 342 IPC_STRUCT_TRAITS_END()
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698