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

Side by Side Diff: ui/gfx/mojo/transform_struct_traits.h

Issue 2210673002: Improve gfx::Transform StructTraits. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/mojo/transform.typemap ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/gfx/mojo/transform.mojom.h" 9 #include "ui/gfx/mojo/transform.mojom.h"
9 #include "ui/gfx/transform.h" 10 #include "ui/gfx/transform.h"
10 11
11 namespace mojo { 12 namespace mojo {
12 13
13 template <> 14 template <>
15 struct ArrayTraits<SkMatrix44> {
16 using Element = float;
17
18 static size_t GetSize(const SkMatrix44& input) { return 16; }
19
20 static float GetAt(const SkMatrix44& input, size_t index) {
21 return input.getFloat(static_cast<int>(index % 4),
22 static_cast<int>(index / 4));
23 }
24 };
25
26 template <>
14 struct StructTraits<gfx::mojom::Transform, gfx::Transform> { 27 struct StructTraits<gfx::mojom::Transform, gfx::Transform> {
15 static mojo::Array<float> matrix(const gfx::Transform& transform) { 28 static const SkMatrix44& matrix(const gfx::Transform& transform) {
16 std::vector<float> storage(16); 29 return transform.matrix();
17 transform.matrix().asRowMajorf(&storage[0]);
18 mojo::Array<float> matrix;
19 matrix.Swap(&storage);
20 return matrix;
21 } 30 }
22 31
23 static bool Read(gfx::mojom::TransformDataView data, gfx::Transform* out) { 32 static bool Read(gfx::mojom::TransformDataView data, gfx::Transform* out) {
24 mojo::Array<float> matrix; 33 ArrayDataView<float> matrix;
25 if (!data.ReadMatrix(&matrix)) 34 data.GetMatrixDataView(&matrix);
Tom Sepez 2016/08/04 17:36:03 How do we know that data is big enough, e.g well-f
yzshen1 2016/08/04 17:38:16 Before we reach here, the standard validation logi
26 return false; 35 out->matrix().setColMajorf(matrix.data());
27 out->matrix().setRowMajorf(&matrix.storage()[0]);
28 return true; 36 return true;
29 } 37 }
30 }; 38 };
31 39
32 } // namespace mojo 40 } // namespace mojo
33 41
34 #endif // UI_GFX_MOJO_TRANSFORM_STRUCT_TRAITS_H_ 42 #endif // UI_GFX_MOJO_TRANSFORM_STRUCT_TRAITS_H_
OLDNEW
« no previous file with comments | « ui/gfx/mojo/transform.typemap ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698