Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1447483 and bug 1448850 followup to fix unification-hidden and now-revealed build bustage causing a CLOSED TREE. r=bkelly

Browse Source
This commit is contained in:
Boris Zbarsky 2018-04-03 15:38:20 -04:00
parent 5e6f3328ec
commit fcba7ea91b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/base/nsXHTMLContentSerializer.cpp
View File

@ -33,6 +33,8 @@
#include "nsComputedDOMStyle.h"
#include "mozilla/dom/Element.h"
using namespace mozilla;
static const int32_t kLongLineLen = 128;
#define kXMLNS "xmlns"
@ -58,7 +60,7 @@ nsXHTMLContentSerializer::~nsXHTMLContentSerializer()
NS_IMETHODIMP
nsXHTMLContentSerializer::Init(uint32_t aFlags,
uint32_t aWrapColumn,
const mozilla::Encoding* aEncoding,
const Encoding* aEncoding,
bool aIsCopying,
bool aRewriteEncodingDeclaration,
bool* aNeedsPreformatScanning)
@ -238,7 +240,7 @@ nsXHTMLContentSerializer::SerializeAttributes(Element* aElement,
continue;
}
mozilla::dom::BorrowedAttrInfo info = aElement->GetAttrInfoAt(index);
dom::BorrowedAttrInfo info = aElement->GetAttrInfoAt(index);
const nsAttrName* name = info.mName;
int32_t namespaceID = name->NamespaceID();
@ -441,7 +443,7 @@ nsXHTMLContentSerializer::CheckElementStart(Element* aElement,
}
bool
nsXHTMLContentSerializer::CheckElementEnd(mozilla::dom::Element* aElement,
nsXHTMLContentSerializer::CheckElementEnd(dom::Element* aElement,
bool& aForceFormat,
nsAString& aStr)
{
@ -472,7 +474,7 @@ nsXHTMLContentSerializer::AppendAndTranslateEntities(const nsAString& aStr,
}
if (mDisableEntityEncoding) {
return aOutputStr.Append(aStr, mozilla::fallible);
return aOutputStr.Append(aStr, fallible);
}
return nsXMLContentSerializer::AppendAndTranslateEntities(aStr, aOutputStr);