| Index: chrome/common/render_messages_params.cc
|
| diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc
|
| index 59802b407e5befccb550ea8b2cb1098e3f5ff805..73f5ea23ea8bf39a78e9438bab2442456915101c 100644
|
| --- a/chrome/common/render_messages_params.cc
|
| +++ b/chrome/common/render_messages_params.cc
|
| @@ -38,11 +38,11 @@ ViewHostMsg_FrameNavigate_Params::~ViewHostMsg_FrameNavigate_Params() {
|
| }
|
|
|
| ViewHostMsg_UpdateRect_Params::ViewHostMsg_UpdateRect_Params()
|
| - : dx(0),
|
| + : dib_id(0),
|
| + dib_handle(TransportDIB::DefaultHandleValue()),
|
| + dx(0),
|
| dy(0),
|
| flags(0) {
|
| - // On windows, bitmap is of type "struct HandleAndSequenceNum"
|
| - memset(&bitmap, 0, sizeof(bitmap));
|
| }
|
|
|
| ViewHostMsg_UpdateRect_Params::~ViewHostMsg_UpdateRect_Params() {
|
| @@ -835,7 +835,8 @@ void ParamTraits<ViewHostMsg_FrameNavigate_Params>::Log(const param_type& p,
|
|
|
| void ParamTraits<ViewHostMsg_UpdateRect_Params>::Write(
|
| Message* m, const param_type& p) {
|
| - WriteParam(m, p.bitmap);
|
| + WriteParam(m, p.dib_id);
|
| + WriteParam(m, p.dib_handle);
|
| WriteParam(m, p.bitmap_rect);
|
| WriteParam(m, p.dx);
|
| WriteParam(m, p.dy);
|
| @@ -849,7 +850,8 @@ void ParamTraits<ViewHostMsg_UpdateRect_Params>::Write(
|
| bool ParamTraits<ViewHostMsg_UpdateRect_Params>::Read(
|
| const Message* m, void** iter, param_type* p) {
|
| return
|
| - ReadParam(m, iter, &p->bitmap) &&
|
| + ReadParam(m, iter, &p->dib_id) &&
|
| + ReadParam(m, iter, &p->dib_handle) &&
|
| ReadParam(m, iter, &p->bitmap_rect) &&
|
| ReadParam(m, iter, &p->dx) &&
|
| ReadParam(m, iter, &p->dy) &&
|
| @@ -863,7 +865,9 @@ bool ParamTraits<ViewHostMsg_UpdateRect_Params>::Read(
|
| void ParamTraits<ViewHostMsg_UpdateRect_Params>::Log(const param_type& p,
|
| std::string* l) {
|
| l->append("(");
|
| - LogParam(p.bitmap, l);
|
| + LogParam(p.dib_id, l);
|
| + l->append(", ");
|
| + LogParam(p.dib_handle, l);
|
| l->append(", ");
|
| LogParam(p.bitmap_rect, l);
|
| l->append(", ");
|
|
|