Index: third_party/WebKit/Source/web/WebInputEventConversion.cpp |
diff --git a/third_party/WebKit/Source/web/WebInputEventConversion.cpp b/third_party/WebKit/Source/web/WebInputEventConversion.cpp |
index ca0bbbeefb8916f28f94d9589e96e64279344ef5..203d818402322973f8c285b1fa1c923fd1ab3134 100644 |
--- a/third_party/WebKit/Source/web/WebInputEventConversion.cpp |
+++ b/third_party/WebKit/Source/web/WebInputEventConversion.cpp |
@@ -98,7 +98,7 @@ PlatformEvent::DispatchType toPlatformDispatchType(WebInputEvent::DispatchType t |
"Dispatch Types not equal"); |
static_assert(PlatformEvent::DispatchType::ListenersNonBlockingPassive == static_cast<PlatformEvent::DispatchType>(WebInputEvent::DispatchType::ListenersNonBlockingPassive), |
"Dispatch Types not equal"); |
- static_assert(PlatformEvent::DispatchType::ListenersForcedNonBlockingPassive == static_cast<PlatformEvent::DispatchType>(WebInputEvent::DispatchType::ListenersForcedNonBlockingPassive), |
+ static_assert(PlatformEvent::DispatchType::ListenersForcedNonBlockingDueToFling == static_cast<PlatformEvent::DispatchType>(WebInputEvent::DispatchType::ListenersForcedNonBlockingDueToFling), |
"Dispatch Types not equal"); |
return static_cast<PlatformEvent::DispatchType>(type); |
@@ -483,6 +483,7 @@ PlatformTouchEventBuilder::PlatformTouchEventBuilder(Widget* widget, const WebTo |
m_timestamp = event.timeStampSeconds; |
m_causesScrollingIfUncanceled = event.movedBeyondSlopRegion; |
m_dispatchedDuringFling = event.dispatchedDuringFling; |
+ m_touchStartOrFirstTouchMove = event.touchStartOrFirstTouchMove; |
for (unsigned i = 0; i < event.touchesLength; ++i) |
m_touchPoints.append(PlatformTouchPointBuilder(widget, event.touches[i])); |