mirrors/gecko-dev
1
0
Fork 1
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-11-11 21:58:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 1469769 - Part 2: animation: Replace failing NS_NOTREACHED with NS_ERROR. r=heycam

Browse source 
I'm replacing non-failing calls to NS_NOTREACHED with MOZ_ASSERT_UNREACHABLE, but this NS_NOTREACHED fails when running the devtools/client/animationinspector/test/browser_animation_refresh_on_removed_animation.js test. This assertion failure is bug 1189015.

This patch DOES NOT fix the cause of the assertion failure (a missing TextNodeCorrespondenceProperty). It just replaces this failing NS_NOTREACHED with NS_ERROR because I can't replace with a fatal MOZ_ASSERT_UNREACHABLE.

MozReview-Commit-ID: H5rfyr71N1M

--HG--
extra : rebase_source : a65053171f41bc6069fc6cb3688c0a9cc36830b2
extra : intermediate-source : 203b3e7b091743faebcf58d576360d1afd85b6bc
extra : source : 12dcc693259a536ac06075698db7e851d682cf3a
This commit is contained in:
Chris Peterson 2018-06-04 01:44:39 -07:00
parent e3b1f171c9
commit d8afcd19f3
1 changed files with 16 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

22
dom/base/nsDOMMutationObserver.h
View file

@ -847,9 +847,14 @@ public:
case eState_Removed: case eState_Removed:
entry->mState = eState_RemainedPresent; entry->mState = eState_RemainedPresent;
break; break;
default: case eState_Added:
NS_NOTREACHED("shouldn't have observed an animation being added " // FIXME bug 1189015
"twice"); NS_ERROR("shouldn't have observed an animation being added twice");
break;
case eState_RemainedPresent:
MOZ_ASSERT_UNREACHABLE("shouldn't have observed an animation "
"remaining present");
break;
} }
} else { } else {
entry = sCurrentBatch->AddEntry(aAnimation, aTarget); entry = sCurrentBatch->AddEntry(aAnimation, aTarget);
@ -887,9 +892,14 @@ public:
case eState_Added: case eState_Added:
entry->mState = eState_RemainedAbsent; entry->mState = eState_RemainedAbsent;
break; break;
default: case eState_RemainedAbsent:
NS_NOTREACHED("shouldn't have observed an animation being removed " MOZ_ASSERT_UNREACHABLE("shouldn't have observed an animation "
"twice"); "remaining absent");
break;
case eState_Removed:
// FIXME bug 1189015
NS_ERROR("shouldn't have observed an animation being removed twice");
break;
} }
} else { } else {
entry = sCurrentBatch->AddEntry(aAnimation, aTarget); entry = sCurrentBatch->AddEntry(aAnimation, aTarget);