| Index: third_party/WebKit/Source/core/input/ScrollManager.cpp
|
| diff --git a/third_party/WebKit/Source/core/input/ScrollManager.cpp b/third_party/WebKit/Source/core/input/ScrollManager.cpp
|
| index 33e6f466a55117bd01b7eccd00d9d9514b221e3b..4316a55a88fdd6c83df17fc73e645499553f0f70 100644
|
| --- a/third_party/WebKit/Source/core/input/ScrollManager.cpp
|
| +++ b/third_party/WebKit/Source/core/input/ScrollManager.cpp
|
| @@ -11,6 +11,7 @@
|
| #include "core/frame/TopControls.h"
|
| #include "core/html/HTMLFrameOwnerElement.h"
|
| #include "core/input/EventHandler.h"
|
| +#include "core/input/EventHandlingUtil.h"
|
| #include "core/layout/LayoutPart.h"
|
| #include "core/loader/DocumentLoader.h"
|
| #include "core/page/AutoscrollController.h"
|
| @@ -32,10 +33,6 @@ ScrollManager::ScrollManager(LocalFrame* frame)
|
| clear();
|
| }
|
|
|
| -ScrollManager::~ScrollManager()
|
| -{
|
| -}
|
| -
|
| void ScrollManager::clear()
|
| {
|
| m_lastGestureScrollOverWidget = false;
|
| @@ -404,7 +401,7 @@ WebInputEventResult ScrollManager::handleGestureScrollEvent(const PlatformGestur
|
| DispatchEventResult gestureDomEventResult = eventTarget->dispatchEvent(gestureDomEvent);
|
| if (gestureDomEventResult != DispatchEventResult::NotCanceled) {
|
| DCHECK(gestureDomEventResult != DispatchEventResult::CanceledByEventHandler);
|
| - return EventHandler::toWebInputEventResult(gestureDomEventResult);
|
| + return EventHandlingUtil::toWebInputEventResult(gestureDomEventResult);
|
| }
|
| }
|
| }
|
|
|