Skip to content

Commit 6f887f9

Browse files
author
sotaro
committed
Bug 1833696 - Add indication of VIDEO_OVERLAY if disabled by pref(gfx.webrender.dcomp-video-overlay-win= false) r=gfx-reviewers,lsalzman
Differential Revision: https://phabricator.services.mozilla.com/D178608
1 parent 137a9cb commit 6f887f9

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

gfx/thebes/gfxPlatform.cpp

+11-3
Original file line numberDiff line numberDiff line change
@@ -2692,11 +2692,15 @@ void gfxPlatform::InitWebRenderConfig() {
26922692
gfxVars::SetAllowSoftwareWebRenderD3D11(true);
26932693
}
26942694

2695+
const bool overlaySupported =
2696+
IsWin10AnniversaryUpdateOrLater() &&
2697+
gfxConfig::IsEnabled(Feature::WEBRENDER_COMPOSITOR);
2698+
MOZ_ASSERT_IF(overlaySupported,
2699+
gfxConfig::IsEnabled(Feature::WEBRENDER_DCOMP_PRESENT));
2700+
26952701
bool useVideoOverlay = false;
26962702
if (StaticPrefs::gfx_webrender_dcomp_video_overlay_win_AtStartup()) {
2697-
if (IsWin10AnniversaryUpdateOrLater() &&
2698-
gfxConfig::IsEnabled(Feature::WEBRENDER_COMPOSITOR)) {
2699-
MOZ_ASSERT(gfxConfig::IsEnabled(Feature::WEBRENDER_DCOMP_PRESENT));
2703+
if (overlaySupported) {
27002704
useVideoOverlay = true;
27012705
}
27022706

@@ -2722,6 +2726,10 @@ void gfxPlatform::InitWebRenderConfig() {
27222726
}
27232727
}
27242728
}
2729+
} else if (overlaySupported) {
2730+
FeatureState& feature = gfxConfig::GetFeature(Feature::VIDEO_OVERLAY);
2731+
feature.DisableByDefault(FeatureStatus::Blocked, "Disabled by pref",
2732+
"FEATURE_FAILURE_DISABLED_BY_PREF"_ns);
27252733
}
27262734

27272735
if (useVideoOverlay) {

0 commit comments

Comments
 (0)