Backed out changeset 3ae676e82fac (bug 333064) for failing on own tes…

…t on a CLOSED TREE
iaxat · May 10, 2016 · 9213715 · 9213715
1 parent 199b08e
commit 9213715
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 64 deletions.
diff --git a/dom/base/nsCopySupport.cpp b/dom/base/nsCopySupport.cpp
@@ -171,11 +171,8 @@ SelectionCopyHelper(nsISelection *aSel, nsIDocument *aDoc,
   nsAutoString htmlInfoBuf;
   if (encodedTextHTML) {
     // Redo the encoding, but this time use the passed-in flags.
-    // Don't allow wrapping of CJK strings.
     mimeType.AssignLiteral(kHTMLMime);
-    rv = docEncoder->Init(domDoc, mimeType,
-                          aFlags |
-                          nsIDocumentEncoder::OutputDisallowLineBreaking);
+    rv = docEncoder->Init(domDoc, mimeType, aFlags);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = docEncoder->SetSelection(aSel);

diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
@@ -333,7 +333,6 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(clipboard undefined) b
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug330925.xhtml]
 [test_bug331959.html]
-[test_bug333064.html]
 [test_bug333198.html]
 [test_bug333673.html]
 [test_bug337631.html]

diff --git a/dom/base/test/test_bug333064.html b/dom/base/test/test_bug333064.html