[CLOSED] Big patch.

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 523 matching lines @@
     }
   }
   l->append("])");
 }
 
 namespace {
   enum CompositorFrameType {
     NO_FRAME,
     DELEGATED_FRAME,
     GL_FRAME,
+    SOFTWARE_FRAME,
   };
 }
 
 void ParamTraits<cc::CompositorFrame>::Write(Message* m,
                                              const param_type& p) {
   WriteParam(m, p.metadata);
   if (p.delegated_frame_data) {
     DCHECK(!p.gl_frame_data);
+    DCHECK(!p.software_frame_data);
     WriteParam(m, static_cast<int>(DELEGATED_FRAME));
     WriteParam(m, *p.delegated_frame_data);
   } else if (p.gl_frame_data) {
+    DCHECK(!p.software_frame_data);
     WriteParam(m, static_cast<int>(GL_FRAME));
     WriteParam(m, *p.gl_frame_data);
+  } else if (p.software_frame_data) {
+    WriteParam(m, static_cast<int>(SOFTWARE_FRAME));
+    WriteParam(m, *p.software_frame_data);
   } else {
     WriteParam(m, static_cast<int>(NO_FRAME));
   }
 }
 
 bool ParamTraits<cc::CompositorFrame>::Read(const Message* m,
                                             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 SOFTWARE_FRAME:
+      p->software_frame_data.reset(new cc::SoftwareFrameData());
+      if (!ReadParam(m, iter, p->software_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);
+  else if (p.software_frame_data)
+    LogParam(*p.software_frame_data, l);
   l->append(")");
 }
 
 void ParamTraits<cc::CompositorFrameAck>::Write(Message* m,
                                                 const param_type& p) {
   WriteParam(m, p.resources);
+  WriteParam(m, p.last_content_dib);
   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::CompositorFrameAck>::Read(const Message* m,
                                                PickleIterator* iter,
                                                param_type* p) {
   if (!ReadParam(m, iter, &p->resources))
     return false;
 
+  if (!ReadParam(m, iter, &p->last_content_dib))
+    return false;
+
   int compositor_frame_type;
   if (!ReadParam(m, iter, &compositor_frame_type))
     return false;
 
   switch (compositor_frame_type) {
     case NO_FRAME:
       break;
     case GL_FRAME:
       p->gl_frame_data.reset(new cc::GLFrameData());
       if (!ReadParam(m, iter, p->gl_frame_data.get()))
         return false;
       break;
     default:
       return false;
   }
   return true;
 }
 
 void ParamTraits<cc::CompositorFrameAck>::Log(const param_type& p,
                                               std::string* l) {
   l->append("CompositorFrameAck(");
   LogParam(p.resources, l);
   l->append(", ");
+  LogParam(p.last_content_dib, l);
+  l->append(", ");
   if (p.gl_frame_data)
     LogParam(*p.gl_frame_data, l);
   l->append(")");
 }
 
 void ParamTraits<cc::DelegatedFrameData>::Write(Message* m,
                                                 const param_type& p) {
   WriteParam(m, p.resource_list);
   WriteParam(m, p.render_pass_list.size());
   for (size_t i = 0; i < p.render_pass_list.size(); ++i)
@@ skipping 26 matching lines @@
   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