| Index: ui/gfx/ipc/gfx_param_traits.h
|
| diff --git a/ui/gfx/ipc/gfx_param_traits.h b/ui/gfx/ipc/gfx_param_traits.h
|
| index 933596110c31d63dd27cca3824583f0b9a26f376..ae4330b54f4f0380f1c6e27f59b441e8e9ab4f87 100644
|
| --- a/ui/gfx/ipc/gfx_param_traits.h
|
| +++ b/ui/gfx/ipc/gfx_param_traits.h
|
| @@ -31,7 +31,7 @@ template <>
|
| struct GFX_IPC_EXPORT ParamTraits<gfx::Point> {
|
| typedef gfx::Point param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -39,7 +39,7 @@ template <>
|
| struct GFX_IPC_EXPORT ParamTraits<gfx::PointF> {
|
| typedef gfx::PointF param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -47,7 +47,7 @@ template <>
|
| struct GFX_IPC_EXPORT ParamTraits<gfx::Size> {
|
| typedef gfx::Size param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -55,7 +55,7 @@ template <>
|
| struct GFX_IPC_EXPORT ParamTraits<gfx::SizeF> {
|
| typedef gfx::SizeF param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -63,7 +63,7 @@ template <>
|
| struct GFX_IPC_EXPORT ParamTraits<gfx::Vector2d> {
|
| typedef gfx::Vector2d param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -71,7 +71,7 @@ template <>
|
| struct GFX_IPC_EXPORT ParamTraits<gfx::Vector2dF> {
|
| typedef gfx::Vector2dF param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -79,7 +79,7 @@ template <>
|
| struct GFX_IPC_EXPORT ParamTraits<gfx::Rect> {
|
| typedef gfx::Rect param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -87,7 +87,7 @@ template <>
|
| struct GFX_IPC_EXPORT ParamTraits<gfx::RectF> {
|
| typedef gfx::RectF param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -98,7 +98,7 @@ struct GFX_IPC_EXPORT ParamTraits<SkBitmap> {
|
|
|
| // Note: This function expects parameter |r| to be of type &SkBitmap since
|
| // r->SetConfig() and r->SetPixels() are called.
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
|
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
| @@ -107,7 +107,7 @@ template <>
|
| struct GFX_IPC_EXPORT ParamTraits<gfx::Range> {
|
| typedef gfx::Range param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
|
|