| Index: third_party/WebKit/Source/core/input/EventHandler.cpp
|
| diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp
|
| index ff2da3c7ddce57cf5d8692c008262b125df98929..e272da4915f85f792b7cf345c0d443685e0004ad 100644
|
| --- a/third_party/WebKit/Source/core/input/EventHandler.cpp
|
| +++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
|
| @@ -90,6 +90,7 @@
|
| #include "platform/TraceEvent.h"
|
| #include "platform/WindowsKeyboardCodes.h"
|
| #include "platform/geometry/FloatPoint.h"
|
| +#include "platform/graphics/GraphicsScreen.h"
|
| #include "platform/graphics/Image.h"
|
| #include "platform/heap/Handle.h"
|
| #include "platform/scroll/ScrollAnimatorBase.h"
|
| @@ -3390,12 +3391,16 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, DragIni
|
| // Once we're past the hysteresis point, we don't want to treat this gesture as a click
|
| invalidateClick();
|
|
|
| + int64_t previousId = setCurrentScreenId(reinterpret_cast<int64_t>(m_frame->page()));
|
| +
|
| if (!tryStartDrag(event)) {
|
| // Something failed to start the drag, clean up.
|
| clearDragDataTransfer();
|
| dragState().m_dragSrc = nullptr;
|
| }
|
|
|
| + setCurrentScreenId(previousId);
|
| +
|
| m_mouseDownMayStartDrag = false;
|
| // Whether or not the drag actually started, no more default handling (like selection).
|
| return true;
|
|
|