Add ArrayTraits<CArray<T>> utility template

ui/events/mojo/latency_info_struct_traits.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/mojo/latency_info_struct_traits.h"
 
 #include "ipc/ipc_message_utils.h"
 
 namespace mojo {
 
@@ skipping 161 matching lines @@
         INPUT_EVENT_LATENCY_TERMINATED_SWAP_FAILED_COMPONENT:
       return ui::INPUT_EVENT_LATENCY_TERMINATED_SWAP_FAILED_COMPONENT;
   }
   NOTREACHED();
   return ui::LATENCY_COMPONENT_TYPE_LAST;
 }
 
 }  // namespace
 
 // static
-size_t ArrayTraits<InputCoordinateArray>::GetSize(
-    const InputCoordinateArray& b) {
-  return b.size;
-}
-
-// static
-gfx::PointF* ArrayTraits<InputCoordinateArray>::GetData(
-    InputCoordinateArray& b) {
-  return b.data;
-}
-
-// static
-const gfx::PointF* ArrayTraits<InputCoordinateArray>::GetData(
-    const InputCoordinateArray& b) {
-  return b.data;
-}
-
-// static
-gfx::PointF& ArrayTraits<InputCoordinateArray>::GetAt(InputCoordinateArray& b,
-                                                      size_t i) {
-  return b.data[i];
-}
-
-// static
-const gfx::PointF& ArrayTraits<InputCoordinateArray>::GetAt(
-    const InputCoordinateArray& b,
-    size_t i) {
-  return b.data[i];
-}
-
-// static
-bool ArrayTraits<InputCoordinateArray>::Resize(InputCoordinateArray& b,
-                                               size_t size) {
-  if (size > ui::LatencyInfo::kMaxInputCoordinates)
-    return false;
-  b.size = size;
-  return true;
-}
-
-// static
 int64_t
 StructTraits<ui::mojom::LatencyComponent, ui::LatencyInfo::LatencyComponent>::
     sequence_number(const ui::LatencyInfo::LatencyComponent& component) {
   return component.sequence_number;
 }
 
 // static
 base::TimeTicks
 StructTraits<ui::mojom::LatencyComponent, ui::LatencyInfo::LatencyComponent>::
     event_time(const ui::LatencyInfo::LatencyComponent& component) {
@@ skipping 80 matching lines @@
 StructTraits<ui::mojom::LatencyInfo, ui::LatencyInfo>::latency_components(
     const ui::LatencyInfo& info,
     void* context) {
   return *static_cast<mojo::Array<ui::mojom::LatencyComponentPairPtr>*>(
       context);
 }
 
 InputCoordinateArray
 StructTraits<ui::mojom::LatencyInfo, ui::LatencyInfo>::input_coordinates(
     const ui::LatencyInfo& info) {
-  InputCoordinateArray input_coordinates_array = {
-      ui::LatencyInfo::kMaxInputCoordinates,
-      const_cast<gfx::PointF*>(info.input_coordinates_)};
-  return input_coordinates_array;
+  return {info.input_coordinates_size_, ui::LatencyInfo::kMaxInputCoordinates,
+          const_cast<gfx::PointF*>(info.input_coordinates_)};
 }
 
 int64_t StructTraits<ui::mojom::LatencyInfo, ui::LatencyInfo>::trace_id(
     const ui::LatencyInfo& info) {
   return info.trace_id();
 }
 
 bool StructTraits<ui::mojom::LatencyInfo, ui::LatencyInfo>::coalesced(
     const ui::LatencyInfo& info) {
   return info.coalesced();
@@ skipping 10 matching lines @@
   if (!data.ReadTraceName(&out->trace_name_))
     return false;
 
   mojo::Array<ui::mojom::LatencyComponentPairPtr> components;
   if (!data.ReadLatencyComponents(&components))
     return false;
   for (uint32_t i = 0; i < components.size(); ++i)
     out->latency_components_[components[i]->key] = components[i]->value;
 
   InputCoordinateArray input_coordinate_array = {
-      ui::LatencyInfo::kMaxInputCoordinates, out->input_coordinates_};
+      0, ui::LatencyInfo::kMaxInputCoordinates, out->input_coordinates_};
   if (!data.ReadInputCoordinates(&input_coordinate_array))
     return false;
   // TODO(fsamuel): ui::LatencyInfo::input_coordinates_size_ should be a size_t.
   out->input_coordinates_size_ =
       static_cast<uint32_t>(input_coordinate_array.size);
 
   out->trace_id_ = data.trace_id();
   out->coalesced_ = data.coalesced();
   out->terminated_ = data.terminated();
   return true;
 }
 
 }  // namespace mojo