Bug 1447483 and bug 1448850 followup to fix unification-hidden and now-revealed build bustage causing a CLOSED TREE. r=bkelly
authorBoris Zbarsky <bzbarsky@mit.edu>
Tue, 03 Apr 2018 15:38:20 -0400
changeset 776857 abac8caba16196bb9e58b194d27ff2c77894cd96
parent 776856 b8eff76f4ae6d9cc2166fb04b69331de96a5134b
child 776858 8ab320324b9fea099696c4bea8b301baa148199a
push id105022
push userdholbert@mozilla.com
push dateTue, 03 Apr 2018 21:03:05 +0000
reviewersbkelly
bugs1447483, 1448850
milestone61.0a1
Bug 1447483 and bug 1448850 followup to fix unification-hidden and now-revealed build bustage causing a CLOSED TREE. r=bkelly
dom/base/nsXHTMLContentSerializer.cpp
--- a/dom/base/nsXHTMLContentSerializer.cpp
+++ b/dom/base/nsXHTMLContentSerializer.cpp
@@ -28,16 +28,18 @@
 #include "nsCRT.h"
 #include "nsContentUtils.h"
 #include "nsIScriptElement.h"
 #include "nsStubMutationObserver.h"
 #include "nsAttrName.h"
 #include "nsComputedDOMStyle.h"
 #include "mozilla/dom/Element.h"
 
+using namespace mozilla;
+
 static const int32_t kLongLineLen = 128;
 
 #define kXMLNS "xmlns"
 
 nsresult
 NS_NewXHTMLContentSerializer(nsIContentSerializer** aSerializer)
 {
   RefPtr<nsXHTMLContentSerializer> it = new nsXHTMLContentSerializer();
@@ -53,17 +55,17 @@ nsXHTMLContentSerializer::nsXHTMLContent
 nsXHTMLContentSerializer::~nsXHTMLContentSerializer()
 {
   NS_ASSERTION(mOLStateStack.IsEmpty(), "Expected OL State stack to be empty");
 }
 
 NS_IMETHODIMP
 nsXHTMLContentSerializer::Init(uint32_t aFlags,
                                uint32_t aWrapColumn,
-                               const mozilla::Encoding* aEncoding,
+                               const Encoding* aEncoding,
                                bool aIsCopying,
                                bool aRewriteEncodingDeclaration,
                                bool* aNeedsPreformatScanning)
 {
   // The previous version of the HTML serializer did implicit wrapping
   // when there is no flags, so we keep wrapping in order to keep
   // compatibility with the existing calling code
   // XXXLJ perhaps should we remove this default settings later ?
@@ -233,17 +235,17 @@ nsXHTMLContentSerializer::SerializeAttri
   // XXX Unfortunately we need a namespace manager to get
   // attribute URIs.
   for (index = 0; index < count; index++) {
 
     if (aSkipAttr == index) {
         continue;
     }
 
-    mozilla::dom::BorrowedAttrInfo info = aElement->GetAttrInfoAt(index);
+    dom::BorrowedAttrInfo info = aElement->GetAttrInfoAt(index);
     const nsAttrName* name = info.mName;
 
     int32_t namespaceID = name->NamespaceID();
     nsAtom* attrName = name->LocalName();
     nsAtom* attrPrefix = name->GetPrefix();
 
     // Filter out any attribute starting with [-|_]moz
     nsDependentAtomString attrNameStr(attrName);
@@ -436,17 +438,17 @@ nsXHTMLContentSerializer::CheckElementSt
   if (aElement->IsHTMLElement(nsGkAtoms::body)) {
     ++mInBody;
   }
 
   return true;
 }
 
 bool
-nsXHTMLContentSerializer::CheckElementEnd(mozilla::dom::Element* aElement,
+nsXHTMLContentSerializer::CheckElementEnd(dom::Element* aElement,
                                           bool& aForceFormat,
                                           nsAString& aStr)
 {
   NS_ASSERTION(!mIsHTMLSerializer, "nsHTMLContentSerializer shouldn't call this method !");
 
   aForceFormat = !(mFlags & nsIDocumentEncoder::OutputIgnoreMozDirty) &&
                  aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::mozdirty);
 
@@ -467,17 +469,17 @@ bool
 nsXHTMLContentSerializer::AppendAndTranslateEntities(const nsAString& aStr,
                                                      nsAString& aOutputStr)
 {
   if (mBodyOnly && !mInBody) {
     return true;
   }
 
   if (mDisableEntityEncoding) {
-    return aOutputStr.Append(aStr, mozilla::fallible);
+    return aOutputStr.Append(aStr, fallible);
   }
 
   return nsXMLContentSerializer::AppendAndTranslateEntities(aStr, aOutputStr);
 }
 
 bool
 nsXHTMLContentSerializer::IsShorthandAttr(const nsAtom* aAttrName,
                                           const nsAtom* aElementName)