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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit df98fcfc1ea471876d154709eb44a1f7a21569e5
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 10 19:48:58 2010 +0000

    2010-10-10  Daniel Cheng  <dcheng at chromium.org>
    
            Reviewed by Adam Barth.
    
            [chromium] Clipboard no longer accepts 'text' as a synonym for 'text/plain'
            https://bugs.webkit.org/show_bug.cgi?id=47419
    
            This was a regression introduced in r68807. Updated the layout test to
            check for this case.
    
            * editing/pasteboard/dataTransfer-setData-getData-expected.txt:
            * editing/pasteboard/script-tests/dataTransfer-setData-getData.js:
            (runTest):
    2010-10-10  Daniel Cheng  <dcheng at chromium.org>
    
            Reviewed by Adam Barth.
    
            [chromium] Clipboard no longer accepts 'text' as a synonym for 'text/plain'
            https://bugs.webkit.org/show_bug.cgi?id=47419
    
            This was a regression introduced in r68807. mimeTypeText had the incorrect
            value.
    
            Test: editing/pasteboard/dataTransfer-setData-getData.html
    
            * platform/chromium/ClipboardMimeTypes.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69470 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5364754..b692ff6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-10  Daniel Cheng  <dcheng at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [chromium] Clipboard no longer accepts 'text' as a synonym for 'text/plain'
+        https://bugs.webkit.org/show_bug.cgi?id=47419
+
+        This was a regression introduced in r68807. Updated the layout test to
+        check for this case.
+
+        * editing/pasteboard/dataTransfer-setData-getData-expected.txt:
+        * editing/pasteboard/script-tests/dataTransfer-setData-getData.js:
+        (runTest):
+
 2010-10-10  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/editing/pasteboard/dataTransfer-setData-getData-expected.txt b/LayoutTests/editing/pasteboard/dataTransfer-setData-getData-expected.txt
index 9e58298..1672166 100644
--- a/LayoutTests/editing/pasteboard/dataTransfer-setData-getData-expected.txt
+++ b/LayoutTests/editing/pasteboard/dataTransfer-setData-getData-expected.txt
@@ -36,6 +36,15 @@ FAIL getDataResult should be  (of type string). Was undefined (of type undefined
 --- Test set/get 'text/plain':
 PASS getDataResultType is "string"
 PASS getDataResult is "Lorem ipsum dolor sit amet."
+--- Test set 'text/plain', get 'text':
+PASS getDataResultType is "string"
+PASS getDataResult is "Lorem ipsum dolor sit amet."
+--- Test set 'text', get 'text/plain':
+PASS getDataResultType is "string"
+PASS getDataResult is "Lorem ipsum dolor sit amet."
+--- Test set/get 'text':
+PASS getDataResultType is "string"
+PASS getDataResult is "Lorem ipsum dolor sit amet."
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/editing/pasteboard/script-tests/dataTransfer-setData-getData.js b/LayoutTests/editing/pasteboard/script-tests/dataTransfer-setData-getData.js
index 8d23251..ac7eaec 100644
--- a/LayoutTests/editing/pasteboard/script-tests/dataTransfer-setData-getData.js
+++ b/LayoutTests/editing/pasteboard/script-tests/dataTransfer-setData-getData.js
@@ -117,6 +117,18 @@ function runTest()
     debug("--- Test set/get 'text/plain':");
     test("text/plain", "Lorem ipsum dolor sit amet.", 
          "text/plain", "Lorem ipsum dolor sit amet.");
+
+    debug("--- Test set 'text/plain', get 'text':");
+    test("text/plain", "Lorem ipsum dolor sit amet.",
+         "text", "Lorem ipsum dolor sit amet.");
+
+    debug("--- Test set 'text', get 'text/plain':");
+    test("text", "Lorem ipsum dolor sit amet.",
+         "text/plain", "Lorem ipsum dolor sit amet.");
+
+    debug("--- Test set/get 'text':");
+    test("text", "Lorem ipsum dolor sit amet.",
+         "text", "Lorem ipsum dolor sit amet.");
 }
 
 if (window.eventSender) {
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9b372fb..b82358a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-10  Daniel Cheng  <dcheng at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [chromium] Clipboard no longer accepts 'text' as a synonym for 'text/plain'
+        https://bugs.webkit.org/show_bug.cgi?id=47419
+
+        This was a regression introduced in r68807. mimeTypeText had the incorrect
+        value.
+
+        Test: editing/pasteboard/dataTransfer-setData-getData.html
+
+        * platform/chromium/ClipboardMimeTypes.cpp:
+
 2010-10-09  Eric Uhrhane  <ericu at chromium.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/chromium/ClipboardMimeTypes.cpp b/WebCore/platform/chromium/ClipboardMimeTypes.cpp
index a213da0..f689e0e 100644
--- a/WebCore/platform/chromium/ClipboardMimeTypes.cpp
+++ b/WebCore/platform/chromium/ClipboardMimeTypes.cpp
@@ -33,7 +33,7 @@
 
 namespace WebCore {
 
-const char mimeTypeText[] = "text/plain";
+const char mimeTypeText[] = "text";
 const char mimeTypeTextPlain[] = "text/plain";
 const char mimeTypeTextPlainEtc[] = "text/plain;";
 const char mimeTypeTextHTML[] = "text/html";

-- 
WebKit Debian packaging