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

Unified Diff: ui/events/event_processor.cc

Issue 519113002: Do not mutate ui::Event properties during nested event processing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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: ui/events/event_processor.cc
diff --git a/ui/events/event_processor.cc b/ui/events/event_processor.cc
index 3077cc85b168aea483a9e506021af80b5e64375e..e07d3deeac3672bf70b3a27c22939c4d7a72fe12 100644
--- a/ui/events/event_processor.cc
+++ b/ui/events/event_processor.cc
@@ -19,7 +19,26 @@ EventDispatchDetails EventProcessor::OnEventFromSource(Event* event) {
EventTarget* target = targeter->FindTargetForEvent(root, event);
while (target) {
- EventDispatchDetails details = DispatchEvent(target, event);
+ EventDispatchDetails details;
+ if (event->phase() != EP_PREDISPATCH) {
+ // |event| is currently being processed by another EventProcessor, which
+ // expects the event's state (e.g., target, phase, etc.) to remain
+ // unchanged once |this| has finished its nested processing (with the
+ // exception of whether or not the event was handled). Thus dispatch
+ // a copy of the event instead.
+ scoped_ptr<Event> event_copy(event->Clone());
+ details = DispatchEvent(target, event_copy.get());
sadrul 2014/08/29 21:12:17 I think we want to clone the event before going in
tdanderson 2014/09/02 22:57:09 Done.
+
+ if (event_copy->stopped_propagation())
+ event->StopPropagation();
+ else if (event_copy->handled())
+ event->SetHandled();
+ } else {
+ // |this| is the only EventProcessor currently processing |event|, so
+ // copying the event prior to dispatch is unnecessary.
+ details = DispatchEvent(target, event);
+ }
+
if (details.dispatcher_destroyed ||
details.target_destroyed ||
event->handled()) {

Powered by Google App Engine
This is Rietveld 408576698