summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-07-13 15:17:10 +0200
committerGitHub <noreply@github.com>2018-07-13 15:17:10 +0200
commitec32d19a84b2cc61a34442a4562e080cb6cd7db0 (patch)
tree23d12811c6660bf6459ec82890d800029fbd8d4f /dom
parentd4b0944e051effc3a4fc089441011ffee6f0dc5e (diff)
parent71a1c47759f30f114ad4e5634ba5224744b7c18c (diff)
downloadUXP-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"
Diffstat (limited to 'dom')
-rw-r--r--dom/html/HTMLMediaElement.cpp2
1 files changed, 2 insertions, 0 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()) {