Changeset 61968 in webkit

Timestamp:

Jun 27, 2010 7:14:28 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-27 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

editing/execCommand/copy-without-selection.html fails on Qt after r61637
​https://bugs.webkit.org/show_bug.cgi?id=41025

Unskip editing/execCommand/copy-without-selection.html for Qt.

• platform/qt/Skipped:

2010-06-27 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

editing/execCommand/copy-without-selection.html fails on Qt after r61637
​https://bugs.webkit.org/show_bug.cgi?id=41025

The problem was that when getting data back via Clipboard::getData(),
the String::String(const char*, int) constructor was called
with UTF-16 data.

The solution is to use QMimeData's text() and setText() for "text/plain".

setText() which makes sure Qt passes the string in proper format to the
system clipboard. (The previous implementation would convert it to UTF-8)

text() makes sure that the correct encoding is used (UTF-16) and that
we get back whatever we originally put in there.

• platform/qt/ClipboardQt.cpp: (WebCore::isTextMimeType): (WebCore::ClipboardQt::getData): (WebCore::ClipboardQt::setData):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/ClipboardQt.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-27  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        editing/execCommand/copy-without-selection.html fails on Qt after r61637
+        https://bugs.webkit.org/show_bug.cgi?id=41025
+
+        Unskip editing/execCommand/copy-without-selection.html for Qt.
+
+        * platform/qt/Skipped:
+
 2010-06-27  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5438 +5438 @@
 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T9.html
 
-# Clipboard::setData is broken on Qt
-# https://bugs.webkit.org/show_bug.cgi?id=41025
-editing/execCommand/copy-without-selection.html
-
 # [Qt] Regression(r61749): inspector/debugger-pause-on-debugger-statement.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=41147

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-27  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        editing/execCommand/copy-without-selection.html fails on Qt after r61637
+        https://bugs.webkit.org/show_bug.cgi?id=41025
+
+        The problem was that when getting data back via Clipboard::getData(),
+        the String::String(const char*, int) constructor was called
+        with UTF-16 data.
+
+        The solution is to use QMimeData's text() and setText() for "text/plain".
+
+        setText() which makes sure Qt passes the string in proper format to the
+        system clipboard. (The previous implementation would convert it to UTF-8)
+
+        text() makes sure that the correct encoding is used (UTF-16) and that
+        we get back whatever we originally put in there.
+
+        * platform/qt/ClipboardQt.cpp:
+        (WebCore::isTextMimeType):
+        (WebCore::ClipboardQt::getData):
+        (WebCore::ClipboardQt::setData):
+
 2010-06-27  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/platform/qt/ClipboardQt.cpp

@@ -58 +58 @@
 namespace WebCore {
 
+static bool isTextMimeType(const String& type)
+{
+    return type == "text/plain" || type.startsWith("text/plain;");
+}
+
 ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, const QMimeData* readableClipboard)
     : Clipboard(policy, true)
@@ -131 +136 @@
     }
 
+    if (isTextMimeType(type) && m_readableData->hasText()) {
+        success = true;
+        return m_readableData->text();
+    }
+
     ASSERT(m_readableData);
     QByteArray data = m_readableData->data(QString(type));
     success = !data.isEmpty();
-    return String(data.data(), data.size());
+    return String(data.constData(), data.size());
 }
 
@@ -144 +154 @@
     if (!m_writableData)
         m_writableData = new QMimeData;
-    QByteArray array(reinterpret_cast<const char*>(data.characters()),
-                     data.length()*2);
-    m_writableData->setData(QString(type), array);
+
+    if (isTextMimeType(type))
+        m_writableData->setText(QString(data));
+    else {
+        QByteArray array(reinterpret_cast<const char*>(data.characters()), data.length() * 2);
+        m_writableData->setData(QString(type), array);
+    }
+
 #ifndef QT_NO_CLIPBOARD
     if (!isForDragging())