summaryrefslogtreecommitdiffstats
path: root/layout
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-24 22:12:27 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-24 22:12:27 +0100
commite10dfb62ff916d49632febb59565f3c52f4970bd (patch)
treee3162c57574bcf7f91d262d9a8cd70ece01f9edb /layout
parentfd6b1ad6f9768556bb03a0fbdb16587fdfd0a962 (diff)
parent27727874636868dc6d61e8117f81cd761c91e2ed (diff)
downloadUXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar
UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.gz
UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.lz
UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.xz
UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.zip
Merge branch 'EME-work'
Diffstat (limited to 'layout')
-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)) &&