Title: [87897] trunk/Source/WebCore
Revision
87897
Author
[email protected]
Date
2011-06-02 05:10:48 -0700 (Thu, 02 Jun 2011)

Log Message

2011-06-02  Aparna Nandyal  <[email protected]>

        Reviewed by Andreas Kling.

        [Qt] Multiple drop events when doing DnD of images.
        https://bugs.webkit.org/show_bug.cgi?id=61504

        Duplicate entries of the url were getting added into drag data
        which is removed. The duplicate entries were causing the same image
        url to be copied twice. The code changes now match other webkit ports.

        * platform/qt/ClipboardQt.cpp:
        (WebCore::ClipboardQt::declareAndWriteDragImage):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (87896 => 87897)


--- trunk/Source/WebCore/ChangeLog	2011-06-02 12:00:55 UTC (rev 87896)
+++ trunk/Source/WebCore/ChangeLog	2011-06-02 12:10:48 UTC (rev 87897)
@@ -1,3 +1,17 @@
+2011-06-02  Aparna Nandyal  <[email protected]>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Multiple drop events when doing DnD of images.
+        https://bugs.webkit.org/show_bug.cgi?id=61504
+
+        Duplicate entries of the url were getting added into drag data
+        which is removed. The duplicate entries were causing the same image
+        url to be copied twice. The code changes now match other webkit ports.
+
+        * platform/qt/ClipboardQt.cpp:
+        (WebCore::ClipboardQt::declareAndWriteDragImage):
+
 2011-06-02  Naiem Shaik  <[email protected]>
 
         Reviewed by Kent Tamura.

Modified: trunk/Source/WebCore/platform/qt/ClipboardQt.cpp (87896 => 87897)


--- trunk/Source/WebCore/platform/qt/ClipboardQt.cpp	2011-06-02 12:00:55 UTC (rev 87896)
+++ trunk/Source/WebCore/platform/qt/ClipboardQt.cpp	2011-06-02 12:10:48 UTC (rev 87897)
@@ -298,11 +298,10 @@
 
     QList<QUrl> urls;
     urls.append(url);
-    urls.append(fullURL);
 
     m_writableData->setText(title);
     m_writableData->setUrls(urls);
-    m_writableData->setHtml(createMarkup(element, IncludeNode, 0, AbsoluteURLs));
+    m_writableData->setHtml(imageToMarkup(fullURL, element));
 #ifndef QT_NO_CLIPBOARD
     if (isForCopyAndPaste())
         QApplication::clipboard()->setMimeData(m_writableData);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to