Commit 2f3842c4 authored by Jinsong Fan's avatar Jinsong Fan Committed by Commit Bot

Fix read/write IPC param traits of SelectionBound

New member variables are added to SelectionBound, but no update read/write
IPC param traits. The CL adds them.

Bug: 1015274
Change-Id: I1480741a981fe831e684bdea10752f43682a934d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1916180Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Jinsong Fan <fanjinsong@sogou-inc.com>
Cr-Commit-Position: refs/heads/master@{#716012}
parent ee82cdee
...@@ -70,6 +70,8 @@ void ParamTraits<gfx::SelectionBound>::Write(base::Pickle* m, ...@@ -70,6 +70,8 @@ void ParamTraits<gfx::SelectionBound>::Write(base::Pickle* m,
WriteParam(m, static_cast<uint32_t>(p.type())); WriteParam(m, static_cast<uint32_t>(p.type()));
WriteParam(m, p.edge_start()); WriteParam(m, p.edge_start());
WriteParam(m, p.edge_end()); WriteParam(m, p.edge_end());
WriteParam(m, p.visible_edge_start());
WriteParam(m, p.visible_edge_end());
WriteParam(m, p.visible()); WriteParam(m, p.visible());
} }
...@@ -79,16 +81,22 @@ bool ParamTraits<gfx::SelectionBound>::Read(const base::Pickle* m, ...@@ -79,16 +81,22 @@ bool ParamTraits<gfx::SelectionBound>::Read(const base::Pickle* m,
gfx::SelectionBound::Type type; gfx::SelectionBound::Type type;
gfx::PointF edge_start; gfx::PointF edge_start;
gfx::PointF edge_end; gfx::PointF edge_end;
gfx::PointF visible_edge_start;
gfx::PointF visible_edge_end;
bool visible = false; bool visible = false;
if (!ReadParam(m, iter, &type) || !ReadParam(m, iter, &edge_start) || if (!ReadParam(m, iter, &type) || !ReadParam(m, iter, &edge_start) ||
!ReadParam(m, iter, &edge_end) || !ReadParam(m, iter, &visible)) { !ReadParam(m, iter, &edge_end) ||
!ReadParam(m, iter, &visible_edge_start) ||
!ReadParam(m, iter, &visible_edge_end) || !ReadParam(m, iter, &visible)) {
return false; return false;
} }
r->set_type(type); r->set_type(type);
r->SetEdgeStart(edge_start); r->SetEdgeStart(edge_start);
r->SetEdgeEnd(edge_end); r->SetEdgeEnd(edge_end);
r->SetVisibleEdgeStart(visible_edge_start);
r->SetVisibleEdgeEnd(visible_edge_end);
r->set_visible(visible); r->set_visible(visible);
return true; return true;
} }
...@@ -102,6 +110,10 @@ void ParamTraits<gfx::SelectionBound>::Log(const param_type& p, ...@@ -102,6 +110,10 @@ void ParamTraits<gfx::SelectionBound>::Log(const param_type& p,
l->append(", "); l->append(", ");
LogParam(p.edge_end(), l); LogParam(p.edge_end(), l);
l->append(", "); l->append(", ");
LogParam(p.visible_edge_start(), l);
l->append(", ");
LogParam(p.visible_edge_end(), l);
l->append(", ");
LogParam(p.visible(), l); LogParam(p.visible(), l);
l->append(")"); l->append(")");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment