Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(509)

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 2394593002: revert "SourceEventType added to LatencyInfo." (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 666eb2928624addf63257443bac06471965721c4..acf55991c49763b7de0eeb05a3b0c358f6c0bead 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -74,7 +74,6 @@
#include "skia/ext/image_operations.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/public/web/WebCompositionUnderline.h"
-#include "ui/events/blink/web_input_event_traits.h"
#include "ui/events/event.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/color_space.h"
@@ -954,8 +953,7 @@ void RenderWidgetHostImpl::OnFirstPaintAfterLoad() {
}
void RenderWidgetHostImpl::ForwardMouseEvent(const WebMouseEvent& mouse_event) {
- ForwardMouseEventWithLatencyInfo(mouse_event,
- ui::LatencyInfo(ui::SourceEventType::OTHER));
+ ForwardMouseEventWithLatencyInfo(mouse_event, ui::LatencyInfo());
if (owner_delegate_)
owner_delegate_->RenderWidgetDidForwardMouseEvent(mouse_event);
}
@@ -984,8 +982,7 @@ void RenderWidgetHostImpl::ForwardMouseEventWithLatencyInfo(
void RenderWidgetHostImpl::ForwardWheelEvent(
const WebMouseWheelEvent& wheel_event) {
- ForwardWheelEventWithLatencyInfo(wheel_event,
- ui::LatencyInfo(ui::SourceEventType::WHEEL));
+ ForwardWheelEventWithLatencyInfo(wheel_event, ui::LatencyInfo());
}
void RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo(
@@ -1012,10 +1009,7 @@ void RenderWidgetHostImpl::ForwardEmulatedGestureEvent(
void RenderWidgetHostImpl::ForwardGestureEvent(
const blink::WebGestureEvent& gesture_event) {
- ForwardGestureEventWithLatencyInfo(
- gesture_event,
- ui::WebInputEventTraits::CreateLatencyInfoForWebGestureEvent(
- gesture_event));
+ ForwardGestureEventWithLatencyInfo(gesture_event, ui::LatencyInfo());
}
void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
@@ -1052,9 +1046,7 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
if (scroll_update_needs_wrapping) {
ForwardGestureEventWithLatencyInfo(
- CreateScrollBeginForWrapping(gesture_event),
- ui::WebInputEventTraits::CreateLatencyInfoForWebGestureEvent(
- gesture_event));
+ CreateScrollBeginForWrapping(gesture_event), ui::LatencyInfo());
}
// Delegate must be non-null, due to |ShouldDropInputEvents()| test.
@@ -1068,17 +1060,15 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
if (scroll_update_needs_wrapping) {
ForwardGestureEventWithLatencyInfo(
- CreateScrollEndForWrapping(gesture_event),
- ui::WebInputEventTraits::CreateLatencyInfoForWebGestureEvent(
- gesture_event));
+ CreateScrollEndForWrapping(gesture_event), ui::LatencyInfo());
}
}
void RenderWidgetHostImpl::ForwardEmulatedTouchEvent(
const blink::WebTouchEvent& touch_event) {
TRACE_EVENT0("input", "RenderWidgetHostImpl::ForwardEmulatedTouchEvent");
- ui::LatencyInfo latency_info(ui::SourceEventType::TOUCH);
- TouchEventWithLatencyInfo touch_with_latency(touch_event, latency_info);
+
+ TouchEventWithLatencyInfo touch_with_latency(touch_event);
DispatchInputEventWithLatencyInfo(touch_event, &touch_with_latency.latency);
input_router_->SendTouchEvent(touch_with_latency);
}
@@ -1167,9 +1157,8 @@ void RenderWidgetHostImpl::ForwardKeyboardEvent(
if (touch_emulator_ && touch_emulator_->HandleKeyboardEvent(key_event))
return;
- ui::LatencyInfo latency_info(ui::SourceEventType::OTHER);
- NativeWebKeyboardEventWithLatencyInfo key_event_with_latency(key_event,
- latency_info);
+
+ NativeWebKeyboardEventWithLatencyInfo key_event_with_latency(key_event);
key_event_with_latency.event.isBrowserShortcut = is_shortcut;
DispatchInputEventWithLatencyInfo(key_event, &key_event_with_latency.latency);
input_router_->SendKeyboardEvent(key_event_with_latency);

Powered by Google App Engine
This is Rietveld 408576698