Pass a sequence number along with the DIB handle when compositing in software.

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/output/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 609 matching lines @@
   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);
+  WriteParam(m, p.last_dib_id);
   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))
+  if (!ReadParam(m, iter, &p->last_dib_id))
     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);
+  LogParam(p.last_dib_id, 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());
@@ skipping 27 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