Skip to content

Commit

Permalink
Reland "ozone/wayland: fix mouse events in tests"
Browse files Browse the repository at this point in the history
This is a reland of b2dde5b

Original change's description:
> ozone/wayland: fix mouse events in tests
>
> This CL fixes a small logic bug in WaylandOzoneUIControlsTestHelper's
> SendMouseEvent() method that prevented the notification closure from
> being run for mouse down events.
>
> The interactive_ui_tests that now pass, either thanks to this fix or
> because they pass because of some previous patch, are enabled.
>
> Bug: 1192997
> Change-Id: I1c58df2af8b036ab2a2b6da393022f3bd11902c5
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3330284
> Reviewed-by: Maksim Sisov <msisov@igalia.com>
> Commit-Queue: Max Ihlenfeldt <mihlenfeldt@igalia.com>
> Cr-Commit-Position: refs/heads/main@{#950978}

Bug: 1192997
Change-Id: I8e961576ca841da79d8719b7545ed9ac888b4afc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3338338
Reviewed-by: Maksim Sisov <msisov@igalia.com>
Commit-Queue: Max Ihlenfeldt <mihlenfeldt@igalia.com>
Cr-Commit-Position: refs/heads/main@{#951449}
  • Loading branch information
Max Ihlenfeldt authored and Chromium LUCI CQ committed Dec 14, 2021
1 parent af9b90a commit 59c1d1c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,65 +7,36 @@
-AppWindowTest.InitFullscreenToAlwaysOnTop
-AppWindowTest.RuntimeAlwaysOnTopToFullscreen
-AppWindowTest.RuntimeFullscreenToAlwaysOnTop
-BookmarkBarViewTest10.KeyEvents
-BookmarkBarViewTest12.CloseWithModalDialog
-BookmarkBarViewTest13.ClickOnContextMenuSeparator
-BookmarkBarViewTest15.MenuStaysVisibleAfterDelete
-BookmarkBarViewTest17.ContextMenus3
-BookmarkBarViewTest21.ContextMenusForEmptyFolder
-BookmarkBarViewTest22.CloseSourceBrowserDuringDrag
-BookmarkBarViewTest23.ContextMenusKeyboard
-BookmarkBarViewTest3.Submenus
-BookmarkBarViewTest4.ContextMenus
-BookmarkBarViewTest5.DND
-BookmarkBarViewTest6.OpenMenuOnClickAndHold
-BookmarkBarViewTest7.DNDToDifferentMenu
-BookmarkBarViewTest8.DNDBackToOriginatingMenu
-BookmarkBarViewTest9.ScrollButtonScrolls
-BrowserCommandControllerInteractiveTest.ShortcutsShouldTakeEffectInBrowserFullscreen
-BrowserFocusTest.BackgroundBrowserDontStealFocus
-ChromeVisibilityObserverInteractiveTest.VisibilityTest
-CrossSiteSubframe/DragAndDropBrowserTest.CrossSiteDrag/0
-CrossSiteSubframe/DragAndDropBrowserTest.CrossTabDrag/0
-CrossSiteSubframe/DragAndDropBrowserTest.DragCorsSameOriginImageBetweenFrames/0
-CrossSiteSubframe/DragAndDropBrowserTest.DragCrossOriginImageBetweenFrames/0
-CrossSiteSubframe/DragAndDropBrowserTest.DragSameOriginImageBetweenFrames/0
-CrossSiteSubframe/DragAndDropBrowserTest.DragStartInFrame/0
-DesktopWidgetTestInteractive.DesktopNativeWidgetWithModalTransientChild
-DesktopWindowTreeHostLinuxTest.CaptureEventForwarding
-DesktopWindowTreeHostLinuxTest.Deactivate
-DesktopWindowTreeHostLinuxTest.InputMethodFocus
-DevToolsManagerDelegateTest.ShowMinimizedWindow
-ExtensionApiTest.WindowOpenFocus
-ExtensionsToolbarInteractiveUiTest.DoubleClickToolbarActionToClose
-KeyboardLockInteractiveBrowserTest.ActiveWithSomeKeysLocked
-MediaDialogViewBrowserTest.PictureInPicture
-MediaDialogViewBrowserTest.PlayingSessionAlwaysDisplayFirst
-MenuItemViewTestInsert02.InsertItem02
-MenuItemViewTestInsert10.InsertItem10
-MenuItemViewTestInsert12.InsertItem12
-MenuItemViewTestInsert22.InsertItem22
-MenuViewDragAndDropTestNestedDrag.MenuViewDragAndDropNestedDrag
-MenuViewDragAndDropTestTestInMenuDrag.TestInMenuDrag
-NotificationsTestWithFakeMediaStream.ShouldQueueDuringScreenPresent
-OmniboxViewViewsTest.SelectionClipboard
-OmniboxViewViewsTest.TextElideStatus
-PasswordBubbleInteractiveUiTest.AutoSigninNoFocus
-PopupBlockerBrowserTest.ModalPopUnder
-SameSiteSubframe/DragAndDropBrowserTest.CrossSiteDrag/0
-SameSiteSubframe/DragAndDropBrowserTest.CrossTabDrag/0
-SameSiteSubframe/DragAndDropBrowserTest.DragCorsSameOriginImageBetweenFrames/0
-SameSiteSubframe/DragAndDropBrowserTest.DragCrossOriginImageBetweenFrames/0
-SameSiteSubframe/DragAndDropBrowserTest.DragSameOriginImageBetweenFrames/0
-SameSiteSubframe/DragAndDropBrowserTest.DragStartInFrame/0
-SessionRestoreInteractiveTest.RestoreMinimizedWindow
-SitePerProcessInteractiveBrowserTest.TabAndMouseFocusNavigation
-StartupBrowserCreatorTest.LastUsedProfileActivated
-TabDragCaptureLostTest.ReleaseCaptureOnDrag
-TabDragging/DetachToBrowserTabDragControllerTest*
-TabMetricsLoggerTest.CreateWindowFeaturesTestMultipleWindows
-TabMetricsLoggerTest.CreateWindowFeaturesTestWindowActivation
-WebAuthFocusTest.Focus
-WidgetInputMethodInteractiveTest.Activation
-WidgetInputMethodInteractiveTest.OneWindow
-WidgetInputMethodInteractiveTest.TwoWindows
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void WaylandOzoneUIControlsTestHelper::SendMouseEvent(

WaylandGlobalEventWaiter::Create(
WaylandGlobalEventWaiter::WaylandEventType::kButton, changed_button,
button_state & UP, std::move(closure), input_emulate_.get());
button_state & DOWN, std::move(closure), input_emulate_.get());

if (button_state & DOWN) {
input_emulate_->EmulatePointerButton(
Expand Down

0 comments on commit 59c1d1c

Please sign in to comment.