From d35a745d8136803f98d1c8b87c45cbe6fe061fa1 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 10 May 2016 08:34:45 +0200 Subject: [PATCH] Backed out changeset 3ae676e82fac (bug 333064) for failing on own test on a CLOSED TREE --- dom/base/nsCopySupport.cpp | 5 +-- dom/base/test/mochitest.ini | 1 - dom/base/test/test_bug333064.html | 59 ------------------------------- 3 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 dom/base/test/test_bug333064.html diff --git a/dom/base/nsCopySupport.cpp b/dom/base/nsCopySupport.cpp index 1533c6b82d6d..9fcc8e093306 100644 --- 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 index 47f4b300c67d..ae080d328d23 100644 --- 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 deleted file mode 100644 index 6e99fed88120..000000000000 --- a/dom/base/test/test_bug333064.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Test for Bug 333064 - - - - - -Mozilla Bug 333064 -

- -
-
-
안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안안
- -
-
- - - - -