[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 12:28:21 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 61d55758d906414701b8db0c4f4ba598de168db1
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 11:16:43 2010 +0000

    Remove wrong code from Qt that's dumping extra markup into the clipboard
    https://bugs.webkit.org/show_bug.cgi?id=44506
    
    Patch by Adam Barth <abarth at webkit.org> on 2010-08-24
    Reviewed by Kenneth Rohde Christiansen.
    
    I have no way of testing this patch, but hopefully it should fix a
    bunch of newly failing tests.  This code seems very confused.
    
    * platform/qt/PasteboardQt.cpp:
    (WebCore::Pasteboard::writeSelection):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65888 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 628cf0c..a7952b4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-24  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Remove wrong code from Qt that's dumping extra markup into the clipboard
+        https://bugs.webkit.org/show_bug.cgi?id=44506
+
+        I have no way of testing this patch, but hopefully it should fix a
+        bunch of newly failing tests.  This code seems very confused.
+
+        * platform/qt/PasteboardQt.cpp:
+        (WebCore::Pasteboard::writeSelection):
+
 2010-08-24  Pavel Podivilov  <podivilov at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/platform/qt/PasteboardQt.cpp b/WebCore/platform/qt/PasteboardQt.cpp
index e1e6d84..fc53124 100644
--- a/WebCore/platform/qt/PasteboardQt.cpp
+++ b/WebCore/platform/qt/PasteboardQt.cpp
@@ -65,10 +65,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete,
     text.replace(QChar(0xa0), QLatin1Char(' '));
     md->setText(text);
 
-    QString html = QLatin1String("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /></head><body>");
-    html += createMarkup(selectedRange, 0, AnnotateForInterchange, false, AbsoluteURLs);
-    html += QLatin1String("</body></html>");
-    md->setHtml(html);
+    md->setHtml(createMarkup(selectedRange, 0, AnnotateForInterchange, false, AbsoluteURLs));
 
 #ifndef QT_NO_CLIPBOARD
     QApplication::clipboard()->setMimeData(md, m_selectionMode ?

-- 
WebKit Debian packaging

