Revert of Replace ui::LatencyInfo::InputCoordinate with gfx::PointF

ui/events/latency_info.h

 // 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.
 
 #ifndef UI_EVENTS_LATENCY_INFO_H_
 #define UI_EVENTS_LATENCY_INFO_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/containers/small_map.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/events/events_base_export.h"
-#include "ui/gfx/geometry/point_f.h"
 
 #if !defined(OS_IOS)
 #include "ipc/ipc_param_traits.h"  // nogncheck
 #include "mojo/public/cpp/bindings/struct_traits.h"  // nogncheck
 #endif
 
 namespace ui {
 
 #if !defined(OS_IOS)
 namespace mojom {
@@ skipping 89 matching lines @@
     // Nondecreasing number that can be used to determine what events happened
     // in the component at the time this struct was sent on to the next
     // component.
     int64_t sequence_number;
     // Average time of events that happened in this component.
     base::TimeTicks event_time;
     // Count of events that happened in this component
     uint32_t event_count;
   };
 
+  struct EVENTS_BASE_EXPORT InputCoordinate {
+    InputCoordinate();
+    InputCoordinate(float x, float y);
+
+    float x;
+    float y;
+  };
+
   // Empirically determined constant based on a typical scroll sequence.
   enum { kTypicalMaxComponentsPerLatencyInfo = 10 };
 
   enum : size_t { kMaxInputCoordinates = 2 };
 
   // Map a Latency Component (with a component-specific int64_t id) to a
   // component info.
   typedef base::SmallMap<
       std::map<std::pair<LatencyComponentType, int64_t>, LatencyComponent>,
       kTypicalMaxComponentsPerLatencyInfo> LatencyMap;
@@ skipping 47 matching lines @@
   // the latency_components and the component is stored to |output| if
   // |output| is not NULL. Returns false if no such component is found.
   bool FindLatency(LatencyComponentType type,
                    int64_t id,
                    LatencyComponent* output) const;
 
   void RemoveLatency(LatencyComponentType type);
 
   // Returns true if there is still room for keeping the |input_coordinate|,
   // false otherwise.
-  bool AddInputCoordinate(const gfx::PointF& input_coordinate);
+  bool AddInputCoordinate(const InputCoordinate& input_coordinate);
 
   uint32_t input_coordinates_size() const { return input_coordinates_size_; }
-  const gfx::PointF* input_coordinates() const { return input_coordinates_; }
+  const InputCoordinate* input_coordinates() const {
+    return input_coordinates_;
+  }
 
   const LatencyMap& latency_components() const { return latency_components_; }
 
   bool terminated() const { return terminated_; }
   void set_coalesced() { coalesced_ = true; }
   bool coalesced() const { return coalesced_; }
   int64_t trace_id() const { return trace_id_; }
 
  private:
   void AddLatencyNumberWithTimestampImpl(LatencyComponentType component,
@@ skipping 10 matching lines @@
   CoordinatesAsTraceableData();
 
   // Shown as part of the name of the trace event for this LatencyInfo.
   // String is empty if no tracing is enabled.
   std::string trace_name_;
 
   LatencyMap latency_components_;
 
   // These coordinates represent window coordinates of the original input event.
   uint32_t input_coordinates_size_;
-  gfx::PointF input_coordinates_[kMaxInputCoordinates];
+  InputCoordinate input_coordinates_[kMaxInputCoordinates];
 
   // The unique id for matching the ASYNC_BEGIN/END trace event.
   int64_t trace_id_;
   // Whether this event has been coalesced into another event.
   bool coalesced_;
   // Whether a terminal component has been added.
   bool terminated_;
 
 #if !defined(OS_IOS)
   friend struct IPC::ParamTraits<ui::LatencyInfo>;
   friend struct mojo::StructTraits<ui::mojom::LatencyInfo, ui::LatencyInfo>;
 #endif
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_LATENCY_INFO_H_