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

Unified Diff: content/common/font_config_ipc_linux.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months 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/cursors/webcursor.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 540d7d88825c61d660eda9c2591b2adeb6b51054..f063abde4d142edae8a7d4334d2d657bc8c65633 100644
--- a/content/common/font_config_ipc_linux.cc
+++ b/content/common/font_config_ipc_linux.cc
@@ -90,7 +90,7 @@ bool FontConfigIPC::matchFamilyName(const char familyName[],
if (familyNameLen > kMaxFontFamilyLength)
return false;
- Pickle request;
+ base::Pickle request;
request.WriteInt(METHOD_MATCH);
request.WriteData(familyName, familyNameLen);
request.WriteUInt32(requestedStyle);
@@ -102,8 +102,8 @@ bool FontConfigIPC::matchFamilyName(const char familyName[],
if (r == -1)
return false;
- Pickle reply(reinterpret_cast<char*>(reply_buf), r);
- PickleIterator iter(reply);
+ base::Pickle reply(reinterpret_cast<char*>(reply_buf), r);
+ base::PickleIterator iter(reply);
bool result;
if (!iter.ReadBool(&result))
return false;
@@ -139,7 +139,7 @@ SkStreamAsset* FontConfigIPC::openStream(const FontIdentity& identity) {
return mapped_font_files_it->second->CreateMemoryStream();
}
- Pickle request;
+ base::Pickle request;
request.WriteInt(METHOD_OPEN);
request.WriteUInt32(identity.fID);
@@ -152,9 +152,9 @@ SkStreamAsset* FontConfigIPC::openStream(const FontIdentity& identity) {
if (r == -1)
return NULL;
- Pickle reply(reinterpret_cast<char*>(reply_buf), r);
+ base::Pickle reply(reinterpret_cast<char*>(reply_buf), r);
bool result;
- PickleIterator iter(reply);
+ base::PickleIterator iter(reply);
if (!iter.ReadBool(&result) || !result) {
if (result_fd)
CloseFD(result_fd);
« no previous file with comments | « content/common/cursors/webcursor.cc ('k') | content/common/gamepad_param_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698