diff options
Diffstat (limited to 'chromium/ui/events/event.cc')
| -rw-r--r-- | chromium/ui/events/event.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chromium/ui/events/event.cc b/chromium/ui/events/event.cc index 246e39721f2..39d2b9a57f9 100644 --- a/chromium/ui/events/event.cc +++ b/chromium/ui/events/event.cc @@ -273,7 +273,13 @@ void LocatedEvent::UpdateForRootTransform( MouseEvent::MouseEvent(const base::NativeEvent& native_event) : LocatedEvent(native_event), changed_button_flags_( - GetChangedMouseButtonFlagsFromNative(native_event)) { +// GetChangedMouseButtonFlagsFromNative isn't implemented on Mac. MouseEvent shouldn't be used. +#if !defined(OS_MACOSX) + GetChangedMouseButtonFlagsFromNative(native_event) +#else + 0 +#endif + ) { if (type() == ET_MOUSE_PRESSED || type() == ET_MOUSE_RELEASED) SetClickCount(GetRepeatCount(*this)); } @@ -638,6 +644,8 @@ void TranslatedKeyEvent::ConvertToKeyEvent() { ScrollEvent::ScrollEvent(const base::NativeEvent& native_event) : MouseEvent(native_event) { +// GetScrollOffsets and GetFlingData aren't implemented on Mac. ScrollEvent shouldn't be used. +#if !defined(OS_MACOSX) if (type() == ET_SCROLL) { GetScrollOffsets(native_event, &x_offset_, &y_offset_, @@ -649,7 +657,9 @@ ScrollEvent::ScrollEvent(const base::NativeEvent& native_event) &x_offset_, &y_offset_, &x_offset_ordinal_, &y_offset_ordinal_, NULL); - } else { + } else +#endif + { NOTREACHED() << "Unexpected event type " << type() << " when constructing a ScrollEvent."; } |