summaryrefslogtreecommitdiffstats
path: root/layout/base
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2017-12-13 12:07:12 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-24 10:20:45 +0100
commit46ad1199deeaf6ba2db31fb3398d3eaa9abdbb2e (patch)
treebdb1316d0388f03c6b7e4171f56f5bac46c41d87 /layout/base
parent55d03738f9f79e30bab6294b023176d1a65ab5c3 (diff)
downloadUXP-46ad1199deeaf6ba2db31fb3398d3eaa9abdbb2e.tar
UXP-46ad1199deeaf6ba2db31fb3398d3eaa9abdbb2e.tar.gz
UXP-46ad1199deeaf6ba2db31fb3398d3eaa9abdbb2e.tar.lz
UXP-46ad1199deeaf6ba2db31fb3398d3eaa9abdbb2e.tar.xz
UXP-46ad1199deeaf6ba2db31fb3398d3eaa9abdbb2e.zip
Don't build EME-specific subroutines without EME.
- Checks for restricted or encrypted content - Dispatching 'encrypted' events - Dispatching 'key needed' events - HTML Media Element media keys system - EME telemetry - HTML Media Element EME API This is the main bulk for #26, isolating EME-specific code.
Diffstat (limited to 'layout/base')
-rw-r--r--layout/base/nsLayoutUtils.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index ed34f39ce..789c91f50 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)) &&