From e80833b76d326beda59e1518bc3baed94767115f Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Tue, 22 Oct 2013 16:45:36 -0400
Subject: [PATCH] Backed out changeset 42b04948eedd (bug 927262) under
 suspicion of breaking mochitest-metro on a CLOSED TREE

---
 content/base/src/Element.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/content/base/src/Element.cpp b/content/base/src/Element.cpp
index 3084b0470c90..9239223a27fc 100644
--- a/content/base/src/Element.cpp
+++ b/content/base/src/Element.cpp
@@ -3119,7 +3119,6 @@ Element::GetMarkup(bool aIncludeSelf, nsAString& aMarkup)
 
   nsAutoString contentType;
   doc->GetContentType(contentType);
-  bool tryToCacheEncoder = !aIncludeSelf;
 
   nsCOMPtr<nsIDocumentEncoder> docEncoder = doc->GetCachedEncoder();
   if (!docEncoder) {
@@ -3134,9 +3133,6 @@ Element::GetMarkup(bool aIncludeSelf, nsAString& aMarkup)
     // again as XML
     contentType.AssignLiteral("application/xml");
     docEncoder = do_CreateInstance(NS_DOC_ENCODER_CONTRACTID_BASE "application/xml");
-    // Don't try to cache the encoder since it would point to a different
-    // contentType once it has been reinitialized.
-    tryToCacheEncoder = false;
   }
 
   NS_ENSURE_TRUE_VOID(docEncoder);
@@ -3167,7 +3163,7 @@ Element::GetMarkup(bool aIncludeSelf, nsAString& aMarkup)
   }
   rv = docEncoder->EncodeToString(aMarkup);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
-  if (tryToCacheEncoder) {
+  if (!aIncludeSelf) {
     doc->SetCachedEncoder(docEncoder.forget());
   }
 }