Add media.glvideo preference

This commit is contained in:
Víctor Manuel Jáquez Leal 2019-06-04 17:46:58 +02:00 committed by Fernando Jiménez Moreno
parent 08d812ec0e
commit da8eb18763
3 changed files with 14 additions and 2 deletions

View file

@ -446,6 +446,9 @@ mod gen {
} }
}, },
media: { media: {
glvideo: {
enabled: bool,
},
testing: { testing: {
enabled: bool, enabled: bool,
} }

View file

@ -24,7 +24,7 @@ use servo::compositing::windowing::{AnimationState, MouseWindowEvent, WindowEven
use servo::compositing::windowing::{EmbedderCoordinates, WindowMethods}; use servo::compositing::windowing::{EmbedderCoordinates, WindowMethods};
use servo::embedder_traits::Cursor; use servo::embedder_traits::Cursor;
use servo::script_traits::{TouchEventType, WheelMode, WheelDelta}; use servo::script_traits::{TouchEventType, WheelMode, WheelDelta};
use servo::servo_config::opts; use servo::servo_config::{opts, pref};
use servo::servo_geometry::DeviceIndependentPixel; use servo::servo_geometry::DeviceIndependentPixel;
use servo::style_traits::DevicePixel; use servo::style_traits::DevicePixel;
use servo::webrender_api::{ use servo::webrender_api::{
@ -527,10 +527,18 @@ impl WindowMethods for Window {
} }
fn get_gl_context(&self) -> PlayerGLContext { fn get_gl_context(&self) -> PlayerGLContext {
if pref!(media.glvideo.enabled) {
self.gl_context.borrow().raw_context() self.gl_context.borrow().raw_context()
} else {
PlayerGLContext::Unknown
}
} }
fn get_native_display(&self) -> NativeDisplay { fn get_native_display(&self) -> NativeDisplay {
if !pref!(media.glvideo.enabled) {
return NativeDisplay::Unknown;
}
#[cfg(any( #[cfg(any(
target_os = "linux", target_os = "linux",
target_os = "dragonfly", target_os = "dragonfly",

View file

@ -84,6 +84,7 @@
"layout.threads": 3, "layout.threads": 3,
"layout.viewport.enabled": false, "layout.viewport.enabled": false,
"layout.writing-mode.enabled": false, "layout.writing-mode.enabled": false,
"media.glvideo.enabled": false,
"media.testing.enabled": false, "media.testing.enabled": false,
"network.http-cache.disabled": false, "network.http-cache.disabled": false,
"network.mime.sniff": false, "network.mime.sniff": false,