Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2619)

Unified Diff: remoting/host/chromoting_param_traits.cc

Issue 818833004: Remove deprecated methods from Pickle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/serialized_var.cc ('k') | sandbox/linux/syscall_broker/broker_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_param_traits.cc
diff --git a/remoting/host/chromoting_param_traits.cc b/remoting/host/chromoting_param_traits.cc
index 8050dc19859375fa76c4ae51da96b72739f3de03..9434cceecf85db4f69807f9080996b215dec90c3 100644
--- a/remoting/host/chromoting_param_traits.cc
+++ b/remoting/host/chromoting_param_traits.cc
@@ -21,7 +21,7 @@ bool ParamTraits<webrtc::DesktopVector>::Read(const Message* m,
PickleIterator* iter,
webrtc::DesktopVector* r) {
int x, y;
- if (!m->ReadInt(iter, &x) || !m->ReadInt(iter, &y))
+ if (!iter->ReadInt(&x) || !iter->ReadInt(&y))
return false;
*r = webrtc::DesktopVector(x, y);
return true;
@@ -46,7 +46,7 @@ bool ParamTraits<webrtc::DesktopSize>::Read(const Message* m,
PickleIterator* iter,
webrtc::DesktopSize* r) {
int width, height;
- if (!m->ReadInt(iter, &width) || !m->ReadInt(iter, &height))
+ if (!iter->ReadInt(&width) || !iter->ReadInt(&height))
return false;
*r = webrtc::DesktopSize(width, height);
return true;
@@ -73,8 +73,8 @@ bool ParamTraits<webrtc::DesktopRect>::Read(const Message* m,
PickleIterator* iter,
webrtc::DesktopRect* r) {
int left, right, top, bottom;
- if (!m->ReadInt(iter, &left) || !m->ReadInt(iter, &top) ||
- !m->ReadInt(iter, &right) || !m->ReadInt(iter, &bottom)) {
+ if (!iter->ReadInt(&left) || !iter->ReadInt(&top) ||
+ !iter->ReadInt(&right) || !iter->ReadInt(&bottom)) {
return false;
}
*r = webrtc::DesktopRect::MakeLTRB(left, top, right, bottom);
@@ -126,10 +126,8 @@ bool ParamTraits<webrtc::MouseCursor>::Read(
const char* data;
int data_length;
- if (!m->ReadData(iter, &data, &data_length) ||
- data_length != expected_length) {
+ if (!iter->ReadData(&data, &data_length) || data_length != expected_length)
return false;
- }
webrtc::DesktopVector hotspot;
if (!ParamTraits<webrtc::DesktopVector>::Read(m, iter, &hotspot))
« no previous file with comments | « ppapi/proxy/serialized_var.cc ('k') | sandbox/linux/syscall_broker/broker_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698