summaryrefslogtreecommitdiffstats
path: root/src/core/web_contents_adapter_p.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2017-01-17 15:54:10 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2017-01-26 11:04:47 +0000
commit1c80328cd83377a771f725b80967b5b44ba19cf7 (patch)
tree327e7823ca4a91a10afdfe47d68ab7b798a29a82 /src/core/web_contents_adapter_p.h
parent4501b9d88662e590e14dd932a43de9055cde012c (diff)
Fix canceling drag and drop actions
RenderViewHost::DragSourceEndedAt must be called after dropping and after canceling a drag. Otherwise scripts running on the web page do not get properly notified. Task-number: QTBUG-58037 Change-Id: Ia245131c59f03f3331158bea6cc2f53bce50f989 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/web_contents_adapter_p.h')
-rw-r--r--src/core/web_contents_adapter_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h
index 2d8490c7b..9503b4401 100644
--- a/src/core/web_contents_adapter_p.h
+++ b/src/core/web_contents_adapter_p.h
@@ -55,6 +55,7 @@
#include <base/callback.h>
#include "base/memory/ref_counted.h"
+#include <ui/gfx/geometry/point.h>
#include <third_party/WebKit/public/platform/WebDragOperation.h>
#include <QScopedPointer>
@@ -96,6 +97,8 @@ public:
std::unique_ptr<content::DropData> currentDropData;
blink::WebDragOperation currentDropAction;
bool inDragUpdateLoop;
+ gfx::Point lastDragClientPos;
+ gfx::Point lastDragScreenPos;
base::Closure dragUpdateLoopQuitClosure;
QScopedPointer<QTimer> updateDragCursorMessagePollingTimer;
};