Modified old wait sync point functions to also accept new sync tokens.

gpu/ipc/gpu_command_buffer_traits.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/ipc/gpu_command_buffer_traits.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"
 
@@ skipping 99 matching lines @@
 }
 
 void ParamTraits<gpu::Mailbox>::Log(const param_type& p, std::string* l) {
   for (size_t i = 0; i < sizeof(p.name); ++i)
     *l += base::StringPrintf("%02x", p.name[i]);
 }
 
 void ParamTraits<gpu::MailboxHolder>::Write(Message* m, const param_type& p) {
   WriteParam(m, p.mailbox);
   WriteParam(m, p.texture_target);
-  WriteParam(m, p.sync_point);
+  WriteParam(m, p.sync_token);
 }
 
 bool ParamTraits<gpu::MailboxHolder> ::Read(const Message* m,
                                             base::PickleIterator* iter,
                                             param_type* p) {
   if (!ReadParam(m, iter, &p->mailbox) ||
       !ReadParam(m, iter, &p->texture_target) ||
-      !ReadParam(m, iter, &p->sync_point))
+      !ReadParam(m, iter, &p->sync_token))
     return false;
   return true;
 }
 
 void ParamTraits<gpu::MailboxHolder>::Log(const param_type& p, std::string* l) {
   ParamTraits<gpu::Mailbox>::Log(p.mailbox, l);
-  *l += base::StringPrintf(":%04x@%d", p.texture_target, p.sync_point);
+  *l += base::StringPrintf(":%04x@", p.texture_target);
+  ParamTraits<gpu::SyncToken>::Log(p.sync_token, l);
 }
 
 void ParamTraits<gpu::ValueState>::Write(Message* m, const param_type& p) {
   m->WriteData(reinterpret_cast<const char*>(&p),
                sizeof(gpu::ValueState));
 }
 
 bool ParamTraits<gpu::ValueState> ::Read(const Message* m,
                                          base::PickleIterator* iter,
                                          param_type* p) {
@@ skipping 10 matching lines @@
   l->append("<ValueState (");
   for (int value : p.int_value)
     *l += base::StringPrintf("%i ", value);
   l->append(" int values ");
   for (float value : p.float_value)
     *l += base::StringPrintf("%f ", value);
   l->append(" float values)>");
 }
 
 }  // namespace IPC