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

Unified Diff: content/common/font_config_ipc_linux.cc

Issue 825353003: Revert of Remove deprecated methods from Pickle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « content/common/content_param_traits.cc ('k') | content/common/gamepad_param_traits.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/font_config_ipc_linux.cc
diff --git a/content/common/font_config_ipc_linux.cc b/content/common/font_config_ipc_linux.cc
index c64aebf66a57fa3c432646d1906e5a15bf12b2ef..fcb06ebac0def482978e79011532e8b59804bebd 100644
--- a/content/common/font_config_ipc_linux.cc
+++ b/content/common/font_config_ipc_linux.cc
@@ -70,7 +70,7 @@
Pickle reply(reinterpret_cast<char*>(reply_buf), r);
PickleIterator iter(reply);
bool result;
- if (!iter.ReadBool(&result))
+ if (!reply.ReadBool(&iter, &result))
return false;
if (!result)
return false;
@@ -78,9 +78,9 @@
SkString reply_family;
FontIdentity reply_identity;
uint32_t reply_style;
- if (!skia::ReadSkString(&iter, &reply_family) ||
- !skia::ReadSkFontIdentity(&iter, &reply_identity) ||
- !iter.ReadUInt32(&reply_style)) {
+ if (!skia::ReadSkString(reply, &iter, &reply_family) ||
+ !skia::ReadSkFontIdentity(reply, &iter, &reply_identity) ||
+ !reply.ReadUInt32(&iter, &reply_style)) {
return false;
}
@@ -112,7 +112,8 @@
Pickle reply(reinterpret_cast<char*>(reply_buf), r);
bool result;
PickleIterator iter(reply);
- if (!iter.ReadBool(&result) || !result) {
+ if (!reply.ReadBool(&iter, &result) ||
+ !result) {
if (result_fd)
CloseFD(result_fd);
return NULL;
« no previous file with comments | « content/common/content_param_traits.cc ('k') | content/common/gamepad_param_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698