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

Unified Diff: ui/views/controls/menu/menu_event_dispatcher_linux.cc

Issue 785753002: Don't refcount tracking id -> slot id mapping. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comment. Created 5 years, 11 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
« ui/events/event.h ('K') | « ui/views/controls/menu/menu_controller_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_event_dispatcher_linux.cc
diff --git a/ui/views/controls/menu/menu_event_dispatcher_linux.cc b/ui/views/controls/menu/menu_event_dispatcher_linux.cc
index 51990fd07f00f50abadf05859a6d6c33a67208e2..f61d58b99992e974283741b9696c3661448389ad 100644
--- a/ui/views/controls/menu/menu_event_dispatcher_linux.cc
+++ b/ui/views/controls/menu/menu_event_dispatcher_linux.cc
@@ -75,6 +75,14 @@ uint32_t MenuEventDispatcher::DispatchEvent(const ui::PlatformEvent& event) {
should_quit = false;
should_perform_default = false;
break;
+ case ui::ET_TOUCH_RELEASED:
+ case ui::ET_TOUCH_CANCELLED:
+ // Don't allow the event copy to clear the native touch id
+ // mapping, or we'll lose the mapping before the initial event
+ // has finished being dispatched.
+ static_cast<ui::TouchEvent*>(ui_event.get())
+ ->set_should_remove_native_touch_id_mapping(false);
+ break;
default:
break;
}
« ui/events/event.h ('K') | « ui/views/controls/menu/menu_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698