Chromium Code Reviews| Index: gpu/ipc/gpu_command_buffer_traits.cc |
| diff --git a/gpu/ipc/gpu_command_buffer_traits.cc b/gpu/ipc/gpu_command_buffer_traits.cc |
| index fdf2e15c6c28ac4c251b6ea69315d4ff002a56d3..be302db6226668939fa718087d47c5bf727e24b8 100644 |
| --- a/gpu/ipc/gpu_command_buffer_traits.cc |
| +++ b/gpu/ipc/gpu_command_buffer_traits.cc |
| @@ -7,6 +7,7 @@ |
| #include <stddef.h> |
| #include <stdint.h> |
| +#include "gpu/command_buffer/common/command_buffer_id.h" |
| #include "gpu/command_buffer/common/mailbox_holder.h" |
| #include "gpu/command_buffer/common/sync_token.h" |
| #include "gpu/command_buffer/common/value_state.h" |
| @@ -95,7 +96,7 @@ bool ParamTraits<gpu::SyncToken>::Read(const base::Pickle* m, |
| bool verified_flush = false; |
| gpu::CommandBufferNamespace namespace_id = |
| gpu::CommandBufferNamespace::INVALID; |
| - uint64_t command_buffer_id = 0; |
| + gpu::CommandBufferId command_buffer_id; |
| uint64_t release_count = 0; |
| if (!ReadParam(m, iter, &verified_flush) || |
| @@ -116,10 +117,9 @@ bool ParamTraits<gpu::SyncToken>::Read(const base::Pickle* m, |
| } |
| void ParamTraits<gpu::SyncToken>::Log(const param_type& p, std::string* l) { |
| - *l += |
| - base::StringPrintf("[%d:%llX] %llu", static_cast<int>(p.namespace_id()), |
| - static_cast<unsigned long long>(p.command_buffer_id()), |
| - static_cast<unsigned long long>(p.release_count())); |
| + *l += base::StringPrintf( |
| + "[%" PRId8 ":%" PRIX64 "] %" PRIu64, p.namespace_id(), |
|
dcheng
2016/02/12 22:38:19
Should this be lowercase 'x'?
Łukasz Anforowicz
2016/02/12 22:47:49
I think this should be an uppercase 'X', because
1
|
| + p.command_buffer_id().GetUnsafeValue(), p.release_count()); |
| } |
| void ParamTraits<gpu::Mailbox>::GetSize(base::PickleSizer* s, |