diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/platform/DragData.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/platform/DragData.h')
| -rw-r--r-- | Source/WebCore/platform/DragData.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h index 42d0d3a..b89748e 100644 --- a/Source/WebCore/platform/DragData.h +++ b/Source/WebCore/platform/DragData.h @@ -31,6 +31,7 @@ #include "IntPoint.h" #include <wtf/Forward.h> +#include <wtf/HashMap.h> #include <wtf/Vector.h> #if PLATFORM(MAC) @@ -51,6 +52,7 @@ QT_END_NAMESPACE typedef const QMimeData* DragDataRef; #elif PLATFORM(WIN) typedef struct IDataObject* DragDataRef; +#include <wtf/text/WTFString.h> #elif PLATFORM(WX) typedef class wxDataObject* DragDataRef; #elif PLATFORM(GTK) @@ -84,7 +86,11 @@ enum DragApplicationFlags { DragApplicationHasAttachedSheet = 4, DragApplicationIsCopyKeyDown = 8 }; - + +#if PLATFORM(WIN) +typedef HashMap<UINT, Vector<String> > DragDataMap; +#endif + class DragData { public: enum FilenameConversionPolicy { DoNotConvertFilenames, ConvertFilenames }; @@ -92,7 +98,10 @@ public: // clientPosition is taken to be the position of the drag event within the target window, with (0,0) at the top left DragData(DragDataRef, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation, DragApplicationFlags = DragApplicationNone); DragData(const String& dragStorageName, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation, DragApplicationFlags = DragApplicationNone); - +#if PLATFORM(WIN) + DragData(const DragDataMap&, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags = DragApplicationNone); + const DragDataMap& dragDataMap(); +#endif const IntPoint& clientPosition() const { return m_clientPosition; } const IntPoint& globalPosition() const { return m_globalPosition; } DragApplicationFlags flags() { return m_applicationFlags; } @@ -119,6 +128,9 @@ private: #if PLATFORM(MAC) RetainPtr<NSPasteboard> m_pasteboard; #endif +#if PLATFORM(WIN) + DragDataMap m_dragDataMap; +#endif }; } |