Backed out changeset fd4f20070ed2 (Bug 1385636) for causing test failures. a=backout DONTBUILD
authorJorg K <jorgk@jorgk.com>
Sun, 30 Jul 2017 23:34:50 +0200
changeset 28523 d72296afe377924325621557c9cf1d765957e5d6
parent 28522 19ffaeb8c4a027aae028f0dfafc160ed7a3b3c93
child 28524 8530044d4d8cd0ca8344d7b7512f63a5197c77b0
push id1986
push userclokep@gmail.com
push dateWed, 02 Aug 2017 14:43:31 +0000
treeherdercomm-beta@b51c9adf2c9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1385636
backs outfd4f20070ed23e0eb3e29dd4243b61b4ea2b520b
Backed out changeset fd4f20070ed2 (Bug 1385636) for causing test failures. a=backout DONTBUILD
mailnews/compose/src/nsMsgCompose.cpp
--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -5452,21 +5452,20 @@ nsresult nsMsgCompose::TagConvertible(ns
     // this also preserves any links with titles.
     if (NS_SUCCEEDED(node->GetAttribute(NS_LITERAL_STRING("title"), attribValue)) &&
         !attribValue.IsEmpty())
     {
       *_retval = nsIMsgCompConvertible::No;
       return NS_OK;
     }
 
-    if      ( // Considered convertible to plaintext: Some "simple" elements
-              // without non-convertible attributes like style, class, id,
-              // or align (see above).
+    if      ( // some "simple" elements without "style" attribute
               element.LowerCaseEqualsLiteral("br") ||
               element.LowerCaseEqualsLiteral("p") ||
+              element.LowerCaseEqualsLiteral("pre") ||
               element.LowerCaseEqualsLiteral("tt") ||
               element.LowerCaseEqualsLiteral("html") ||
               element.LowerCaseEqualsLiteral("head") ||
               element.LowerCaseEqualsLiteral("meta") ||
               element.LowerCaseEqualsLiteral("title")
             )
     {
       *_retval = nsIMsgCompConvertible::Plain;
@@ -5487,17 +5486,16 @@ nsresult nsMsgCompose::TagConvertible(ns
               //element.LowerCaseEqualsLiteral("a") || // see below
               element.LowerCaseEqualsLiteral("h1") ||
               element.LowerCaseEqualsLiteral("h2") ||
               element.LowerCaseEqualsLiteral("h3") ||
               element.LowerCaseEqualsLiteral("h4") ||
               element.LowerCaseEqualsLiteral("h5") ||
               element.LowerCaseEqualsLiteral("h6") ||
               element.LowerCaseEqualsLiteral("hr") ||
-              element.LowerCaseEqualsLiteral("pre") ||
               (
                 mConvertStructs
                 &&
                 (
                   element.LowerCaseEqualsLiteral("em") ||
                   element.LowerCaseEqualsLiteral("strong") ||
                   element.LowerCaseEqualsLiteral("code") ||
                   element.LowerCaseEqualsLiteral("b") ||