Scope WebInputEvent types to enum namespaces.
WebInputEvent::Type and WebTouchPoint::State are adjusted in this change.
This allows us to alias this enumeration to a mojo defined type that
will come in another CL.
No functional changes in this CL, largely completed via sed.
Change-Id: I0657aacf782a437f9432e721bba349f8fdf797e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159698
Reviewed-by: Avi Drissman <[email protected]>
Commit-Queue: Dave Tapuska <[email protected]>
Cr-Commit-Position: refs/heads/master@{#761210}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 57f7b6f4..fdcc8358 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -250,10 +250,10 @@
bool IsUserInteractionInputType(blink::WebInputEvent::Type type) {
// Ideally, this list would be based more off of
// https://whatwg.org/C/interaction.html#triggered-by-user-activation.
- return type == blink::WebInputEvent::kMouseDown ||
- type == blink::WebInputEvent::kGestureScrollBegin ||
- type == blink::WebInputEvent::kTouchStart ||
- type == blink::WebInputEvent::kRawKeyDown;
+ return type == blink::WebInputEvent::Type::kMouseDown ||
+ type == blink::WebInputEvent::Type::kGestureScrollBegin ||
+ type == blink::WebInputEvent::Type::kTouchStart ||
+ type == blink::WebInputEvent::Type::kRawKeyDown;
}
// Ensures that OnDialogClosed is only called once.
@@ -6487,7 +6487,7 @@
if (!HasMatchingWidgetHost(&frame_tree_, render_widget_host))
return;
- if (type != blink::WebInputEvent::kGestureScrollBegin)
+ if (type != blink::WebInputEvent::Type::kGestureScrollBegin)
last_interactive_input_event_time_ = ui::EventTimeForNow();
for (auto& observer : observers_)
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc
index 65464d4..7e18db2 100644
--- a/content/browser/web_contents/web_contents_impl_browsertest.cc
+++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
@@ -3332,7 +3332,7 @@
TestNavigationObserver back_observer(web_contents);
web_contents->GetRenderWidgetHostWithPageFocus()->ForwardMouseEvent(
blink::WebMouseEvent(
- blink::WebInputEvent::kMouseUp, gfx::PointF(51, 50),
+ blink::WebInputEvent::Type::kMouseUp, gfx::PointF(51, 50),
gfx::PointF(51, 50), blink::WebPointerProperties::Button::kBack, 0,
blink::WebInputEvent::kNoModifiers, base::TimeTicks::Now()));
back_observer.Wait();
@@ -3343,7 +3343,7 @@
TestNavigationObserver forward_observer(web_contents);
web_contents->GetRenderWidgetHostWithPageFocus()->ForwardMouseEvent(
blink::WebMouseEvent(
- blink::WebInputEvent::kMouseUp, gfx::PointF(51, 50),
+ blink::WebInputEvent::Type::kMouseUp, gfx::PointF(51, 50),
gfx::PointF(51, 50), blink::WebPointerProperties::Button::kForward,
0, blink::WebInputEvent::kNoModifiers, base::TimeTicks::Now()));
forward_observer.Wait();
@@ -3374,8 +3374,8 @@
RenderWidgetHostImpl* render_widget_host =
web_contents->GetRenderWidgetHostWithPageFocus();
render_widget_host->ForwardMouseEvent(blink::WebMouseEvent(
- blink::WebInputEvent::kMouseUp, gfx::PointF(51, 50), gfx::PointF(51, 50),
- blink::WebPointerProperties::Button::kBack, 0,
+ blink::WebInputEvent::Type::kMouseUp, gfx::PointF(51, 50),
+ gfx::PointF(51, 50), blink::WebPointerProperties::Button::kBack, 0,
blink::WebInputEvent::kNoModifiers, base::TimeTicks::Now()));
RunUntilInputProcessed(render_widget_host);
@@ -3406,8 +3406,8 @@
render_widget_host = web_contents->GetRenderWidgetHostWithPageFocus();
render_widget_host->ForwardMouseEvent(blink::WebMouseEvent(
- blink::WebInputEvent::kMouseUp, gfx::PointF(51, 50), gfx::PointF(51, 50),
- blink::WebPointerProperties::Button::kForward, 0,
+ blink::WebInputEvent::Type::kMouseUp, gfx::PointF(51, 50),
+ gfx::PointF(51, 50), blink::WebPointerProperties::Button::kForward, 0,
blink::WebInputEvent::kNoModifiers, base::TimeTicks::Now()));
RunUntilInputProcessed(render_widget_host);
// Wait an action timeout and assert the URL is correct.
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
index 00c9093..80b6ceb 100644
--- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
+++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
@@ -347,7 +347,7 @@
}
void OnInputEvent(const blink::WebInputEvent& event) override {
- EXPECT_NE(blink::WebInputEvent::kMouseMove, event.GetType())
+ EXPECT_NE(blink::WebInputEvent::Type::kMouseMove, event.GetType())
<< "Unexpected mouse move event.";
}
@@ -392,7 +392,7 @@
SpuriousMouseMoveEventObserver mouse_observer(GetRenderWidgetHost());
blink::WebGestureEvent gesture_scroll_begin(
- blink::WebGestureEvent::kGestureScrollBegin,
+ blink::WebGestureEvent::Type::kGestureScrollBegin,
blink::WebInputEvent::kNoModifiers,
blink::WebInputEvent::GetStaticTimeStampForTests(),
blink::WebGestureDevice::kTouchscreen);
@@ -403,7 +403,7 @@
GetRenderWidgetHost()->ForwardGestureEvent(gesture_scroll_begin);
blink::WebGestureEvent gesture_scroll_update(
- blink::WebGestureEvent::kGestureScrollUpdate,
+ blink::WebGestureEvent::Type::kGestureScrollUpdate,
blink::WebInputEvent::kNoModifiers,
blink::WebInputEvent::GetStaticTimeStampForTests(),
blink::WebGestureDevice::kTouchscreen);
@@ -877,7 +877,7 @@
base::BindRepeating([](blink::mojom::InputEventResultSource,
blink::mojom::InputEventResultState state,
const blink::WebInputEvent& event) {
- return event.GetType() == blink::WebGestureEvent::kTouchStart &&
+ return event.GetType() == blink::WebGestureEvent::Type::kTouchStart &&
state == blink::mojom::InputEventResultState::kNotConsumed;
}));
// Send touch press.
@@ -895,7 +895,7 @@
base::BindRepeating([](blink::mojom::InputEventResultSource,
blink::mojom::InputEventResultState state,
const blink::WebInputEvent& event) {
- return event.GetType() == blink::WebGestureEvent::kTouchMove &&
+ return event.GetType() == blink::WebGestureEvent::Type::kTouchMove &&
state == blink::mojom::InputEventResultState::kNotConsumed;
}));
GetRenderWidgetHost()->ForwardTouchEventWithLatencyInfo(touch,
@@ -933,9 +933,9 @@
ui::LatencyInfo());
WaitAFrame();
- blink::WebGestureEvent scroll_end(blink::WebInputEvent::kGestureScrollEnd,
- blink::WebInputEvent::kNoModifiers,
- ui::EventTimeForNow());
+ blink::WebGestureEvent scroll_end(
+ blink::WebInputEvent::Type::kGestureScrollEnd,
+ blink::WebInputEvent::kNoModifiers, ui::EventTimeForNow());
GetRenderWidgetHost()->ForwardGestureEventWithLatencyInfo(
scroll_end, ui::LatencyInfo());
WaitAFrame();
