Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 1331533002: [poc] curve-filter Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Draw layered images with a recording GraphicContext Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698