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

Unified Diff: Source/core/events/MouseEvent.h

Issue 1232003009: Implement DragEvent and move MouseEvent.dataTransfer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix plugin failure of LayoutTest Created 5 years, 4 months 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
« no previous file with comments | « Source/core/events/DragEventInit.idl ('k') | Source/core/events/MouseEvent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/events/MouseEvent.h
diff --git a/Source/core/events/MouseEvent.h b/Source/core/events/MouseEvent.h
index d2f6fd2b7a80e10229d34e9c5b8ade876d9f9db0..92ec0db41ca451bc79c6e1ad42c2e86e12bac431 100644
--- a/Source/core/events/MouseEvent.h
+++ b/Source/core/events/MouseEvent.h
@@ -31,7 +31,6 @@
#include "platform/PlatformMouseEvent.h"
namespace blink {
-
class DataTransfer;
class EventDispatcher;
@@ -47,7 +46,7 @@ public:
int detail, int screenX, int screenY, int windowX, int windowY,
int movementX, int movementY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, short button, unsigned short buttons,
- PassRefPtrWillBeRawPtr<EventTarget> relatedTarget, DataTransfer*,
+ PassRefPtrWillBeRawPtr<EventTarget> relatedTarget,
bool isSimulated = false, PlatformMouseEvent::SyntheticEventType = PlatformMouseEvent::RealOrIndistinguishable,
double uiCreateTime = 0);
@@ -82,14 +81,13 @@ public:
Node* toElement() const;
Node* fromElement() const;
- DataTransfer* dataTransfer() const { return isDragEvent() ? m_dataTransfer.get() : 0; }
+ virtual DataTransfer* dataTransfer() const { return 0; }
bool fromTouch() const { return m_syntheticEventType == PlatformMouseEvent::FromTouch; }
const AtomicString& interfaceName() const override;
bool isMouseEvent() const override;
- bool isDragEvent() const final;
int which() const final;
PassRefPtrWillBeRawPtr<EventDispatchMediator> createMediator() override;
@@ -101,7 +99,7 @@ protected:
int detail, int screenX, int screenY, int windowX, int windowY,
int movementX, int movementY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, short button, unsigned short buttons,
- PassRefPtrWillBeRawPtr<EventTarget> relatedTarget, DataTransfer*,
+ PassRefPtrWillBeRawPtr<EventTarget> relatedTarget,
bool isSimulated, PlatformMouseEvent::SyntheticEventType, double uiCreateTime = 0);
MouseEvent(const AtomicString& type, const MouseEventInit&);
@@ -112,7 +110,6 @@ private:
short m_button;
unsigned short m_buttons;
RefPtrWillBeMember<EventTarget> m_relatedTarget;
- PersistentWillBeMember<DataTransfer> m_dataTransfer;
PlatformMouseEvent::SyntheticEventType m_syntheticEventType;
};
« no previous file with comments | « Source/core/events/DragEventInit.idl ('k') | Source/core/events/MouseEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698