Chromium Code Reviews| Index: Source/core/page/EventHandler.cpp |
| diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp |
| index fd1abbb8136b323932b8bebfab8dafc6ba36383f..7b8f6ca1878581f688e939fd23c7c86dea20ff76 100644 |
| --- a/Source/core/page/EventHandler.cpp |
| +++ b/Source/core/page/EventHandler.cpp |
| @@ -2201,7 +2201,6 @@ bool EventHandler::handleGestureScrollEvent(const PlatformGestureEvent& gestureE |
| case PlatformEvent::GestureScrollBegin: |
| return handleGestureScrollBegin(gestureEvent); |
| case PlatformEvent::GestureScrollUpdate: |
| - case PlatformEvent::GestureScrollUpdateWithoutPropagation: |
| return handleGestureScrollUpdate(gestureEvent); |
| case PlatformEvent::GestureScrollEnd: |
| return handleGestureScrollEnd(gestureEvent); |
| @@ -2371,8 +2370,7 @@ bool EventHandler::handleScrollGestureOnResizer(Node* eventTarget, const Platfor |
| m_offsetFromResizeCorner = m_resizeScrollableArea->offsetFromResizeCorner(p); |
| return true; |
| } |
| - } else if (gestureEvent.type() == PlatformEvent::GestureScrollUpdate || |
| - gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation) { |
| + } else if (gestureEvent.type() == PlatformEvent::GestureScrollUpdate) { |
| if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode()) { |
| m_resizeScrollableArea->resize(gestureEvent, m_offsetFromResizeCorner); |
| return true; |
| @@ -2457,8 +2455,8 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture |
| RefPtrWillBeRawPtr<FrameView> protector(m_frame->view()); |
| Node* stopNode = nullptr; |
| - bool scrollShouldNotPropagate = gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation |
| - || (gestureEvent.type() == PlatformEvent::GestureScrollUpdate && gestureEvent.preventPropagation()); |
| + bool scrollShouldNotPropagate = |
| + gestureEvent.type() == PlatformEvent::GestureScrollUpdate && gestureEvent.preventPropagation(); |
|
Rick Byers
2014/11/25 19:48:02
nit: I believe we're not guaranteed to have a Gest
majidvp
2014/11/25 19:58:17
Did you mean that we ARE guaranteed to have a Gest
majidvp
2014/11/26 14:58:35
Done.
|
| // Try to send the event to the correct view. |
| if (passScrollGestureEventToWidget(gestureEvent, renderer)) { |