Support smart copy and paste during drag and drop

Reviewed by Alice

In order for the drag and drop tests in Windows DRT to pass
we need to support smart cut and paste operations during
drag and drop on windows.

There is no layout test as drag and drop is still unsupported
on windows.  Once supported smart drag/drop is tested by existing
tests

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bfd8b3c..0e9eb98 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,26 @@
 2008-01-17  Oliver Hunt  <oliver@apple.com>
 
+        Support smart copy and paste during drag and drop
+        
+        Reviewed by Alice
+        
+        In order for the drag and drop tests in Windows DRT to pass
+        we need to support smart cut and paste operations during
+        drag and drop on windows.
+        
+        There is no layout test as drag and drop is still unsupported
+        on windows.  Once supported smart drag/drop is tested by existing
+        tests
+
+        * platform/win/ClipboardUtilitiesWin.cpp:
+        (WebCore::smartPasteFormat):
+        * platform/win/ClipboardUtilitiesWin.h:
+        * platform/win/ClipboardWin.cpp:
+        (WebCore::ClipboardWin::writeRange):
+        * platform/win/DragDataWin.cpp:
+
+2008-01-17  Oliver Hunt  <oliver@apple.com>
+
         Reviewed by Anders.
 
         <rdar://problem/5692940> Crash when attempting to get text properties in

diff --git a/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/WebCore/platform/win/ClipboardUtilitiesWin.cpp
index fd4180e..066e235 100644 (file)
--- a/WebCore/platform/win/ClipboardUtilitiesWin.cpp
+++ b/WebCore/platform/win/ClipboardUtilitiesWin.cpp
@@ -265,6 +265,13 @@ FORMATETC* htmlFormat()
     return &htmlFormat;
 }
 
+FORMATETC* smartPasteFormat()
+{
+    static UINT cf = RegisterClipboardFormat(L"WebKit Smart Paste Format");
+    static FORMATETC htmlFormat = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
+    return &htmlFormat;
+}
+
 static bool urlFromPath(CFStringRef path, String& url)
 {
     if (!path)

diff --git a/WebCore/platform/win/ClipboardUtilitiesWin.h b/WebCore/platform/win/ClipboardUtilitiesWin.h
index 095ca40..49898ea 100644 (file)
--- a/WebCore/platform/win/ClipboardUtilitiesWin.h
+++ b/WebCore/platform/win/ClipboardUtilitiesWin.h
@@ -49,6 +49,7 @@ FORMATETC* filenameWFormat();
 FORMATETC* filenameFormat();
 FORMATETC* htmlFormat();
 FORMATETC* cfHDropFormat();
+FORMATETC* smartPasteFormat();
 
 DeprecatedCString markupToCF_HTML(const String& markup, const String& srcURL);
 String urlToMarkup(const KURL& url, const String& title);

diff --git a/WebCore/platform/win/ClipboardWin.cpp b/WebCore/platform/win/ClipboardWin.cpp
index 197dcf6..fbbbedb 100644 (file)
--- a/WebCore/platform/win/ClipboardWin.cpp
+++ b/WebCore/platform/win/ClipboardWin.cpp
@@ -33,6 +33,7 @@
 #include "DeprecatedString.h"
 #include "Document.h"
 #include "DragData.h"
+#include "Editor.h"
 #include "Element.h"
 #include "EventHandler.h"
 #include "Frame.h"
@@ -728,6 +729,10 @@ void ClipboardWin::writeRange(Range* selectedRange, Frame* frame)
     medium.hGlobal = createGlobalData(str);
     if (medium.hGlobal && FAILED(m_writableDataObject->SetData(plainTextWFormat(), &medium, TRUE)))
         ::GlobalFree(medium.hGlobal);
+
+    medium.hGlobal = 0;
+    if (frame->editor()->canSmartCopyOrDelete())
+        m_writableDataObject->SetData(smartPasteFormat(), &medium, TRUE);
 }
 
 bool ClipboardWin::hasData()

diff --git a/WebCore/platform/win/DragDataWin.cpp b/WebCore/platform/win/DragDataWin.cpp
index fe11942..26f72d6 100644 (file)
--- a/WebCore/platform/win/DragDataWin.cpp
+++ b/WebCore/platform/win/DragDataWin.cpp
@@ -108,7 +108,7 @@ bool DragData::containsColor() const
 
 bool DragData::canSmartReplace() const
 {
-    return false; 
+    return SUCCEEDED(m_platformDragData->QueryGetData(smartPasteFormat())); 
 }
 
 bool DragData::containsCompatibleContent() const