commit 9587134395c13f04a0678d8a9b7b1b8c0e657617
author Yifei Teng <yifeit@google.com> Fri Apr 05 22:53:02 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Apr 05 22:53:02 2019 +0000
tree 23afd686334e25e78cd3de8029f150d02c78c799
parent 3615297b3249d5ed84286d0fdaa0e5f50a164958

[fidl][cpp] Migrate fidl::Array to std::array

Prepare for
https://fuchsia-review.googlesource.com/c/fuchsia/+/268292

Mechanical conversion from fidl::Array to std::array

TEST: CQ
Change-Id: I60c0ba5683a9b7492f2e8b1c7d6ffbafda0ebf38

examples/ui/lib/type_converters.cc

diff --git a/examples/ui/lib/type_converters.cc b/examples/ui/lib/type_converters.cc
index ae887a4..b7e749a 100644
--- a/examples/ui/lib/type_converters.cc
+++ b/examples/ui/lib/type_converters.cc
@@ -108,7 +108,7 @@
     const SkMatrix& input) {
   // Expand 3x3 to 4x4.
   fuchsia::math::Transform output;
-  float* m = output.matrix.mutable_data();
+  float* m = output.matrix.data();
   m[0] = input[0];
   m[1] = input[1];
   m[2] = 0.f;
@@ -138,7 +138,7 @@
 fuchsia::math::Transform TypeConverter<fuchsia::math::Transform, SkMatrix44>::Convert(
     const SkMatrix44& input) {
   fuchsia::math::Transform output;
-  input.asRowMajorf(output.matrix.mutable_data());
+  input.asRowMajorf(output.matrix.data());
   return output;
 }
 

runtime/flutter_runner/semantics_bridge.cc

diff --git a/runtime/flutter_runner/semantics_bridge.cc b/runtime/flutter_runner/semantics_bridge.cc
index eb72549..0427f6a 100644
--- a/runtime/flutter_runner/semantics_bridge.cc
+++ b/runtime/flutter_runner/semantics_bridge.cc
@@ -29,8 +29,8 @@
 // format to fuchsia::ui::gfx::mat4, the Fidl equivalent.
 fuchsia::ui::gfx::mat4 WrapSkMatrix(SkMatrix44& args) {
   fuchsia::ui::gfx::mat4 value;
-  DEBUG_CHECK(value.matrix.count() == 16, LOG_TAG, "");
-  float* m = value.matrix.mutable_data();
+  DEBUG_CHECK(value.matrix.size() == 16, LOG_TAG, "");
+  float* m = value.matrix.data();
   args.asColMajorf(m);
   return value;
 }