corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1525145, remove harmless assertions by using IgnoredErrorResult, r=peterv

Browse Source
This commit is contained in:
Olli Pettay
2019-02-13 22:51:10 +02:00
parent 3abafa7f81
commit 01d0ffd97e
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dom/html/HTMLTableElement.cpp
View File

@@ -589,11 +589,10 @@ already_AddRefed<nsGenericHTMLElement> HTMLTableElement::CreateTHead() {
} }
void HTMLTableElement::DeleteTHead() { void HTMLTableElement::DeleteTHead() {
HTMLTableSectionElement* tHead = GetTHead(); RefPtr<HTMLTableSectionElement> tHead = GetTHead();
if (tHead) { if (tHead) {
mozilla::ErrorResult rv; mozilla::IgnoredErrorResult rv;
nsINode::RemoveChild(*tHead, rv); nsINode::RemoveChild(*tHead, rv);
MOZ_ASSERT(!rv.Failed());
} }
} }
@@ -616,11 +615,10 @@ already_AddRefed<nsGenericHTMLElement> HTMLTableElement::CreateTFoot() {
} }
void HTMLTableElement::DeleteTFoot() { void HTMLTableElement::DeleteTFoot() {
HTMLTableSectionElement* tFoot = GetTFoot(); RefPtr<HTMLTableSectionElement> tFoot = GetTFoot();
if (tFoot) { if (tFoot) {
mozilla::ErrorResult rv; mozilla::IgnoredErrorResult rv;
nsINode::RemoveChild(*tFoot, rv); nsINode::RemoveChild(*tFoot, rv);
MOZ_ASSERT(!rv.Failed());
} }
} }
@@ -644,11 +642,10 @@ already_AddRefed<nsGenericHTMLElement> HTMLTableElement::CreateCaption() {
} }
void HTMLTableElement::DeleteCaption() { void HTMLTableElement::DeleteCaption() {
HTMLTableCaptionElement* caption = GetCaption(); RefPtr<HTMLTableCaptionElement> caption = GetCaption();
if (caption) { if (caption) {
mozilla::ErrorResult rv; mozilla::IgnoredErrorResult rv;
nsINode::RemoveChild(*caption, rv); nsINode::RemoveChild(*caption, rv);
MOZ_ASSERT(!rv.Failed());
} }
} }

2
dom/html/HTMLTableSectionElement.cpp
View File

@@ -105,7 +105,7 @@ void HTMLTableSectionElement::DeleteRow(int32_t aValue, ErrorResult& aError) {
refIndex = (uint32_t)aValue; refIndex = (uint32_t)aValue;
} }
nsINode* row = rows->Item(refIndex); nsCOMPtr<nsINode> row = rows->Item(refIndex);
if (!row) { if (!row) {
aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR); aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
return; return;