Index: content/renderer/input/input_handler_proxy.cc |
diff --git a/content/renderer/input/input_handler_proxy.cc b/content/renderer/input/input_handler_proxy.cc |
index 3af29385945fe3051944246cfd951011670d1b8f..d7b594ded9701c180e962a151c855d94765fed14 100644 |
--- a/content/renderer/input/input_handler_proxy.cc |
+++ b/content/renderer/input/input_handler_proxy.cc |
@@ -160,8 +160,12 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent( |
// main thread. Change back to DROP_EVENT once we have synchronization |
// bugs sorted out. |
return DID_NOT_HANDLE; |
+ case cc::InputHandler::ScrollUnknown: |
case cc::InputHandler::ScrollOnMainThread: |
return DID_NOT_HANDLE; |
+ case cc::InputHandler::ScrollStatusCount: |
+ NOTREACHED(); |
+ break; |
} |
} else if (event.type == WebInputEvent::GestureScrollBegin) { |
DCHECK(!gesture_scroll_on_impl_thread_); |
@@ -174,6 +178,9 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent( |
cc::InputHandler::ScrollStatus scroll_status = input_handler_->ScrollBegin( |
gfx::Point(gesture_event.x, gesture_event.y), |
cc::InputHandler::Gesture); |
+ UMA_HISTOGRAM_ENUMERATION("Renderer4.CompositorScrollHitTestResult", |
+ scroll_status, |
+ cc::InputHandler::ScrollStatusCount); |
switch (scroll_status) { |
case cc::InputHandler::ScrollStarted: |
TRACE_EVENT_INSTANT0("input", |
@@ -181,10 +188,14 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent( |
TRACE_EVENT_SCOPE_THREAD); |
gesture_scroll_on_impl_thread_ = true; |
return DID_HANDLE; |
+ case cc::InputHandler::ScrollUnknown: |
case cc::InputHandler::ScrollOnMainThread: |
return DID_NOT_HANDLE; |
case cc::InputHandler::ScrollIgnored: |
return DROP_EVENT; |
+ case cc::InputHandler::ScrollStatusCount: |
+ NOTREACHED(); |
+ break; |
} |
} else if (event.type == WebInputEvent::GestureScrollUpdate) { |
#ifndef NDEBUG |
@@ -330,6 +341,7 @@ InputHandlerProxy::HandleGestureFling( |
input_handler_->ScheduleAnimation(); |
return DID_HANDLE; |
} |
+ case cc::InputHandler::ScrollUnknown: |
case cc::InputHandler::ScrollOnMainThread: { |
TRACE_EVENT_INSTANT0("input", |
"InputHandlerProxy::HandleGestureFling::" |
@@ -351,6 +363,9 @@ InputHandlerProxy::HandleGestureFling( |
} |
return DROP_EVENT; |
} |
+ case cc::InputHandler::ScrollStatusCount: |
+ NOTREACHED(); |
+ break; |
} |
return DID_NOT_HANDLE; |
} |