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

Unified Diff: ui/views/event_monitor_mac.mm

Issue 981693002: MacViews: Fix crash when EventMonitorMac receives a NSSystemDefinedEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@views
Patch Set: Created 5 years, 10 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
« no previous file with comments | « ui/events/cocoa/events_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/event_monitor_mac.mm
diff --git a/ui/views/event_monitor_mac.mm b/ui/views/event_monitor_mac.mm
index 1de603634cf09a70a356573cd83abc41ef44e5f5..cb3e54e9a1c7e2550b6c0e1b71d160f2be28200e 100644
--- a/ui/views/event_monitor_mac.mm
+++ b/ui/views/event_monitor_mac.mm
@@ -42,7 +42,8 @@ EventMonitorMac::EventMonitorMac(ui::EventHandler* event_handler,
handler:^NSEvent*(NSEvent* event) {
if (!target_window || [event window] == target_window) {
scoped_ptr<ui::Event> ui_event = ui::EventFromNative(event);
- event_handler->OnEvent(ui_event.get());
+ if (ui_event)
+ event_handler->OnEvent(ui_event.get());
}
return event;
}];
« no previous file with comments | « ui/events/cocoa/events_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698