diff options
| author | dnicoara <dnicoara@chromium.org> | 2014-09-19 13:50:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-19 20:51:17 +0000 |
| commit | a7738c9de62e061649896353c9d3ebe5176ece07 (patch) | |
| tree | 852a0257a418e8fd9ced0f36c491433752203e4a /ui/events/ozone | |
| parent | 3f6657e4f953d4f2a57e0b90cd5505390ab31c72 (diff) | |
| download | chromium_src-a7738c9de62e061649896353c9d3ebe5176ece07.zip chromium_src-a7738c9de62e061649896353c9d3ebe5176ece07.tar.gz chromium_src-a7738c9de62e061649896353c9d3ebe5176ece07.tar.bz2 | |
[Ozone] Fix DCHECK and check for scroll events as well
Scroll events are mouse events as well. On debug builds this DCHECK
would otherwise get triggered.
BUG=none
NOTRY=true
Review URL: https://codereview.chromium.org/590523004
Cr-Commit-Position: refs/heads/master@{#295772}
Diffstat (limited to 'ui/events/ozone')
| -rw-r--r-- | ui/events/ozone/events_ozone.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/events/ozone/events_ozone.cc b/ui/events/ozone/events_ozone.cc index fb0d142..5478a62 100644 --- a/ui/events/ozone/events_ozone.cc +++ b/ui/events/ozone/events_ozone.cc @@ -44,7 +44,7 @@ int GetChangedMouseButtonFlagsFromNative( const base::NativeEvent& native_event) { const ui::MouseEvent* event = static_cast<const ui::MouseEvent*>(native_event); - DCHECK(event->IsMouseEvent()); + DCHECK(event->IsMouseEvent() || event->IsScrollEvent()); return event->changed_button_flags(); } |