| Index: content/browser/renderer_host/render_widget_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
| index 87d8aa059dd24f4798628886b0d8dc9ffcc2b3c1..087397cf40b0e13217a0edf0aeb7309b2eecdf88 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -984,7 +984,7 @@ void RenderWidgetHostImpl::ForwardWheelEvent(
|
|
|
| void RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo(
|
| const WebMouseWheelEvent& wheel_event,
|
| - const cc::LatencyInfo& latency_info) {
|
| + const ui::LatencyInfo& latency_info) {
|
| TRACE_EVENT0("renderer_host",
|
| "RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo");
|
| if (ignore_input_events_ || process_->IgnoreInputEvents())
|
| @@ -1047,7 +1047,7 @@ void RenderWidgetHostImpl::ForwardGestureEvent(
|
| if (ignore_input_events_ || process_->IgnoreInputEvents())
|
| return;
|
|
|
| - cc::LatencyInfo latency_info = NewInputLatencyInfo();
|
| + ui::LatencyInfo latency_info = NewInputLatencyInfo();
|
|
|
| if (!IsInOverscrollGesture() &&
|
| !gesture_event_filter_->ShouldForward(
|
| @@ -1202,16 +1202,17 @@ int64 RenderWidgetHostImpl::GetLatencyComponentId() {
|
| return GetRoutingID() | (static_cast<int64>(GetProcess()->GetID()) << 32);
|
| }
|
|
|
| -cc::LatencyInfo RenderWidgetHostImpl::NewInputLatencyInfo() {
|
| - cc::LatencyInfo info;
|
| - info.AddLatencyNumber(
|
| - cc::kInputEvent, GetLatencyComponentId(), ++last_input_number_);
|
| +ui::LatencyInfo RenderWidgetHostImpl::NewInputLatencyInfo() {
|
| + ui::LatencyInfo info;
|
| + info.AddLatencyNumber(ui::INPUT_EVENT_LATENCY_COMPONENT,
|
| + GetLatencyComponentId(),
|
| + ++last_input_number_);
|
| return info;
|
| }
|
|
|
| void RenderWidgetHostImpl::SendInputEvent(const WebInputEvent& input_event,
|
| int event_size,
|
| - const cc::LatencyInfo& latency_info,
|
| + const ui::LatencyInfo& latency_info,
|
| bool is_keyboard_shortcut) {
|
| input_event_start_time_ = TimeTicks::Now();
|
| Send(new InputMsg_HandleInputEvent(
|
| @@ -1221,7 +1222,7 @@ void RenderWidgetHostImpl::SendInputEvent(const WebInputEvent& input_event,
|
|
|
| void RenderWidgetHostImpl::ForwardInputEvent(
|
| const WebInputEvent& input_event, int event_size,
|
| - const cc::LatencyInfo& latency_info, bool is_keyboard_shortcut) {
|
| + const ui::LatencyInfo& latency_info, bool is_keyboard_shortcut) {
|
| TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::ForwardInputEvent");
|
|
|
| if (!process_->HasConnection())
|
| @@ -2474,7 +2475,7 @@ void RenderWidgetHostImpl::DetachDelegate() {
|
| delegate_ = NULL;
|
| }
|
|
|
| -void RenderWidgetHostImpl::FrameSwapped(const cc::LatencyInfo& latency_info) {
|
| +void RenderWidgetHostImpl::FrameSwapped(const ui::LatencyInfo& latency_info) {
|
| }
|
|
|
| } // namespace content
|
|
|