Expand UMA coverage for compositor-handled events and fling FPS

content/renderer/input/input_handler_proxy.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 "content/renderer/input/input_handler_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 97 matching lines @@
 }
 
 WebGestureEvent ObtainGestureScrollBegin(const WebGestureEvent& event) {
   WebGestureEvent scroll_begin_event = event;
   scroll_begin_event.type = WebInputEvent::GestureScrollBegin;
   scroll_begin_event.data.scrollBegin.deltaXHint = 0;
   scroll_begin_event.data.scrollBegin.deltaYHint = 0;
   return scroll_begin_event;
 }
 
-void SendScrollLatencyUma(const WebInputEvent& event,
-                          const ui::LatencyInfo& latency_info) {
+void ReportInputEventLatencyUma(const WebInputEvent& event,
+                                const ui::LatencyInfo& latency_info) {

[no sievers, 2014/12/05 21:27:00]

DCHECK(uma_latency_reporting_enabled_);

[jdduke (slow), 2014/12/05 21:31:53]

Hmm, this isn't a member function, though I could make it one if you prefer?

[no sievers, 2014/12/05 21:33:52]

Oops nevermind, no big deal.

   if (!(event.type == WebInputEvent::GestureScrollBegin ||
-        event.type == WebInputEvent::GestureScrollUpdate))
+        event.type == WebInputEvent::GestureScrollUpdate ||
+        event.type == WebInputEvent::GesturePinchBegin ||
+        event.type == WebInputEvent::GesturePinchUpdate ||
+        event.type == WebInputEvent::GestureFlingStart)) {
     return;
+  }
 
   ui::LatencyInfo::LatencyMap::const_iterator it =
       latency_info.latency_components.find(std::make_pair(
           ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0));
 
   if (it == latency_info.latency_components.end())
     return;
 
   base::TimeDelta delta = base::TimeTicks::HighResNow() - it->second.event_time;
   for (size_t i = 0; i < it->second.event_count; ++i) {
-    UMA_HISTOGRAM_CUSTOM_COUNTS(
-        "Event.Latency.RendererImpl.GestureScroll2",
-        delta.InMicroseconds(),
-        1,
-        1000000,
-        100);
+    switch (event.type) {
+      case blink::WebInputEvent::GestureScrollBegin:
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Event.Latency.RendererImpl.GestureScrollBegin",
+            delta.InMicroseconds(), 1, 1000000, 100);
+        break;
+      case blink::WebInputEvent::GestureScrollUpdate:
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            // So named for historical reasons.
+            "Event.Latency.RendererImpl.GestureScroll2",
+            delta.InMicroseconds(), 1, 1000000, 100);
+        break;
+      case blink::WebInputEvent::GesturePinchBegin:
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Event.Latency.RendererImpl.GesturePinchBegin",
+            delta.InMicroseconds(), 1, 1000000, 100);
+        break;
+      case blink::WebInputEvent::GesturePinchUpdate:
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Event.Latency.RendererImpl.GesturePinchUpdate",
+            delta.InMicroseconds(), 1, 1000000, 100);
+        break;
+      case blink::WebInputEvent::GestureFlingStart:
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Event.Latency.RendererImpl.GestureFlingStart",
+            delta.InMicroseconds(), 1, 1000000, 100);
+        break;
+      default:
+        NOTREACHED();
+        break;
+    }
   }
+}
+
 }  // namespace
 
-}
-
 namespace content {
 
 InputHandlerProxy::InputHandlerProxy(cc::InputHandler* input_handler,
                                      InputHandlerProxyClient* client)
     : client_(client),
       input_handler_(input_handler),
       deferred_fling_cancel_time_seconds_(0),
 #ifndef NDEBUG
       expect_scroll_update_end_(false),
 #endif
       gesture_scroll_on_impl_thread_(false),
       gesture_pinch_on_impl_thread_(false),
       fling_may_be_active_on_main_thread_(false),
       disallow_horizontal_fling_scroll_(false),
       disallow_vertical_fling_scroll_(false),
-      has_fling_animation_started_(false) {
+      has_fling_animation_started_(false),
+      uma_latency_reporting_enabled_(
+          base::TimeTicks::IsHighResNowFastAndReliable()) {
   DCHECK(client);
   input_handler_->BindToClient(this);
   smooth_scroll_enabled_ = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableSmoothScrolling);
 
 #if defined(OS_MACOSX)
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableThreadedEventHandlingMac)) {
     scroll_elasticity_controller_.reset(new InputScrollElasticityController(
         input_handler_->CreateScrollElasticityHelper()));
   }
 #endif
 }
 
 InputHandlerProxy::~InputHandlerProxy() {}
 
 void InputHandlerProxy::WillShutdown() {
   scroll_elasticity_controller_.reset();
   input_handler_ = NULL;
   client_->WillShutdown();
 }
 
 InputHandlerProxy::EventDisposition
 InputHandlerProxy::HandleInputEventWithLatencyInfo(
     const WebInputEvent& event,
     ui::LatencyInfo* latency_info) {
   DCHECK(input_handler_);
 
-  SendScrollLatencyUma(event, *latency_info);
+  if (uma_latency_reporting_enabled_)
+    ReportInputEventLatencyUma(event, *latency_info);
 
   TRACE_EVENT_FLOW_STEP0("input",
                          "LatencyInfo.Flow",
                          TRACE_ID_DONT_MANGLE(latency_info->trace_id),
                          "HandleInputEventImpl");
 
   scoped_ptr<cc::SwapPromiseMonitor> latency_info_swap_promise_monitor =
       input_handler_->CreateLatencyInfoSwapPromiseMonitor(latency_info);
   InputHandlerProxy::EventDisposition disposition = HandleInputEvent(event);
   return disposition;
@@ skipping 687 matching lines @@
   // trigger a scroll, e.g., with a trivial time delta between fling updates.
   // Return true in this case to prevent early fling termination.
   if (std::abs(clipped_increment.width) < kScrollEpsilon &&
       std::abs(clipped_increment.height) < kScrollEpsilon)
     return true;
 
   return did_scroll;
 }
 
 }  // namespace content