Remove GLFrameData from CompositorFrame.

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 630 matching lines @@
   LogParam(p.local_id(), l);
   l->append(", ");
   LogParam(p.nonce(), l);
   l->append(")");
 }
 
 namespace {
 enum CompositorFrameType {
   NO_FRAME,
   DELEGATED_FRAME,
-  GL_FRAME,
 };
 }
 
 void ParamTraits<cc::CompositorFrame>::Write(base::Pickle* m,
                                              const param_type& p) {
   WriteParam(m, p.metadata);
   if (p.delegated_frame_data) {
-    DCHECK(!p.gl_frame_data);
     WriteParam(m, static_cast<int>(DELEGATED_FRAME));
     WriteParam(m, *p.delegated_frame_data);
-  } else if (p.gl_frame_data) {
-    WriteParam(m, static_cast<int>(GL_FRAME));
-    WriteParam(m, *p.gl_frame_data);
   } else {
     WriteParam(m, static_cast<int>(NO_FRAME));
   }
 }
 
 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 GL_FRAME:
-      p->gl_frame_data.reset(new cc::GLFrameData());
-      if (!ReadParam(m, iter, p->gl_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);
-  else if (p.gl_frame_data)
-    LogParam(*p.gl_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());
 
   size_t to_reserve = 0u;
   to_reserve += p.resource_list.size() * sizeof(cc::TransferableResource);
   for (const auto& pass : p.render_pass_list) {
@@ skipping 285 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