diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-20 09:44:16 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-20 09:44:16 -0500 |
| commit | 0cdd647abc53f7db3aa16f67bf0b2f8f3825db61 (patch) | |
| tree | aa679e70fa83e4a1fce02ec1d783400fe3adba86 /layout | |
| parent | 9ecbf33313eee5c4e068e61451634cbfe4790694 (diff) | |
| download | uxp-0cdd647abc53f7db3aa16f67bf0b2f8f3825db61.tar.gz | |
Issue #26 - Revert 'Bug 1300654 - Remove MOZ_EME build option and make EME disabled by preferences'
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/base/nsLayoutUtils.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index ed34f39cef..789c91f505 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -7242,9 +7242,11 @@ nsLayoutUtils::SurfaceFromElement(HTMLVideoElement* aElement, (aSurfaceFlags & SFE_PREFER_NO_PREMULTIPLY_ALPHA) == 0, "We can't support non-premultiplied alpha for video!"); +#ifdef MOZ_EME if (aElement->ContainsRestrictedContent()) { return result; } +#endif uint16_t readyState; if (NS_SUCCEEDED(aElement->GetReadyState(&readyState)) && |