Send compositor frame IPC with metadata.

content/common/cc_messages.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 "content/common/cc_messages.h"
 
 #include "cc/compositor_frame.h"
 #include "content/public/common/common_param_traits.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
@@ skipping 551 matching lines @@
   DCHECK(bytes);
   memcpy(p->name, bytes, sizeof(p->name));
   return true;
 }
 
 void ParamTraits<cc::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<cc::CompositorFrame>::Write(Message* m, const param_type& p) {
+void ParamTraits<cc::DelegatedCompositorFrame>::Write(Message* m,
+                                                      const param_type& p) {
+  WriteParam(m, static_cast<const cc::CompositorFrame&>(p));
   WriteParam(m, p.size);
   WriteParam(m, p.resource_list);
   WriteParam(m, p.render_pass_list.size());
   for (size_t i = 0; i < p.render_pass_list.size(); ++i)
     WriteParam(m, *p.render_pass_list[i]);
 }
 
-bool ParamTraits<cc::CompositorFrame>::Read(const Message* m,
+bool ParamTraits<cc::DelegatedCompositorFrame>::Read(const Message* m,
                                             PickleIterator* iter,
                                             param_type* p) {
   const static size_t kMaxRenderPasses = 10000;
 
+  if (!ReadParam(m, iter, static_cast<cc::CompositorFrame*>(p)))

[piman, 2012/12/14 22:02:22]

Also fail if the read type is not DELEGATED.

[aelias_OOO_until_Jul13, 2012/12/15 00:06:17]

Done.

+    return false;
+
   size_t num_render_passes;
   if (!ReadParam(m, iter, &p->size) ||
       !ReadParam(m, iter, &p->resource_list) ||
       !ReadParam(m, iter, &num_render_passes) ||
       num_render_passes > kMaxRenderPasses)
     return false;
   for (size_t i = 0; i < num_render_passes; ++i) {
     scoped_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create();
     if (!ReadParam(m, iter, render_pass.get()))
       return false;
     p->render_pass_list.append(render_pass.Pass());
   }
   return true;
 }
 
-void ParamTraits<cc::CompositorFrame>::Log(const param_type& p,
-                                           std::string* l) {
-  l->append("CompositorFrame(");
+void ParamTraits<cc::DelegatedCompositorFrame>::Log(const param_type& p,
+                                                    std::string* l) {
+  l->append("DelegatedCompositorFrame(");
+  LogParam(static_cast<const cc::CompositorFrame&>(p), l);
   LogParam(p.size, l);
   l->append(", ");
   LogParam(p.resource_list, l);
   l->append(", [");
   for (size_t i = 0; i < p.render_pass_list.size(); ++i) {
     if (i)
       l->append(", ");
     LogParam(*p.render_pass_list[i], l);
   }
   l->append("])");
 }
 
 }  // namespace IPC