Index: media/blink/webmediaplayer_impl.cc |
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc |
index 3389d4a33706376b74273ac2d14951542df66f04..a3799b9edf89477e0781dac149bae8ae3b8b5df8 100644 |
--- a/media/blink/webmediaplayer_impl.cc |
+++ b/media/blink/webmediaplayer_impl.cc |
@@ -234,6 +234,9 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( |
force_video_overlays_ = base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kForceVideoOverlays); |
+ disable_video_overlays_ = |
watk
2016/08/31 00:27:45
I think this would be more obvious if it had fulls
sandersd (OOO until July 31)
2016/08/31 21:43:55
Done.
|
+ !base::FeatureList::IsEnabled(media::kOverlayFullscreenVideo); |
+ |
if (delegate_) |
delegate_id_ = delegate_->AddObserver(this); |
@@ -331,12 +334,12 @@ void WebMediaPlayerImpl::DisableOverlay() { |
} |
void WebMediaPlayerImpl::enteredFullscreen() { |
- if (!force_video_overlays_) |
+ if (!force_video_overlays_ && !disable_video_overlays_) |
EnableOverlay(); |
} |
void WebMediaPlayerImpl::exitedFullscreen() { |
- if (!force_video_overlays_) |
+ if (!force_video_overlays_ && !disable_video_overlays_) |
DisableOverlay(); |
} |