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/win/WCDataObject.cpp | |
| 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/win/WCDataObject.cpp')
| -rw-r--r-- | Source/WebCore/platform/win/WCDataObject.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Source/WebCore/platform/win/WCDataObject.cpp b/Source/WebCore/platform/win/WCDataObject.cpp index 6b4c859..0c03ce0 100644 --- a/Source/WebCore/platform/win/WCDataObject.cpp +++ b/Source/WebCore/platform/win/WCDataObject.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "WCDataObject.h" +#include "ClipboardUtilitiesWin.h" +#include "DragData.h" #include "PlatformString.h" namespace WebCore { @@ -160,6 +162,17 @@ HRESULT WCDataObject::createInstance(WCDataObject** result) return S_OK; } +HRESULT WCDataObject::createInstance(WCDataObject** result, const DragDataMap& dataMap) +{ + if (!result) + return E_POINTER; + *result = new WCDataObject; + + for (DragDataMap::const_iterator it = dataMap.begin(); it != dataMap.end(); ++it) + setClipboardData(*result, it->first, it->second); + return S_OK; +} + WCDataObject::WCDataObject() : m_ref(1) { @@ -380,5 +393,4 @@ void WCDataObject::clearData(CLIPFORMAT format) } } - } |