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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/ipc/gfx_param_traits.cc

Issue 1924613002: Move ui/gfx/geometry ParamTraits to ui/gfx/ipc/geometry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Forward declare Range in gfx_param_traits Created 4 years, 8 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/gfx/ipc/gfx_param_traits.h ('k') | ui/ozone/BUILD.gn » ('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 551957e095dc6717fbc38a836933c2f7e04be89d..b72a358b6b8a199567aa0a68b7c17769b6988eaa 100644
--- a/ui/gfx/ipc/gfx_param_traits.cc
+++ b/ui/gfx/ipc/gfx_param_traits.cc
@@ -9,10 +9,6 @@
#include <string>
-#include "ui/gfx/geometry/point3_f.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/geometry/rect_f.h"
-#include "ui/gfx/geometry/scroll_offset.h"
#include "ui/gfx/range/range.h"
#if defined(OS_MACOSX)
@@ -21,219 +17,6 @@
namespace IPC {
-void ParamTraits<gfx::Point>::Write(base::Pickle* m, const gfx::Point& p) {
- WriteParam(m, p.x());
- WriteParam(m, p.y());
-}
-
-bool ParamTraits<gfx::Point>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- gfx::Point* r) {
- int x, y;
- if (!ReadParam(m, iter, &x) || !ReadParam(m, 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::PointF>::GetSize(base::PickleSizer* s,
- const gfx::PointF& p) {
- GetParamSize(s, p.x());
- GetParamSize(s, p.y());
-}
-
-void ParamTraits<gfx::PointF>::Write(base::Pickle* m, const gfx::PointF& p) {
- WriteParam(m, p.x());
- WriteParam(m, p.y());
-}
-
-bool ParamTraits<gfx::PointF>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- gfx::PointF* r) {
- float x, y;
- if (!ReadParam(m, iter, &x) || !ReadParam(m, iter, &y))
- return false;
- r->set_x(x);
- r->set_y(y);
- return true;
-}
-
-void ParamTraits<gfx::PointF>::Log(const gfx::PointF& p, std::string* l) {
- l->append(base::StringPrintf("(%f, %f)", p.x(), p.y()));
-}
-
-void ParamTraits<gfx::Point3F>::Write(base::Pickle* m, const gfx::Point3F& p) {
- WriteParam(m, p.x());
- WriteParam(m, p.y());
- WriteParam(m, p.z());
-}
-
-bool ParamTraits<gfx::Point3F>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- gfx::Point3F* r) {
- float x, y, z;
- if (!ReadParam(m, iter, &x) || !ReadParam(m, iter, &y) ||
- !ReadParam(m, iter, &z))
- return false;
- r->set_x(x);
- r->set_y(y);
- r->set_z(z);
- return true;
-}
-
-void ParamTraits<gfx::Point3F>::Log(const gfx::Point3F& p, std::string* l) {
- l->append(base::StringPrintf("(%f, %f, %f)", p.x(), p.y(), p.z()));
-}
-
-void ParamTraits<gfx::Size>::Write(base::Pickle* m, const gfx::Size& p) {
- DCHECK_GE(p.width(), 0);
- DCHECK_GE(p.height(), 0);
- int values[2] = { p.width(), p.height() };
- m->WriteBytes(&values, sizeof(int) * 2);
-}
-
-bool ParamTraits<gfx::Size>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- gfx::Size* r) {
- const char* char_values;
- if (!iter->ReadBytes(&char_values, sizeof(int) * 2))
- return false;
- const int* values = reinterpret_cast<const int*>(char_values);
- if (values[0] < 0 || values[1] < 0)
- return false;
- r->set_width(values[0]);
- r->set_height(values[1]);
- 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<gfx::SizeF>::Write(base::Pickle* m, const gfx::SizeF& p) {
- float values[2] = { p.width(), p.height() };
- m->WriteBytes(&values, sizeof(float) * 2);
-}
-
-bool ParamTraits<gfx::SizeF>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- gfx::SizeF* r) {
- const char* char_values;
- if (!iter->ReadBytes(&char_values, sizeof(float) * 2))
- return false;
- const float* values = reinterpret_cast<const float*>(char_values);
- r->set_width(values[0]);
- r->set_height(values[1]);
- return true;
-}
-
-void ParamTraits<gfx::SizeF>::Log(const gfx::SizeF& p, std::string* l) {
- l->append(base::StringPrintf("(%f, %f)", p.width(), p.height()));
-}
-
-void ParamTraits<gfx::Vector2d>::GetSize(base::PickleSizer* s,
- const gfx::Vector2d& p) {
- s->AddBytes(sizeof(int) * 2);
-}
-
-void ParamTraits<gfx::Vector2d>::Write(base::Pickle* m,
- const gfx::Vector2d& p) {
- int values[2] = { p.x(), p.y() };
- m->WriteBytes(&values, sizeof(int) * 2);
-}
-
-bool ParamTraits<gfx::Vector2d>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- gfx::Vector2d* r) {
- const char* char_values;
- if (!iter->ReadBytes(&char_values, sizeof(int) * 2))
- return false;
- const int* values = reinterpret_cast<const int*>(char_values);
- r->set_x(values[0]);
- r->set_y(values[1]);
- return true;
-}
-
-void ParamTraits<gfx::Vector2d>::Log(const gfx::Vector2d& v, std::string* l) {
- l->append(base::StringPrintf("(%d, %d)", v.x(), v.y()));
-}
-
-void ParamTraits<gfx::Vector2dF>::Write(base::Pickle* m,
- const gfx::Vector2dF& p) {
- float values[2] = { p.x(), p.y() };
- m->WriteBytes(&values, sizeof(float) * 2);
-}
-
-bool ParamTraits<gfx::Vector2dF>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- gfx::Vector2dF* r) {
- const char* char_values;
- if (!iter->ReadBytes(&char_values, sizeof(float) * 2))
- return false;
- const float* values = reinterpret_cast<const float*>(char_values);
- r->set_x(values[0]);
- r->set_y(values[1]);
- return true;
-}
-
-void ParamTraits<gfx::Vector2dF>::Log(const gfx::Vector2dF& v, std::string* l) {
- l->append(base::StringPrintf("(%f, %f)", v.x(), v.y()));
-}
-
-void ParamTraits<gfx::Rect>::Write(base::Pickle* m, const gfx::Rect& p) {
- int values[4] = { p.x(), p.y(), p.width(), p.height() };
- m->WriteBytes(&values, sizeof(int) * 4);
-}
-
-bool ParamTraits<gfx::Rect>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- gfx::Rect* r) {
- const char* char_values;
- if (!iter->ReadBytes(&char_values, sizeof(int) * 4))
- return false;
- const int* values = reinterpret_cast<const int*>(char_values);
- if (values[2] < 0 || values[3] < 0)
- return false;
- r->SetRect(values[0], values[1], values[2], values[3]);
- 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::RectF>::GetSize(base::PickleSizer* s,
- const gfx::RectF& p) {
- s->AddBytes(sizeof(float) * 4);
-}
-
-void ParamTraits<gfx::RectF>::Write(base::Pickle* m, const gfx::RectF& p) {
- float values[4] = { p.x(), p.y(), p.width(), p.height() };
- m->WriteBytes(&values, sizeof(float) * 4);
-}
-
-bool ParamTraits<gfx::RectF>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- gfx::RectF* r) {
- const char* char_values;
- if (!iter->ReadBytes(&char_values, sizeof(float) * 4))
- return false;
- const float* values = reinterpret_cast<const float*>(char_values);
- r->SetRect(values[0], values[1], values[2], values[3]);
- return true;
-}
-
-void ParamTraits<gfx::RectF>::Log(const gfx::RectF& p, std::string* l) {
- l->append(base::StringPrintf("(%f, %f, %f, %f)", p.x(), p.y(),
- p.width(), p.height()));
-}
-
void ParamTraits<gfx::Range>::Write(base::Pickle* m, const gfx::Range& r) {
m->WriteUInt32(r.start());
m->WriteUInt32(r.end());
@@ -254,34 +37,6 @@ void ParamTraits<gfx::Range>::Log(const gfx::Range& r, std::string* l) {
l->append(base::StringPrintf("(%d, %d)", r.start(), r.end()));
}
-void ParamTraits<gfx::ScrollOffset>::Write(base::Pickle* m,
- const param_type& p) {
- m->WriteDouble(p.x());
- m->WriteDouble(p.y());
-}
-
-bool ParamTraits<gfx::ScrollOffset>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- param_type* r) {
- double x = 0.f;
- double y = 0.f;
- if (!iter->ReadDouble(&x))
- return false;
- if (!iter->ReadDouble(&y))
- return false;
- r->set_x(x);
- r->set_y(y);
- return true;
-}
-
-void ParamTraits<gfx::ScrollOffset>::Log(const param_type& p, std::string* l) {
- l->append("(");
- LogParam(p.x(), l);
- l->append(", ");
- LogParam(p.y(), l);
- l->append(")");
-}
-
#if defined(OS_MACOSX) && !defined(OS_IOS)
void ParamTraits<gfx::ScopedRefCountedIOSurfaceMachPort>::Write(
base::Pickle* m,
« no previous file with comments | « ui/gfx/ipc/gfx_param_traits.h ('k') | ui/ozone/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698