From 0cdd647abc53f7db3aa16f67bf0b2f8f3825db61 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 20 Feb 2018 09:44:16 -0500 Subject: Issue #26 - Revert 'Bug 1300654 - Remove MOZ_EME build option and make EME disabled by preferences' --- layout/base/nsLayoutUtils.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'layout') 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)) && -- cgit v1.2.3