Add input coordinate information to InputLatency

ui/events/latency_info.cc

 // Copyright 2013 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 "base/debug/trace_event.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "ui/events/latency_info.h"
 
@@ skipping 99 matching lines @@
   for (ui::LatencyInfo::LatencyMap::const_iterator it =
            latency.latency_components.begin();
        it != latency.latency_components.end(); ++it) {
     base::DictionaryValue* component_info = new base::DictionaryValue();
     component_info->SetDouble("comp_id", it->first.second);
     component_info->SetDouble("time", it->second.event_time.ToInternalValue());
     component_info->SetDouble("count", it->second.event_count);
     record_data->Set(GetComponentName(it->first.first), component_info);
   }
   record_data->SetDouble("trace_id", latency.trace_id);
+
+  scoped_ptr<base::ListValue> coordinates(new base::ListValue());
+  for (size_t i = 0; i < latency.input_coordinates_size; i++) {
+    scoped_ptr<base::DictionaryValue> coordinate_pair(
+        new base::DictionaryValue());
+    coordinate_pair->SetDouble("x", latency.input_coordinates[i].x);
+    coordinate_pair->SetDouble("y", latency.input_coordinates[i].y);
+    coordinates->Append(coordinate_pair.release());
+  }
+  record_data->Set("coordinates", coordinates.release());
   return LatencyInfoTracedValue::FromValue(record_data.PassAs<base::Value>());
 }
 
 }  // namespace
 
 namespace ui {
 
-LatencyInfo::LatencyInfo() : trace_id(-1), terminated(false) {
+LatencyInfo::InputCoordinate::InputCoordinate() : x(0), y(0) {
+}
+
+LatencyInfo::InputCoordinate::InputCoordinate(float x, float y) : x(x), y(y) {
+}
+
+LatencyInfo::LatencyInfo()
+    : input_coordinates_size(0), trace_id(-1), terminated(false) {
 }
 
 LatencyInfo::~LatencyInfo() {
 }
 
 bool LatencyInfo::Verify(const std::vector<LatencyInfo>& latency_info,
                          const char* referring_msg) {
   if (latency_info.size() > kMaxLatencyInfoNumber) {
     LOG(ERROR) << referring_msg << ", LatencyInfo vector size "
                << latency_info.size() << " is too big.";
     return false;
   }
+  for (size_t i = 0; i < latency_info.size(); i++) {
+    if (latency_info[i].input_coordinates_size > kMaxInputCoordinates) {
+      LOG(ERROR) << referring_msg << ", coordinate vector size "
+                 << latency_info[i].input_coordinates_size << " is too big.";
+      return false;
+    }
+  }
+
   return true;
 }
 
 void LatencyInfo::CopyLatencyFrom(const LatencyInfo& other,
                                   LatencyComponentType type) {
   for (LatencyMap::const_iterator it = other.latency_components.begin();
        it != other.latency_components.end();
        ++it) {
     if (it->first.first == type) {
       AddLatencyNumberWithTimestamp(it->first.first,
@@ skipping 143 matching lines @@
 }
 
 void LatencyInfo::TraceEventType(const char* event_type) {
   TRACE_EVENT_ASYNC_STEP_INTO0("benchmark",
                                "InputLatency",
                                TRACE_ID_DONT_MANGLE(trace_id),
                                event_type);
 }
 
 }  // namespace ui