Chromium Code Reviews| Index: third_party/WebKit/Source/core/events/TouchEvent.cpp |
| diff --git a/third_party/WebKit/Source/core/events/TouchEvent.cpp b/third_party/WebKit/Source/core/events/TouchEvent.cpp |
| index b4df51359f30b24c0c8c5e6142b2c2a341dee3ec..964f93f94ca577afbc2b09ac7ae805322cb252cd 100644 |
| --- a/third_party/WebKit/Source/core/events/TouchEvent.cpp |
| +++ b/third_party/WebKit/Source/core/events/TouchEvent.cpp |
| @@ -199,7 +199,8 @@ void logTouchTargetHistogram(EventTarget* eventTarget, |
| TouchEvent::TouchEvent() |
| : m_causesScrollingIfUncanceled(false), |
| m_firstTouchMoveOrStart(false), |
| - m_defaultPreventedBeforeCurrentTarget(false) {} |
| + m_defaultPreventedBeforeCurrentTarget(false), |
| + m_currentTouchAction(TouchActionAuto) {} |
| TouchEvent::TouchEvent(TouchList* touches, |
| TouchList* targetTouches, |
| @@ -240,7 +241,8 @@ TouchEvent::TouchEvent(const AtomicString& type, |
| m_changedTouches(TouchList::create(initializer.changedTouches())), |
| m_causesScrollingIfUncanceled(false), |
| m_firstTouchMoveOrStart(false), |
| - m_defaultPreventedBeforeCurrentTarget(false) {} |
| + m_defaultPreventedBeforeCurrentTarget(false), |
| + m_currentTouchAction(TouchActionAuto) {} |
| TouchEvent::~TouchEvent() {} |
| @@ -312,6 +314,10 @@ DEFINE_TRACE(TouchEvent) { |
| UIEventWithKeyState::trace(visitor); |
| } |
| +bool TouchEvent::shouldLogPassiveDevtoolsWarning() const { |
| + return m_currentTouchAction == TouchActionAuto; |
|
Rick Byers
2016/11/22 20:40:33
nit: add a comment explaining why we disable the w
|
| +} |
| + |
| TouchEventDispatchMediator* TouchEventDispatchMediator::create( |
| TouchEvent* touchEvent) { |
| return new TouchEventDispatchMediator(touchEvent); |