diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-07-13 15:17:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 15:17:10 +0200 |
| commit | ec32d19a84b2cc61a34442a4562e080cb6cd7db0 (patch) | |
| tree | 23d12811c6660bf6459ec82890d800029fbd8d4f | |
| parent | d4b0944e051effc3a4fc089441011ffee6f0dc5e (diff) | |
| parent | 71a1c47759f30f114ad4e5634ba5224744b7c18c (diff) | |
| download | UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.tar UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.tar.gz UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.tar.lz UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.tar.xz UXP-ec32d19a84b2cc61a34442a4562e080cb6cd7db0.zip | |
Merge pull request #628 from janekptacijarabaci/build_bustage_debug_1
Fix Build Bustage - with "--enable-debug"
| -rw-r--r-- | dom/html/HTMLMediaElement.cpp | 2 | ||||
| -rw-r--r-- | editor/libeditor/TextEditor.cpp | 2 | ||||
| -rw-r--r-- | js/src/vm/EnvironmentObject.h | 3 | ||||
| -rw-r--r-- | layout/base/nsLayoutUtils.cpp | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 0b9f606f1..3954e6208 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -5514,7 +5514,9 @@ void HTMLMediaElement::SuspendOrResumeElement(bool aPauseElement, bool aSuspendE } mEventDeliveryPaused = aSuspendEvents; } else { +#ifdef MOZ_EME MOZ_ASSERT(!mMediaKeys); +#endif if (mDecoder) { mDecoder->Resume(); if (!mPaused && !mDecoder->IsEnded()) { diff --git a/editor/libeditor/TextEditor.cpp b/editor/libeditor/TextEditor.cpp index d21585597..1e855d769 100644 --- a/editor/libeditor/TextEditor.cpp +++ b/editor/libeditor/TextEditor.cpp @@ -836,7 +836,7 @@ TextEditor::BeginIMEComposition(WidgetCompositionEvent* aEvent) nsresult TextEditor::UpdateIMEComposition(WidgetCompositionEvent* aCompositionChangeEvent) { - MOZ_ASSERT(aCompsitionChangeEvent, + MOZ_ASSERT(aCompositionChangeEvent, "aCompositionChangeEvent must not be nullptr"); if (NS_WARN_IF(!aCompositionChangeEvent)) { diff --git a/js/src/vm/EnvironmentObject.h b/js/src/vm/EnvironmentObject.h index d457ca839..032286116 100644 --- a/js/src/vm/EnvironmentObject.h +++ b/js/src/vm/EnvironmentObject.h @@ -930,6 +930,9 @@ class DebugEnvironments void mark(JSTracer* trc); void sweep(JSRuntime* rt); void finish(); +#ifdef JSGC_HASH_TABLE_CHECKS + void checkHashTablesAfterMovingGC(JSRuntime* runtime); +#endif // If a live frame has a synthesized entry in missingEnvs, make sure it's not // collected. diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 9d8dd81bf..062fbfe15 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -5057,7 +5057,7 @@ nsLayoutUtils::IntrinsicForAxis(PhysicalAxis aAxis, NS_PRECONDITION(aFrame->GetParent(), "IntrinsicForAxis called on frame not in tree"); NS_PRECONDITION(aType == MIN_ISIZE || aType == PREF_ISIZE, "bad type"); - MOZ_ASSERT(aFrame->GetParent()->Type() != LayoutFrameType::GridContainer || + MOZ_ASSERT(aFrame->GetParent()->GetType() != nsGkAtoms::gridContainerFrame || aPercentageBasis.isSome(), "grid layout should always pass a percentage basis"); |