Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-09 04:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1599614 - nsAttrValue::Init is not fallible. r=mccr8,bzbarsky

Browse Source 
Depends on D54826

Differential Revision: https://phabricator.services.mozilla.com/D54827

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Emilio Cobos Álvarez 2019-11-27 10:57:24 +00:00
parent 3ee8ea8b52
commit f6b443906e
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/base/nsAttrValue.cpp
View File

@ -171,10 +171,9 @@ nsAttrValue::nsAttrValue(const nsIntMargin& aValue) : mBits(0) {
nsAttrValue::~nsAttrValue() { ResetIfSet(); }
/* static */
nsresult nsAttrValue::Init() {
NS_ASSERTION(!sEnumTableArray, "nsAttrValue already initialized");
void nsAttrValue::Init() {
MOZ_ASSERT(!sEnumTableArray, "nsAttrValue already initialized");
sEnumTableArray = new nsTArray<const EnumTable*>;
return NS_OK;
}
/* static */

2
dom/base/nsAttrValue.h
View File

@ -133,7 +133,7 @@ class nsAttrValue {
inline const nsAttrValue& operator=(const nsAttrValue& aOther);
static nsresult Init();
static void Init();
static void Shutdown();
inline ValueType Type() const;

6
layout/build/nsLayoutStatics.cpp
View File

@ -172,11 +172,7 @@ nsresult nsLayoutStatics::Initialize() {
return rv;
}
rv = nsAttrValue::Init();
if (NS_FAILED(rv)) {
NS_ERROR("Could not initialize nsAttrValue");
return rv;
}
nsAttrValue::Init();
rv = nsTextFragment::Init();
if (NS_FAILED(rv)) {