From b922991e98484da9a9771214d6b83da061fe6bbc Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Tue, 13 Sep 2011 00:49:59 +0100
Subject: [PATCH] Backout changeset b8d354d37128 (bug 574005) for Linux M3
 orange; a=bbondy

---
 editor/libeditor/html/tests/test_CF_HTML_clipboard.html | 9 ++++++++-
 widget/src/xpwidgets/nsPrimitiveHelpers.cpp             | 9 ---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/editor/libeditor/html/tests/test_CF_HTML_clipboard.html b/editor/libeditor/html/tests/test_CF_HTML_clipboard.html
index 8f48c4b7468a..4c40d88a8570 100644
--- a/editor/libeditor/html/tests/test_CF_HTML_clipboard.html
+++ b/editor/libeditor/html/tests/test_CF_HTML_clipboard.html
@@ -136,7 +136,14 @@
   }, SimpleTest.finish);
 }
 
-SimpleTest.waitForFocus(runTest);
+var isMac = ("nsILocalFileMac" in Components.interfaces);
+if (isMac)
+  SimpleTest.waitForFocus(runTest);
+else {
+  // This test is not yet supported on non-Mac platforms, see bug 574005.
+  todo(false, "Test not supported on this platform");
+  SimpleTest.finish();
+}
 
 </script>
 </pre>
diff --git a/widget/src/xpwidgets/nsPrimitiveHelpers.cpp b/widget/src/xpwidgets/nsPrimitiveHelpers.cpp
index 455235523997..09b9ae66fdf8 100644
--- a/widget/src/xpwidgets/nsPrimitiveHelpers.cpp
+++ b/widget/src/xpwidgets/nsPrimitiveHelpers.cpp
@@ -143,15 +143,6 @@ nsPrimitiveHelpers :: CreateDataFromPrimitive ( const char* aFlavor, nsISupports
       plainText->GetData ( data );
       *aDataBuff = ToNewCString(data);
     }
-  // CF_HTML only supports single byte.
-  // Reference: http://msdn.microsoft.com/en-us/library/aa767917(v=vs.85).aspx
-  } else if ( strcmp(aFlavor,kNativeHTMLMime) == 0 ) {
-    nsCOMPtr<nsISupportsCString> plainText ( do_QueryInterface(aPrimitive) );
-    if ( plainText ) {
-      nsCAutoString data;
-      plainText->GetData ( data );
-      *aDataBuff = ToNewUnicode(data);
-    }
   }
   else {
     nsCOMPtr<nsISupportsString> doubleByteText ( do_QueryInterface(aPrimitive) );