Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_GFX_MOJO_TRANSFORM_STRUCT_TRAITS_H_ | 5 #ifndef UI_GFX_MOJO_TRANSFORM_STRUCT_TRAITS_H_ |
| 6 #define UI_GFX_MOJO_TRANSFORM_STRUCT_TRAITS_H_ | 6 #define UI_GFX_MOJO_TRANSFORM_STRUCT_TRAITS_H_ |
| 7 | 7 |
| 8 #include "mojo/public/cpp/bindings/array_traits.h" | 8 #include "mojo/public/cpp/bindings/array_traits.h" |
| 9 #include "ui/gfx/mojo/transform.mojom.h" | 9 #include "ui/gfx/mojo/transform.mojom.h" |
| 10 #include "ui/gfx/transform.h" | 10 #include "ui/gfx/transform.h" |
| 11 | 11 |
| 12 namespace mojo { | 12 namespace mojo { |
| 13 | 13 |
| 14 template <> | 14 template <> |
| 15 struct ArrayTraits<SkMatrix44> { | 15 struct ArrayTraits<SkMatrix44> { |
| 16 using Element = float; | 16 using Element = float; |
| 17 | 17 |
| 18 static bool IsNull(const SkMatrix44& input) { return input.isIdentity(); } | |
|
Ian Vollick
2016/08/10 15:02:34
I'd prefer IsIdentity.
Ian Vollick
2016/08/10 15:13:57
Fady explained to me offline about how IsNull inte
Fady Samuel
2016/08/10 15:19:14
Mojo calls IsNull to determine whether a given fie
| |
| 19 | |
| 18 static size_t GetSize(const SkMatrix44& input) { return 16; } | 20 static size_t GetSize(const SkMatrix44& input) { return 16; } |
| 19 | 21 |
| 20 static float GetAt(const SkMatrix44& input, size_t index) { | 22 static float GetAt(const SkMatrix44& input, size_t index) { |
| 21 return input.getFloat(static_cast<int>(index % 4), | 23 return input.getFloat(static_cast<int>(index % 4), |
| 22 static_cast<int>(index / 4)); | 24 static_cast<int>(index / 4)); |
| 23 } | 25 } |
| 24 }; | 26 }; |
| 25 | 27 |
| 26 template <> | 28 template <> |
| 27 struct StructTraits<gfx::mojom::Transform, gfx::Transform> { | 29 struct StructTraits<gfx::mojom::Transform, gfx::Transform> { |
| 28 static const SkMatrix44& matrix(const gfx::Transform& transform) { | 30 static const SkMatrix44& matrix(const gfx::Transform& transform) { |
| 29 return transform.matrix(); | 31 return transform.matrix(); |
| 30 } | 32 } |
| 31 | 33 |
| 32 static bool Read(gfx::mojom::TransformDataView data, gfx::Transform* out) { | 34 static bool Read(gfx::mojom::TransformDataView data, gfx::Transform* out) { |
| 33 ArrayDataView<float> matrix; | 35 ArrayDataView<float> matrix; |
| 34 data.GetMatrixDataView(&matrix); | 36 data.GetMatrixDataView(&matrix); |
| 37 if (matrix.is_null()) { | |
| 38 out->MakeIdentity(); | |
| 39 return true; | |
| 40 } | |
| 35 out->matrix().setColMajorf(matrix.data()); | 41 out->matrix().setColMajorf(matrix.data()); |
| 36 return true; | 42 return true; |
| 37 } | 43 } |
| 38 }; | 44 }; |
| 39 | 45 |
| 40 } // namespace mojo | 46 } // namespace mojo |
| 41 | 47 |
| 42 #endif // UI_GFX_MOJO_TRANSFORM_STRUCT_TRAITS_H_ | 48 #endif // UI_GFX_MOJO_TRANSFORM_STRUCT_TRAITS_H_ |
| OLD | NEW |