Backout changeset b8d354d37128 (bug 574005) for Linux M3 orange; a=bb…

…ondy
mozilla-spidermonkey · Sep 12, 2011 · b922991 · b922991
1 parent a124c96
commit b922991
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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) );