Getting rid of DelegatedFrameData

cc/ipc/cc_param_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 "cc/ipc/cc_param_traits.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/numerics/safe_conversions.h"
@@ skipping 663 matching lines @@
 namespace {
 enum CompositorFrameType {
   NO_FRAME,
   DELEGATED_FRAME,
 };
 }
 
 void ParamTraits<cc::CompositorFrame>::Write(base::Pickle* m,
                                              const param_type& p) {
   WriteParam(m, p.metadata);
-  if (p.delegated_frame_data) {
-    WriteParam(m, static_cast<int>(DELEGATED_FRAME));
-    WriteParam(m, *p.delegated_frame_data);
-  } else {
+  if (p.render_pass_list.empty()) {
     WriteParam(m, static_cast<int>(NO_FRAME));

[danakj, 2016/10/27 23:06:56]

I don't think we need this NO_FRAME vs DELEGATED_FRAME concept at all anymore?
It was just for calling the right deserialize method

[Saman Sami, 2016/10/28 16:47:35]

Yes. I fixed this in later patches.

+    return;
   }
-}
-
-bool ParamTraits<cc::CompositorFrame>::Read(const base::Pickle* m,
-                                            base::PickleIterator* iter,
-                                            param_type* p) {
-  if (!ReadParam(m, iter, &p->metadata))
-    return false;
-
-  int compositor_frame_type;
-  if (!ReadParam(m, iter, &compositor_frame_type))
-    return false;
-
-  switch (compositor_frame_type) {
-    case DELEGATED_FRAME:
-      p->delegated_frame_data.reset(new cc::DelegatedFrameData());
-      if (!ReadParam(m, iter, p->delegated_frame_data.get()))
-        return false;
-      break;
-    case NO_FRAME:
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
-
-void ParamTraits<cc::CompositorFrame>::Log(const param_type& p,
-                                           std::string* l) {
-  l->append("CompositorFrame(");
-  LogParam(p.metadata, l);
-  l->append(", ");
-  if (p.delegated_frame_data)
-    LogParam(*p.delegated_frame_data, l);
-  l->append(")");
-}
-
-void ParamTraits<cc::DelegatedFrameData>::Write(base::Pickle* m,
-                                                const param_type& p) {
-  DCHECK_NE(0u, p.render_pass_list.size());
-
+  WriteParam(m, static_cast<int>(DELEGATED_FRAME));
   size_t to_reserve = 0u;
   to_reserve += p.resource_list.size() * sizeof(cc::TransferableResource);
   for (const auto& pass : p.render_pass_list) {
     to_reserve += sizeof(size_t) * 2;
     to_reserve += ReserveSizeForRenderPassWrite(*pass);
   }
   m->Reserve(to_reserve);
 
   WriteParam(m, p.resource_list);
   WriteParam(m, base::checked_cast<uint32_t>(p.render_pass_list.size()));
   for (const auto& pass : p.render_pass_list) {
     WriteParam(m, base::checked_cast<uint32_t>(pass->quad_list.size()));
     WriteParam(
         m, base::checked_cast<uint32_t>(pass->shared_quad_state_list.size()));
     WriteParam(m, *pass);
   }
 }
 
-bool ParamTraits<cc::DelegatedFrameData>::Read(const base::Pickle* m,
-                                               base::PickleIterator* iter,
-                                               param_type* p) {
+bool ParamTraits<cc::CompositorFrame>::Read(const base::Pickle* m,
+                                            base::PickleIterator* iter,
+                                            param_type* p) {
+  if (!ReadParam(m, iter, &p->metadata))
+    return false;
+
+  int compositor_frame_type;
+  if (!ReadParam(m, iter, &compositor_frame_type))
+    return false;
+
+  if (compositor_frame_type == NO_FRAME) {
+    return true;
+  }
+
+  if (compositor_frame_type != DELEGATED_FRAME)
+    return false;
+
   const size_t kMaxRenderPasses = 10000;
   const size_t kMaxSharedQuadStateListSize = 100000;
   const size_t kMaxQuadListSize = 1000000;
 
   std::set<cc::RenderPassId> pass_set;
 
   uint32_t num_render_passes;
   if (!ReadParam(m, iter, &p->resource_list) ||
       !ReadParam(m, iter, &num_render_passes) ||
       num_render_passes > kMaxRenderPasses || num_render_passes == 0)
@@ skipping 17 matching lines @@
       if (quad->material != cc::DrawQuad::RENDER_PASS)
         continue;
       const cc::RenderPassDrawQuad* rpdq =
           cc::RenderPassDrawQuad::MaterialCast(quad);
       if (!pass_set.count(rpdq->render_pass_id))
         return false;
     }
     pass_set.insert(render_pass->id);
     p->render_pass_list.push_back(std::move(render_pass));
   }
+
   return true;
 }
 
-void ParamTraits<cc::DelegatedFrameData>::Log(const param_type& p,
-                                              std::string* l) {
-  l->append("DelegatedFrameData(");
+void ParamTraits<cc::CompositorFrame>::Log(const param_type& p,
+                                           std::string* l) {
+  l->append("CompositorFrame(");
+  LogParam(p.metadata, 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("])");
 }
 
@@ skipping 214 matching lines @@
 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_
 #include "cc/ipc/cc_param_traits_macros.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_
 #include "cc/ipc/cc_param_traits_macros.h"
 }  // namespace IPC