| Index: content/common/cc_messages.cc
|
| diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc
|
| index df69edd9054c075f9611ad767ffa155b96114d94..b6bb66c1cf367e0f2a42c0c7d453e3bc35333d17 100644
|
| --- a/content/common/cc_messages.cc
|
| +++ b/content/common/cc_messages.cc
|
| @@ -16,7 +16,6 @@
|
| #include "content/public/common/common_param_traits.h"
|
| #include "third_party/skia/include/core/SkData.h"
|
| #include "third_party/skia/include/core/SkFlattenableSerialization.h"
|
| -#include "ui/gfx/transform.h"
|
|
|
| namespace IPC {
|
|
|
| @@ -256,46 +255,6 @@ void ParamTraits<skia::RefPtr<SkImageFilter> >::Log(
|
| l->append(")");
|
| }
|
|
|
| -void ParamTraits<gfx::Transform>::Write(base::Pickle* m, const param_type& p) {
|
| -#ifdef SK_MSCALAR_IS_FLOAT
|
| - float column_major_data[16];
|
| - p.matrix().asColMajorf(column_major_data);
|
| -#else
|
| - double column_major_data[16];
|
| - p.matrix().asColMajord(column_major_data);
|
| -#endif
|
| - m->WriteBytes(&column_major_data, sizeof(SkMScalar) * 16);
|
| -}
|
| -
|
| -bool ParamTraits<gfx::Transform>::Read(const base::Pickle* m,
|
| - base::PickleIterator* iter,
|
| - param_type* r) {
|
| - const char* column_major_data;
|
| - if (!iter->ReadBytes(&column_major_data, sizeof(SkMScalar) * 16))
|
| - return false;
|
| - r->matrix().setColMajor(
|
| - reinterpret_cast<const SkMScalar*>(column_major_data));
|
| - return true;
|
| -}
|
| -
|
| -void ParamTraits<gfx::Transform>::Log(
|
| - const param_type& p, std::string* l) {
|
| -#ifdef SK_MSCALAR_IS_FLOAT
|
| - float row_major_data[16];
|
| - p.matrix().asRowMajorf(row_major_data);
|
| -#else
|
| - double row_major_data[16];
|
| - p.matrix().asRowMajord(row_major_data);
|
| -#endif
|
| - l->append("(");
|
| - for (int i = 0; i < 16; ++i) {
|
| - if (i > 0)
|
| - l->append(", ");
|
| - LogParam(row_major_data[i], l);
|
| - }
|
| - l->append(") ");
|
| -}
|
| -
|
| void ParamTraits<cc::RenderPass>::Write(base::Pickle* m, const param_type& p) {
|
| WriteParam(m, p.id);
|
| WriteParam(m, p.output_rect);
|
|
|