| Index: content/common/cc_messages.cc
|
| diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc
|
| index aadac97ab1fe8bb2d8317c5e4d67d8cd0704ca7f..43b6ce18bedf3130dcdf090359dfd7927b0a8ad2 100644
|
| --- a/content/common/cc_messages.cc
|
| +++ b/content/common/cc_messages.cc
|
| @@ -626,7 +626,7 @@ void ParamTraits<cc::CompositorFrame>::Log(const param_type& p,
|
| void ParamTraits<cc::CompositorFrameAck>::Write(Message* m,
|
| const param_type& p) {
|
| WriteParam(m, p.resources);
|
| - WriteParam(m, p.last_dib_id);
|
| + WriteParam(m, p.last_software_frame_id);
|
| if (p.gl_frame_data) {
|
| WriteParam(m, static_cast<int>(GL_FRAME));
|
| WriteParam(m, *p.gl_frame_data);
|
| @@ -641,7 +641,7 @@ bool ParamTraits<cc::CompositorFrameAck>::Read(const Message* m,
|
| if (!ReadParam(m, iter, &p->resources))
|
| return false;
|
|
|
| - if (!ReadParam(m, iter, &p->last_dib_id))
|
| + if (!ReadParam(m, iter, &p->last_software_frame_id))
|
| return false;
|
|
|
| int compositor_frame_type;
|
| @@ -667,7 +667,7 @@ void ParamTraits<cc::CompositorFrameAck>::Log(const param_type& p,
|
| l->append("CompositorFrameAck(");
|
| LogParam(p.resources, l);
|
| l->append(", ");
|
| - LogParam(p.last_dib_id, l);
|
| + LogParam(p.last_software_frame_id, l);
|
| l->append(", ");
|
| if (p.gl_frame_data)
|
| LogParam(*p.gl_frame_data, l);
|
|
|