diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
| commit | 6bd66b1728eeddb058066edda740aaeb2ceaec23 (patch) | |
| tree | 985faf01c526763515731569fa01a99f4dbef36e /dom/html/HTMLMediaElement.cpp | |
| parent | e0a8dcfed131ffa58a5e2cb1d30fe48c745c2fdc (diff) | |
| parent | 559824514dc95e02fbe81f1786e6ac13ee8e9d55 (diff) | |
| download | uxp-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.gz | |
Merge branch 'master' into js-modules
Diffstat (limited to 'dom/html/HTMLMediaElement.cpp')
| -rw-r--r-- | dom/html/HTMLMediaElement.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 0b9f606f19..3954e62088 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()) { |