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

Unified Diff: ui/gfx/ipc/gfx_param_traits.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 | « ui/base/dragdrop/os_exchange_data_unittest.cc ('k') | ui/views/controls/textfield/textfield_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/ipc/gfx_param_traits.cc
diff --git a/ui/gfx/ipc/gfx_param_traits.cc b/ui/gfx/ipc/gfx_param_traits.cc
index db4c92e2d9475b9b00699b70f3efada07b7cd27c..2aaccd212055592690a1bc757721ab15e8a5dda3 100644
--- a/ui/gfx/ipc/gfx_param_traits.cc
+++ b/ui/gfx/ipc/gfx_param_traits.cc
@@ -57,7 +57,8 @@ void ParamTraits<gfx::Point>::Write(Message* m, const gfx::Point& p) {
m->WriteInt(p.y());
}
-bool ParamTraits<gfx::Point>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<gfx::Point>::Read(const Message* m,
+ base::PickleIterator* iter,
gfx::Point* r) {
int x, y;
if (!iter->ReadInt(&x) ||
@@ -78,8 +79,8 @@ void ParamTraits<gfx::PointF>::Write(Message* m, const gfx::PointF& v) {
}
bool ParamTraits<gfx::PointF>::Read(const Message* m,
- PickleIterator* iter,
- gfx::PointF* r) {
+ base::PickleIterator* iter,
+ gfx::PointF* r) {
float x, y;
if (!ParamTraits<float>::Read(m, iter, &x) ||
!ParamTraits<float>::Read(m, iter, &y))
@@ -101,7 +102,7 @@ void ParamTraits<gfx::Size>::Write(Message* m, const gfx::Size& p) {
}
bool ParamTraits<gfx::Size>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
gfx::Size* r) {
const char* char_values;
if (!iter->ReadBytes(&char_values, sizeof(int) * 2))
@@ -124,7 +125,7 @@ void ParamTraits<gfx::SizeF>::Write(Message* m, const gfx::SizeF& p) {
}
bool ParamTraits<gfx::SizeF>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
gfx::SizeF* r) {
const char* char_values;
if (!iter->ReadBytes(&char_values, sizeof(float) * 2))
@@ -145,7 +146,7 @@ void ParamTraits<gfx::Vector2d>::Write(Message* m, const gfx::Vector2d& p) {
}
bool ParamTraits<gfx::Vector2d>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
gfx::Vector2d* r) {
const char* char_values;
if (!iter->ReadBytes(&char_values, sizeof(int) * 2))
@@ -166,8 +167,8 @@ void ParamTraits<gfx::Vector2dF>::Write(Message* m, const gfx::Vector2dF& p) {
}
bool ParamTraits<gfx::Vector2dF>::Read(const Message* m,
- PickleIterator* iter,
- gfx::Vector2dF* r) {
+ base::PickleIterator* iter,
+ gfx::Vector2dF* r) {
const char* char_values;
if (!iter->ReadBytes(&char_values, sizeof(float) * 2))
return false;
@@ -187,7 +188,7 @@ void ParamTraits<gfx::Rect>::Write(Message* m, const gfx::Rect& p) {
}
bool ParamTraits<gfx::Rect>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
gfx::Rect* r) {
const char* char_values;
if (!iter->ReadBytes(&char_values, sizeof(int) * 4))
@@ -210,7 +211,7 @@ void ParamTraits<gfx::RectF>::Write(Message* m, const gfx::RectF& p) {
}
bool ParamTraits<gfx::RectF>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
gfx::RectF* r) {
const char* char_values;
if (!iter->ReadBytes(&char_values, sizeof(float) * 4))
@@ -238,7 +239,7 @@ void ParamTraits<SkBitmap>::Write(Message* m, const SkBitmap& p) {
}
bool ParamTraits<SkBitmap>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
SkBitmap* r) {
const char* fixed_data;
int fixed_data_size = 0;
@@ -272,7 +273,7 @@ void ParamTraits<gfx::Range>::Write(Message* m, const gfx::Range& r) {
}
bool ParamTraits<gfx::Range>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
gfx::Range* r) {
size_t start, end;
if (!iter->ReadSizeT(&start) || !iter->ReadSizeT(&end))
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_unittest.cc ('k') | ui/views/controls/textfield/textfield_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698