diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-05-22 18:24:25 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 16:32:40 +0200 |
commit | 4ce69f7403811819800e7c5ae1318b2647e778d1 (patch) | |
tree | 2ec3a98b5abef002670a0916354eb7e0abfe2aa2 /chromium/ui/events/event.cc | |
parent | a6dd70e0328d155d5df8d6df48afbab690b08fb6 (diff) | |
download | qtwebengine-chromium-4ce69f7403811819800e7c5ae1318b2647e778d1.tar.gz |
Update Chromium snapshot to stable version 33.0.1750.170
This is meant as a baseline commit hence it does not
include the patches we need to apply for QtWebEngine.
All patches should be rebased on top of this commit
so we can get rid of the external patches directory.
In future these baseline commits always have to include
the exact Chromium version returned by version_resolver.py's
currentVersion() in their first line, so that we can
retrieve the patches on top to apply on the upstream
repository. This also includes a ninja update.
Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/ui/events/event.cc')
-rw-r--r-- | chromium/ui/events/event.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/chromium/ui/events/event.cc b/chromium/ui/events/event.cc index 39d2b9a57f9..246e39721f2 100644 --- a/chromium/ui/events/event.cc +++ b/chromium/ui/events/event.cc @@ -273,13 +273,7 @@ void LocatedEvent::UpdateForRootTransform( MouseEvent::MouseEvent(const base::NativeEvent& native_event) : LocatedEvent(native_event), changed_button_flags_( -// GetChangedMouseButtonFlagsFromNative isn't implemented on Mac. MouseEvent shouldn't be used. -#if !defined(OS_MACOSX) - GetChangedMouseButtonFlagsFromNative(native_event) -#else - 0 -#endif - ) { + GetChangedMouseButtonFlagsFromNative(native_event)) { if (type() == ET_MOUSE_PRESSED || type() == ET_MOUSE_RELEASED) SetClickCount(GetRepeatCount(*this)); } @@ -644,8 +638,6 @@ 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_, @@ -657,9 +649,7 @@ ScrollEvent::ScrollEvent(const base::NativeEvent& native_event) &x_offset_, &y_offset_, &x_offset_ordinal_, &y_offset_ordinal_, NULL); - } else -#endif - { + } else { NOTREACHED() << "Unexpected event type " << type() << " when constructing a ScrollEvent."; } |