summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-02-19 15:35:20 +0100
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-02-20 17:47:39 +0100
commit002eaa024104d6135d82d921ca4a5b4b673a9d81 (patch)
tree9bf96be6030504a62e5fd1b6f8e93f4e4f17ad37
parent65e75f59edddc87b3391f9fff3b6aeff19fc529e (diff)
downloadqtwebengine-chromium-002eaa024104d6135d82d921ca4a5b4b673a9d81.tar.gz
Fix the Mac debug build
event.cc was added to the build to get ui::TouchEvent and ui::GestureEvent but this file is not built on Mac by Chromium itself and thus fails to build. Change-Id: Ib7bb4fb1fc8692df1b8151c3d159de3d0f73c76f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--chromium/ui/events/event.cc14
1 files changed, 12 insertions, 2 deletions
diff --git a/chromium/ui/events/event.cc b/chromium/ui/events/event.cc
index 7c3e6d5021c..7153607eb03 100644
--- a/chromium/ui/events/event.cc
+++ b/chromium/ui/events/event.cc
@@ -294,7 +294,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));
}
@@ -698,6 +704,8 @@ DropTargetEvent::DropTargetEvent(const OSExchangeData& data,
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_,
@@ -709,7 +717,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.";
}