Index: chrome/common/common_param_traits.cc |
=================================================================== |
--- chrome/common/common_param_traits.cc (revision 77652) |
+++ chrome/common/common_param_traits.cc (working copy) |
@@ -15,7 +15,6 @@ |
#include "printing/backend/print_backend.h" |
#include "printing/native_metafile.h" |
#include "printing/page_range.h" |
-#include "ui/gfx/rect.h" |
#ifndef EXCLUDE_SKIA_DEPENDENCIES |
#include "third_party/skia/include/core/SkBitmap.h" |
@@ -103,73 +102,6 @@ |
#endif // EXCLUDE_SKIA_DEPENDENCIES |
-void ParamTraits<gfx::Point>::Write(Message* m, const gfx::Point& p) { |
- m->WriteInt(p.x()); |
- m->WriteInt(p.y()); |
-} |
- |
-bool ParamTraits<gfx::Point>::Read(const Message* m, void** iter, |
- gfx::Point* r) { |
- int x, y; |
- if (!m->ReadInt(iter, &x) || |
- !m->ReadInt(iter, &y)) |
- return false; |
- r->set_x(x); |
- r->set_y(y); |
- return true; |
-} |
- |
-void ParamTraits<gfx::Point>::Log(const gfx::Point& p, std::string* l) { |
- l->append(base::StringPrintf("(%d, %d)", p.x(), p.y())); |
-} |
- |
- |
-void ParamTraits<gfx::Rect>::Write(Message* m, const gfx::Rect& p) { |
- m->WriteInt(p.x()); |
- m->WriteInt(p.y()); |
- m->WriteInt(p.width()); |
- m->WriteInt(p.height()); |
-} |
- |
-bool ParamTraits<gfx::Rect>::Read(const Message* m, void** iter, gfx::Rect* r) { |
- int x, y, w, h; |
- if (!m->ReadInt(iter, &x) || |
- !m->ReadInt(iter, &y) || |
- !m->ReadInt(iter, &w) || |
- !m->ReadInt(iter, &h)) |
- return false; |
- r->set_x(x); |
- r->set_y(y); |
- r->set_width(w); |
- r->set_height(h); |
- return true; |
-} |
- |
-void ParamTraits<gfx::Rect>::Log(const gfx::Rect& p, std::string* l) { |
- l->append(base::StringPrintf("(%d, %d, %d, %d)", p.x(), p.y(), |
- p.width(), p.height())); |
-} |
- |
- |
-void ParamTraits<gfx::Size>::Write(Message* m, const gfx::Size& p) { |
- m->WriteInt(p.width()); |
- m->WriteInt(p.height()); |
-} |
- |
-bool ParamTraits<gfx::Size>::Read(const Message* m, void** iter, gfx::Size* r) { |
- int w, h; |
- if (!m->ReadInt(iter, &w) || |
- !m->ReadInt(iter, &h)) |
- return false; |
- r->set_width(w); |
- r->set_height(h); |
- return true; |
-} |
- |
-void ParamTraits<gfx::Size>::Log(const gfx::Size& p, std::string* l) { |
- l->append(base::StringPrintf("(%d, %d)", p.width(), p.height())); |
-} |
- |
void ParamTraits<ContentSetting>::Write(Message* m, const param_type& p) { |
WriteParam(m, static_cast<int>(p)); |
} |