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

Unified Diff: chrome/browser/apps/guest_view/web_view_browsertest.cc

Issue 2569273002: Add constructors to WebInputEvents and setters so we can work at cleaning up these public structs. (Closed)
Patch Set: Fix mouse up event sender not modifying modifiers Created 4 years 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: chrome/browser/apps/guest_view/web_view_browsertest.cc
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index cf2b44733cec8d9509ae0a8290c486cb5dc0c224..7004a2f93d5385f7e5b6b415ed2d49e47864298e 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -298,7 +298,12 @@ class SelectControlWaiter : public aura::WindowObserver,
class LeftMouseClick {
public:
explicit LeftMouseClick(content::WebContents* web_contents)
- : web_contents_(web_contents) {}
+ : web_contents_(web_contents),
+ mouse_event_(blink::WebInputEvent::MouseDown,
+ blink::WebInputEvent::NoModifiers,
+ blink::WebInputEvent::TimeStampForTesting) {
+ mouse_event_.button = blink::WebMouseEvent::Button::Left;
+ }
~LeftMouseClick() {
DCHECK(click_completed_);
@@ -307,11 +312,9 @@ class LeftMouseClick {
void Click(const gfx::Point& point, int duration_ms) {
DCHECK(click_completed_);
click_completed_ = false;
- mouse_event_.type = blink::WebInputEvent::MouseDown;
- mouse_event_.button = blink::WebMouseEvent::Button::Left;
+ mouse_event_.setType(blink::WebInputEvent::MouseDown);
mouse_event_.x = point.x();
mouse_event_.y = point.y();
- mouse_event_.modifiers = 0;
const gfx::Rect offset = web_contents_->GetContainerBounds();
mouse_event_.globalX = point.x() + offset.x();
mouse_event_.globalY = point.y() + offset.y();
@@ -336,7 +339,7 @@ class LeftMouseClick {
private:
void SendMouseUp() {
- mouse_event_.type = blink::WebInputEvent::MouseUp;
+ mouse_event_.setType(blink::WebInputEvent::MouseUp);
web_contents_->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
mouse_event_);
click_completed_ = true;
@@ -778,14 +781,15 @@ class WebViewTestBase : public extensions::PlatformAppBrowserTest {
}
void OpenContextMenu(content::WebContents* web_contents) {
- blink::WebMouseEvent mouse_event;
- mouse_event.type = blink::WebInputEvent::MouseDown;
+ blink::WebMouseEvent mouse_event(blink::WebInputEvent::MouseDown,
+ blink::WebInputEvent::NoModifiers,
+ blink::WebInputEvent::TimeStampForTesting);
mouse_event.button = blink::WebMouseEvent::Button::Right;
mouse_event.x = 1;
mouse_event.y = 1;
web_contents->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
mouse_event);
- mouse_event.type = blink::WebInputEvent::MouseUp;
+ mouse_event.setType(blink::WebInputEvent::MouseUp);
web_contents->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
mouse_event);
}
@@ -3356,12 +3360,12 @@ IN_PROC_BROWSER_TEST_P(WebViewAccessibilityTest, DISABLED_TouchAccessibility) {
// Send an accessibility touch event to the main WebContents, but
// positioned on top of the button inside the inner WebView.
- blink::WebMouseEvent accessibility_touch_event;
- accessibility_touch_event.type = blink::WebInputEvent::MouseMove;
+ blink::WebMouseEvent accessibility_touch_event(
+ blink::WebInputEvent::MouseMove,
+ blink::WebInputEvent::IsTouchAccessibility,
+ blink::WebInputEvent::TimeStampForTesting);
accessibility_touch_event.x = 95;
accessibility_touch_event.y = 55;
- accessibility_touch_event.modifiers =
- blink::WebInputEvent::IsTouchAccessibility;
web_contents->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
accessibility_touch_event);

Powered by Google App Engine
This is Rietveld 408576698