| Index: gpu/ipc/common/gpu_command_buffer_traits.cc
|
| diff --git a/gpu/ipc/common/gpu_command_buffer_traits.cc b/gpu/ipc/common/gpu_command_buffer_traits.cc
|
| index a6d68c3fbded4ff33614d9b93bacc8d43c998fb5..84b127d879c83bf346a531d478c35fd572838b7b 100644
|
| --- a/gpu/ipc/common/gpu_command_buffer_traits.cc
|
| +++ b/gpu/ipc/common/gpu_command_buffer_traits.cc
|
| @@ -11,6 +11,7 @@
|
| #include "gpu/command_buffer/common/mailbox_holder.h"
|
| #include "gpu/command_buffer/common/sync_token.h"
|
| #include "gpu/command_buffer/common/texture_in_use_response.h"
|
| +#include "ui/gfx/ipc/gfx_param_traits.h"
|
|
|
| // Generate param traits size methods.
|
| #include "ipc/param_traits_size_macros.h"
|
| @@ -125,33 +126,40 @@ void ParamTraits<gpu::SyncToken>::Log(const param_type& p, std::string* l) {
|
| void ParamTraits<gpu::TextureInUseResponse>::GetSize(base::PickleSizer* s,
|
| const param_type& p) {
|
| GetParamSize(s, p.texture);
|
| - GetParamSize(s, p.in_use);
|
| + GetParamSize(s, p.gpu_memory_buffer_handle);
|
| + GetParamSize(s, p.in_use_valid);
|
| }
|
|
|
| void ParamTraits<gpu::TextureInUseResponse>::Write(base::Pickle* m,
|
| const param_type& p) {
|
| WriteParam(m, p.texture);
|
| - WriteParam(m, p.in_use);
|
| + WriteParam(m, p.gpu_memory_buffer_handle);
|
| + WriteParam(m, p.in_use_valid);
|
| }
|
|
|
| bool ParamTraits<gpu::TextureInUseResponse>::Read(const base::Pickle* m,
|
| base::PickleIterator* iter,
|
| param_type* p) {
|
| uint32_t texture = 0;
|
| - bool in_use = false;
|
| + gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle;
|
| + bool in_use_valid = false;
|
|
|
| - if (!ReadParam(m, iter, &texture) || !ReadParam(m, iter, &in_use)) {
|
| + if (!ReadParam(m, iter, &texture) ||
|
| + !ReadParam(m, iter, &gpu_memory_buffer_handle) ||
|
| + !ReadParam(m, iter, &in_use_valid)) {
|
| return false;
|
| }
|
|
|
| p->texture = texture;
|
| - p->in_use = in_use;
|
| + p->gpu_memory_buffer_handle = gpu_memory_buffer_handle;
|
| + p->in_use_valid = in_use_valid;
|
| return true;
|
| }
|
|
|
| void ParamTraits<gpu::TextureInUseResponse>::Log(const param_type& p,
|
| std::string* l) {
|
| - *l += base::StringPrintf("[%u: %d]", p.texture, static_cast<int>(p.in_use));
|
| + *l += base::StringPrintf("[%u: %d]", p.texture,
|
| + static_cast<int>(p.in_use_valid));
|
| }
|
|
|
| void ParamTraits<gpu::Mailbox>::GetSize(base::PickleSizer* s,
|
|
|