diff --git a/.travis.yml b/.travis.yml index 186d479af02..783fb2334ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,7 @@ matrix: - libavformat-dev - libavcodec-dev - libavutil-dev + - libedit-dev branches: only: diff --git a/components/canvas/webgl_paint_thread.rs b/components/canvas/webgl_paint_thread.rs index 8b1ff8ff753..a7a0859276c 100644 --- a/components/canvas/webgl_paint_thread.rs +++ b/components/canvas/webgl_paint_thread.rs @@ -7,15 +7,87 @@ use canvas_traits::{FromLayoutMsg, byte_swap}; use euclid::size::Size2D; use gleam::gl; use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory}; -use offscreen_gl_context::{ColorAttachmentType, GLContext, GLLimits, GLContextAttributes, NativeGLContext}; +use offscreen_gl_context::{ColorAttachmentType, GLContext, GLLimits}; +use offscreen_gl_context::{GLContextAttributes, NativeGLContext, OSMesaContext}; use std::borrow::ToOwned; use std::sync::mpsc::channel; +use util::opts; use util::thread::spawn_named; use webrender_traits; +enum GLContextWrapper { + Native(GLContext), + OSMesa(GLContext), +} + +impl GLContextWrapper { + fn new(size: Size2D, + attributes: GLContextAttributes) -> Result { + if opts::get().should_use_osmesa() { + let ctx = GLContext::::new(size, + attributes, + ColorAttachmentType::Texture, + None); + ctx.map(GLContextWrapper::OSMesa) + } else { + let ctx = GLContext::::new(size, + attributes, + ColorAttachmentType::Texture, + None); + ctx.map(GLContextWrapper::Native) + } + } + + pub fn get_limits(&self) -> GLLimits { + match *self { + GLContextWrapper::Native(ref ctx) => { + ctx.borrow_limits().clone() + } + GLContextWrapper::OSMesa(ref ctx) => { + ctx.borrow_limits().clone() + } + } + } + + fn resize(&mut self, size: Size2D) -> Result, &'static str> { + match *self { + GLContextWrapper::Native(ref mut ctx) => { + try!(ctx.resize(size)); + Ok(ctx.borrow_draw_buffer().unwrap().size()) + } + GLContextWrapper::OSMesa(ref mut ctx) => { + try!(ctx.resize(size)); + Ok(ctx.borrow_draw_buffer().unwrap().size()) + } + } + } + + pub fn make_current(&self) { + match *self { + GLContextWrapper::Native(ref ctx) => { + ctx.make_current().unwrap(); + } + GLContextWrapper::OSMesa(ref ctx) => { + ctx.make_current().unwrap(); + } + } + } + + pub fn apply_command(&self, cmd: webrender_traits::WebGLCommand) { + match *self { + GLContextWrapper::Native(ref ctx) => { + cmd.apply(ctx); + } + GLContextWrapper::OSMesa(ref ctx) => { + cmd.apply(ctx); + } + } + } +} + enum WebGLPaintTaskData { WebRender(webrender_traits::RenderApi, webrender_traits::WebGLContextId), - Readback(GLContext, (Option<(webrender_traits::RenderApi, webrender_traits::ImageKey)>)), + Readback(GLContextWrapper, (Option<(webrender_traits::RenderApi, webrender_traits::ImageKey)>)), } pub struct WebGLPaintThread { @@ -27,8 +99,8 @@ fn create_readback_painter(size: Size2D, attrs: GLContextAttributes, webrender_api: Option) -> Result<(WebGLPaintThread, GLLimits), String> { - let context = try!(GLContext::::new(size, attrs, ColorAttachmentType::Texture, None)); - let limits = context.borrow_limits().clone(); + let context = try!(GLContextWrapper::new(size, attrs)); + let limits = context.get_limits(); let webrender_api_and_image_key = webrender_api.map(|wr| { let key = wr.alloc_image(); (wr, key) @@ -73,7 +145,7 @@ impl WebGLPaintThread { api.send_webgl_command(id, message); } WebGLPaintTaskData::Readback(ref ctx, _) => { - message.apply(ctx); + ctx.apply_command(message); } } } @@ -174,8 +246,7 @@ impl WebGLPaintThread { WebGLPaintTaskData::Readback(ref mut context, _) => { if size.width > self.size.width || size.height > self.size.height { - try!(context.resize(size)); - self.size = context.borrow_draw_buffer().unwrap().size(); + self.size = try!(context.resize(size)); } else { self.size = size; unsafe { gl::Scissor(0, 0, size.width, size.height); } @@ -191,7 +262,7 @@ impl WebGLPaintThread { fn init(&mut self) { if let WebGLPaintTaskData::Readback(ref context, _) = self.data { - context.make_current().unwrap(); + context.make_current(); } } } diff --git a/components/script/dom/webidls/Element.webidl b/components/script/dom/webidls/Element.webidl index 295d76cd1f4..21d663881cc 100644 --- a/components/script/dom/webidls/Element.webidl +++ b/components/script/dom/webidls/Element.webidl @@ -85,22 +85,14 @@ partial interface Element { DOMRectList getClientRects(); DOMRect getBoundingClientRect(); - [Func="::script_can_initiate_scroll"] void scroll(optional ScrollToOptions options); - [Func="::script_can_initiate_scroll"] void scroll(unrestricted double x, unrestricted double y); - [Func="::script_can_initiate_scroll"] void scrollTo(optional ScrollToOptions options); - [Func="::script_can_initiate_scroll"] void scrollTo(unrestricted double x, unrestricted double y); - [Func="::script_can_initiate_scroll"] void scrollBy(optional ScrollToOptions options); - [Func="::script_can_initiate_scroll"] void scrollBy(unrestricted double x, unrestricted double y); - [Func="::script_can_initiate_scroll"] attribute unrestricted double scrollTop; - [Func="::script_can_initiate_scroll"] attribute unrestricted double scrollLeft; readonly attribute long scrollWidth; readonly attribute long scrollHeight; diff --git a/components/script/dom/webidls/Window.webidl b/components/script/dom/webidls/Window.webidl index dbe73ca4831..84fb4d754de 100644 --- a/components/script/dom/webidls/Window.webidl +++ b/components/script/dom/webidls/Window.webidl @@ -138,17 +138,11 @@ partial interface Window { readonly attribute long pageXOffset; readonly attribute long scrollY; readonly attribute long pageYOffset; - [Func="::script_can_initiate_scroll"] void scroll(optional ScrollToOptions options); - [Func="::script_can_initiate_scroll"] void scroll(unrestricted double x, unrestricted double y); - [Func="::script_can_initiate_scroll"] void scrollTo(optional ScrollToOptions options); - [Func="::script_can_initiate_scroll"] void scrollTo(unrestricted double x, unrestricted double y); - [Func="::script_can_initiate_scroll"] void scrollBy(optional ScrollToOptions options); - [Func="::script_can_initiate_scroll"] void scrollBy(unrestricted double x, unrestricted double y); // client diff --git a/components/script/lib.rs b/components/script/lib.rs index 840e078d93f..89479c4c291 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -114,10 +114,8 @@ mod webdriver_handlers; use dom::bindings::codegen::RegisterBindings; use dom::bindings::proxyhandler; -use js::jsapi::{Handle, JSContext, JSObject}; use script_traits::SWManagerSenders; use serviceworker_manager::ServiceWorkerManager; -use util::opts; #[cfg(target_os = "linux")] #[allow(unsafe_code)] @@ -175,13 +173,3 @@ pub fn init(sw_senders: SWManagerSenders) { perform_platform_specific_initialization(); } - -/// FIXME(pcwalton): Currently WebRender cannot handle DOM-initiated scrolls. Remove this when it -/// can. See PR #11680 for details. -/// -/// This function is only marked `unsafe` because the `[Func=foo]` WebIDL attribute requires it. It -/// shouldn't actually do anything unsafe. -#[allow(unsafe_code)] -pub unsafe fn script_can_initiate_scroll(_: *mut JSContext, _: Handle<*mut JSObject>) -> bool { - !opts::get().use_webrender -} diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 5f9116d9ee3..40c268d6b24 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -235,7 +235,7 @@ dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", @@ -369,7 +369,7 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -902,6 +902,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", + "osmesa-src 12.0.1 (git+https://github.com/servo/osmesa-src)", + "osmesa-sys 0.1.2 (git+https://github.com/daggerbot/osmesa-rs)", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-glutin 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1617,7 +1619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "offscreen_gl_context" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1626,6 +1628,7 @@ dependencies = [ "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1704,9 +1707,22 @@ dependencies = [ "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "osmesa-src" +version = "12.0.1" +source = "git+https://github.com/servo/osmesa-src#aaccb7b7acdbcd54708db6530cea4177642cf64c" + [[package]] name = "osmesa-sys" -version = "0.1.1" +version = "0.1.2" +source = "git+https://github.com/daggerbot/osmesa-rs#7ef7ebc612302794e7ed3bd068c93b70950218a1" +dependencies = [ + "shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "osmesa-sys" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1971,7 +1987,7 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2055,7 +2071,7 @@ dependencies = [ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2180,7 +2196,7 @@ dependencies = [ "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "osmesa-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2645,7 +2661,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.5.1" -source = "git+https://github.com/servo/webrender#58b9e983a5e74ac1670fcf67f9c2ba68740ab2cc" +source = "git+https://github.com/servo/webrender#cf945d15c71c757c6694b40a38fd7cfef1a2f827" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2661,7 +2677,7 @@ dependencies = [ "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", @@ -2670,7 +2686,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.5.1" -source = "git+https://github.com/servo/webrender#58b9e983a5e74ac1670fcf67f9c2ba68740ab2cc" +source = "git+https://github.com/servo/webrender#cf945d15c71c757c6694b40a38fd7cfef1a2f827" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2679,7 +2695,7 @@ dependencies = [ "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2902,7 +2918,7 @@ dependencies = [ "checksum num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "cee7e88156f3f9e19bdd598f8d6c9db7bf4078f99f8381f43a55b09648d1a6e3" "checksum objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9311aa5acd7bee14476afa0f0557f564e9d0d61218a8b833d9b1f871fa5fba" "checksum odds 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "f3701cfdec1676e319ad37ff96c31de39df8c92006032976153366f52693bf40" -"checksum offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0860b03349dd951ade7f4fdb1f6724a76a3750b094a760d2aeee1af1d4706400" +"checksum offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ffcda42bebbbbee2b403bc46d8ea85e0dcf25b5242592bde6eae7788d67cd655" "checksum ogg 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "426d8dc59cdd206be1925461087350385c0a02f291d87625829c6d08e72b457b" "checksum ogg_metadata 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e755cc735fa6faa709cb23048433d9201d6caa85fa96215386ccdd5e9b40ad01" "checksum open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c228597177bc4a6876e278f7c7948ac033bfcb4d163ccdd5a009557c8fe5fa1e" @@ -2911,7 +2927,9 @@ dependencies = [ "checksum openssl-sys-extras 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "11c5e1dba7d3d03d80f045bf0d60111dc69213b67651e7c889527a3badabb9fa" "checksum openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ed86cce894f6b0ed4572e21eb34026f1dc8869cb9ee3869029131bc8c3feb2d" "checksum ordered-float 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cc511538298611a79d5a4ddfbb75315b866d942ed26a00bdc3590795c68b7279" -"checksum osmesa-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b0040392971435cdab6bb52f0d4dc2fbb959c90b4263bec33af6ef092f8f828d" +"checksum osmesa-src 12.0.1 (git+https://github.com/servo/osmesa-src)" = "" +"checksum osmesa-sys 0.1.2 (git+https://github.com/daggerbot/osmesa-rs)" = "" +"checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" "checksum phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "52c875926de24c01b5b69153eaa258b57920a39b44bbce8ef1f2052a6c5a6a1a" "checksum phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8912c2cc0ea2e8ae70388ec0af9a445e7ab37b3c9cc61f059c2b34db8ed50b" "checksum phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "04b5ea825e28cb6efd89d9133b129b2003b45a221aeda025509b125b00ecb7c4" diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 9284c0997a8..980c2c47572 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -147,6 +147,12 @@ impl Browser where Window: WindowMethods + 'static { } }; + let renderer_kind = if opts::get().should_use_osmesa() { + webrender_traits::RendererKind::OSMesa + } else { + webrender_traits::RendererKind::Native + }; + let (webrender, webrender_sender) = webrender::Renderer::new(webrender::RendererOptions { device_pixel_ratio: device_pixel_ratio, @@ -158,6 +164,7 @@ impl Browser where Window: WindowMethods + 'static { enable_recording: false, precache_shaders: opts.precache_shaders, enable_scrollbars: opts.output_file.is_none(), + renderer_kind: renderer_kind, }); (Some(webrender), Some(webrender_sender)) } else { diff --git a/components/util/opts.rs b/components/util/opts.rs index e9df3f31298..aef7b3a84eb 100644 --- a/components/util/opts.rs +++ b/components/util/opts.rs @@ -791,8 +791,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult { !PREFS.get("shell.native-titlebar.enabled").as_boolean().unwrap(); let use_webrender = - (PREFS.get("gfx.webrender.enabled").as_boolean().unwrap() || opt_match.opt_present("w")) && - !opt_match.opt_present("z"); + PREFS.get("gfx.webrender.enabled").as_boolean().unwrap() || opt_match.opt_present("w"); let render_api = match opt_match.opt_str("G") { Some(ref ga) if ga == "gl" => RenderApi::GL, @@ -944,3 +943,9 @@ pub fn parse_url_or_filename(cwd: &Path, input: &str) -> Result { Err(_) => Err(()), } } + +impl Opts { + pub fn should_use_osmesa(&self) -> bool { + self.headless + } +} diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 1803a2cafdb..c728aec1e3b 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -208,7 +208,7 @@ dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "util 0.0.1", "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", @@ -326,7 +326,7 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -809,6 +809,8 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", + "osmesa-src 12.0.1 (git+https://github.com/servo/osmesa-src)", + "osmesa-sys 0.1.2 (git+https://github.com/daggerbot/osmesa-rs)", "script_traits 0.0.1", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-glutin 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1488,7 +1490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "offscreen_gl_context" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1497,6 +1499,7 @@ dependencies = [ "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1575,9 +1578,22 @@ dependencies = [ "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "osmesa-src" +version = "12.0.1" +source = "git+https://github.com/servo/osmesa-src#aaccb7b7acdbcd54708db6530cea4177642cf64c" + [[package]] name = "osmesa-sys" -version = "0.1.1" +version = "0.1.2" +source = "git+https://github.com/daggerbot/osmesa-rs#7ef7ebc612302794e7ed3bd068c93b70950218a1" +dependencies = [ + "shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "osmesa-sys" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1822,7 +1838,7 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1896,7 +1912,7 @@ dependencies = [ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "profile_traits 0.0.1", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2063,7 +2079,7 @@ dependencies = [ "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "osmesa-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2505,7 +2521,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.5.1" -source = "git+https://github.com/servo/webrender#58b9e983a5e74ac1670fcf67f9c2ba68740ab2cc" +source = "git+https://github.com/servo/webrender#cf945d15c71c757c6694b40a38fd7cfef1a2f827" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2521,7 +2537,7 @@ dependencies = [ "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.5.1 (git+https://github.com/servo/webrender)", @@ -2530,7 +2546,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.5.1" -source = "git+https://github.com/servo/webrender#58b9e983a5e74ac1670fcf67f9c2ba68740ab2cc" +source = "git+https://github.com/servo/webrender#cf945d15c71c757c6694b40a38fd7cfef1a2f827" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2539,7 +2555,7 @@ dependencies = [ "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2756,7 +2772,7 @@ dependencies = [ "checksum num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "cee7e88156f3f9e19bdd598f8d6c9db7bf4078f99f8381f43a55b09648d1a6e3" "checksum objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9311aa5acd7bee14476afa0f0557f564e9d0d61218a8b833d9b1f871fa5fba" "checksum odds 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "f3701cfdec1676e319ad37ff96c31de39df8c92006032976153366f52693bf40" -"checksum offscreen_gl_context 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0860b03349dd951ade7f4fdb1f6724a76a3750b094a760d2aeee1af1d4706400" +"checksum offscreen_gl_context 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ffcda42bebbbbee2b403bc46d8ea85e0dcf25b5242592bde6eae7788d67cd655" "checksum ogg 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "426d8dc59cdd206be1925461087350385c0a02f291d87625829c6d08e72b457b" "checksum ogg_metadata 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e755cc735fa6faa709cb23048433d9201d6caa85fa96215386ccdd5e9b40ad01" "checksum open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c228597177bc4a6876e278f7c7948ac033bfcb4d163ccdd5a009557c8fe5fa1e" @@ -2765,7 +2781,9 @@ dependencies = [ "checksum openssl-sys-extras 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "11c5e1dba7d3d03d80f045bf0d60111dc69213b67651e7c889527a3badabb9fa" "checksum openssl-verify 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ed86cce894f6b0ed4572e21eb34026f1dc8869cb9ee3869029131bc8c3feb2d" "checksum ordered-float 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cc511538298611a79d5a4ddfbb75315b866d942ed26a00bdc3590795c68b7279" -"checksum osmesa-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b0040392971435cdab6bb52f0d4dc2fbb959c90b4263bec33af6ef092f8f828d" +"checksum osmesa-src 12.0.1 (git+https://github.com/servo/osmesa-src)" = "" +"checksum osmesa-sys 0.1.2 (git+https://github.com/daggerbot/osmesa-rs)" = "" +"checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" "checksum phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "52c875926de24c01b5b69153eaa258b57920a39b44bbce8ef1f2052a6c5a6a1a" "checksum phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8912c2cc0ea2e8ae70388ec0af9a445e7ab37b3c9cc61f059c2b34db8ed50b" "checksum phf_generator 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)" = "04b5ea825e28cb6efd89d9133b129b2003b45a221aeda025509b125b00ecb7c4" diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index fb83fe55eab..b5d90e499bf 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -23,6 +23,9 @@ style_traits = {path = "../../components/style_traits"} url = {version = "1.2", features = ["heap_size"]} util = {path = "../../components/util"} +[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies] +osmesa-sys = {git = "https://github.com/daggerbot/osmesa-rs"} + [target.'cfg(target_os = "linux")'.dependencies] x11 = "2.0.0" @@ -33,3 +36,9 @@ servo-egl = "0.2" winapi = "0.2" user32-sys = "0.2" gdi32-sys = "0.2" + +[target.'cfg(target_os = "macos")'.dependencies] +osmesa-src = {git = "https://github.com/servo/osmesa-src"} + +[target.x86_64-unknown-linux-gnu.dependencies] +osmesa-src = {git = "https://github.com/servo/osmesa-src"} diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs index 64ad3fc632d..6e3c64691c2 100644 --- a/ports/glutin/lib.rs +++ b/ports/glutin/lib.rs @@ -17,6 +17,7 @@ extern crate layers; #[macro_use] extern crate log; extern crate msg; extern crate net_traits; +#[cfg(any(target_os = "linux", target_os = "macos"))] extern crate osmesa_sys; extern crate script_traits; extern crate style_traits; extern crate url; diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 58e055e3c40..f45bc723b3a 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -24,10 +24,17 @@ use layers::platform::surface::NativeDisplay; use msg::constellation_msg::{self, Key}; use msg::constellation_msg::{ALT, CONTROL, KeyState, NONE, SHIFT, SUPER}; use net_traits::net_error_list::NetError; +#[cfg(any(target_os = "linux", target_os = "macos"))] +use osmesa_sys; use script_traits::{TouchEventType, TouchpadPressurePhase}; use std::cell::{Cell, RefCell}; +#[cfg(any(target_os = "linux", target_os = "macos"))] +use std::ffi::CString; +#[cfg(any(target_os = "linux", target_os = "macos"))] +use std::mem; #[cfg(not(target_os = "android"))] use std::os::raw::c_void; +use std::ptr; use std::rc::Rc; use std::sync::mpsc::{Sender, channel}; use style_traits::cursor::Cursor; @@ -91,9 +98,88 @@ fn builder_with_platform_options(builder: glutin::WindowBuilder) -> glutin::Wind builder } +#[cfg(any(target_os = "linux", target_os = "macos"))] +struct HeadlessContext { + width: u32, + height: u32, + _context: osmesa_sys::OSMesaContext, + _buffer: Vec, +} + +#[cfg(not(any(target_os = "linux", target_os = "macos")))] +struct HeadlessContext { + width: u32, + height: u32, +} + +impl HeadlessContext { + #[cfg(any(target_os = "linux", target_os = "macos"))] + fn new(width: u32, height: u32) -> HeadlessContext { + let mut attribs = Vec::new(); + + attribs.push(osmesa_sys::OSMESA_PROFILE); + attribs.push(osmesa_sys::OSMESA_CORE_PROFILE); + attribs.push(osmesa_sys::OSMESA_CONTEXT_MAJOR_VERSION); + attribs.push(3); + attribs.push(osmesa_sys::OSMESA_CONTEXT_MINOR_VERSION); + attribs.push(3); + attribs.push(0); + + let context = unsafe { + osmesa_sys::OSMesaCreateContextAttribs(attribs.as_ptr(), ptr::null_mut()) + }; + + assert!(!context.is_null()); + + let mut buffer = vec![0; (width * height) as usize]; + + unsafe { + let ret = osmesa_sys::OSMesaMakeCurrent(context, + buffer.as_mut_ptr() as *mut _, + gl::UNSIGNED_BYTE, + width as i32, + height as i32); + assert!(ret != 0); + }; + + HeadlessContext { + width: width, + height: height, + _context: context, + _buffer: buffer, + } + } + + #[cfg(not(any(target_os = "linux", target_os = "macos")))] + fn new(width: u32, height: u32) -> HeadlessContext { + HeadlessContext { + width: width, + height: height, + } + } + + #[cfg(any(target_os = "linux", target_os = "macos"))] + fn get_proc_address(s: &str) -> *const c_void { + let c_str = CString::new(s).expect("Unable to create CString"); + unsafe { + mem::transmute(osmesa_sys::OSMesaGetProcAddress(c_str.as_ptr())) + } + } + + #[cfg(not(any(target_os = "linux", target_os = "macos")))] + fn get_proc_address(_: &str) -> *const c_void { + ptr::null() as *const _ + } +} + +enum WindowKind { + Window(glutin::Window), + Headless(HeadlessContext), +} + /// The type of a window. pub struct Window { - window: glutin::Window, + kind: WindowKind, mouse_down_button: Cell>, mouse_down_point: Cell>, @@ -139,43 +225,55 @@ impl Window { // #9996. let visible = is_foreground && !opts::get().no_native_titlebar; + let window_kind = if opts::get().headless { + WindowKind::Headless(HeadlessContext::new(width, height)) + } else { + let mut builder = + glutin::WindowBuilder::new().with_title("Servo".to_string()) + .with_decorations(!opts::get().no_native_titlebar) + .with_transparency(opts::get().no_native_titlebar) + .with_dimensions(width, height) + .with_gl(Window::gl_version()) + .with_visibility(visible) + .with_parent(parent) + .with_multitouch(); - let mut builder = - glutin::WindowBuilder::new().with_title("Servo".to_string()) - .with_decorations(!opts::get().no_native_titlebar) - .with_transparency(opts::get().no_native_titlebar) - .with_dimensions(width, height) - .with_gl(Window::gl_version()) - .with_visibility(visible) - .with_parent(parent) - .with_multitouch(); + if let Ok(mut icon_path) = resource_files::resources_dir_path() { + icon_path.push("servo.png"); + builder = builder.with_icon(icon_path); + } + if opts::get().enable_vsync { + builder = builder.with_vsync(); + } - if let Ok(mut icon_path) = resource_files::resources_dir_path() { - icon_path.push("servo.png"); - builder = builder.with_icon(icon_path); + if opts::get().use_msaa { + builder = builder.with_multisampling(MULTISAMPLES) + } + + builder = builder_with_platform_options(builder); + + let mut glutin_window = builder.build().expect("Failed to create window."); + + unsafe { glutin_window.make_current().expect("Failed to make context current!") } + + glutin_window.set_window_resize_callback(Some(Window::nested_window_resize as fn(u32, u32))); + + WindowKind::Window(glutin_window) + }; + + Window::load_gl_functions(&window_kind); + + if opts::get().headless { + // Print some information about the headless renderer that + // can be useful in diagnosing CI failures on build machines. + println!("{}", gl::get_string(gl::VENDOR)); + println!("{}", gl::get_string(gl::RENDERER)); + println!("{}", gl::get_string(gl::VERSION)); } - if opts::get().enable_vsync { - builder = builder.with_vsync(); - } - - if opts::get().use_msaa { - builder = builder.with_multisampling(MULTISAMPLES) - } - - builder = builder_with_platform_options(builder); - - let mut glutin_window = builder.build().expect("Failed to create window."); - - unsafe { glutin_window.make_current().expect("Failed to make context current!") } - - glutin_window.set_window_resize_callback(Some(Window::nested_window_resize as fn(u32, u32))); - - Window::load_gl_functions(&glutin_window); - let window = Window { - window: glutin_window, + kind: window_kind, event_queue: RefCell::new(vec!()), mouse_down_button: Cell::new(None), mouse_down_point: Cell::new(Point2D::new(0, 0)), @@ -197,7 +295,14 @@ impl Window { } pub fn platform_window(&self) -> glutin::WindowID { - unsafe { glutin::WindowID::new(self.window.platform_window()) } + match self.kind { + WindowKind::Window(ref window) => { + unsafe { glutin::WindowID::new(window.platform_window()) } + } + WindowKind::Headless(..) => { + unreachable!(); + } + } } fn nested_window_resize(width: u32, height: u32) { @@ -233,12 +338,21 @@ impl Window { } #[cfg(not(target_os = "android"))] - fn load_gl_functions(window: &glutin::Window) { - gl::load_with(|s| window.get_proc_address(s) as *const c_void); + fn load_gl_functions(window_kind: &WindowKind) { + match window_kind { + &WindowKind::Window(ref window) => { + gl::load_with(|s| window.get_proc_address(s) as *const c_void); + } + &WindowKind::Headless(..) => { + gl::load_with(|s| { + HeadlessContext::get_proc_address(s) + }); + } + } } #[cfg(target_os = "android")] - fn load_gl_functions(_: &glutin::Window) { + fn load_gl_functions(_: &WindowKind) { } fn handle_window_event(&self, event: glutin::Event) -> bool { @@ -417,23 +531,30 @@ impl Window { #[cfg(any(target_os = "macos", target_os = "windows"))] fn handle_next_event(&self) -> bool { - let event = match self.window.wait_events().next() { - None => { - warn!("Window event stream closed."); - return false; - }, - Some(event) => event, - }; - let mut close = self.handle_window_event(event); - if !close { - while let Some(event) = self.window.poll_events().next() { - if self.handle_window_event(event) { - close = true; - break + match self.kind { + WindowKind::Window(ref window) => { + let event = match window.wait_events().next() { + None => { + warn!("Window event stream closed."); + return false; + }, + Some(event) => event, + }; + let mut close = self.handle_window_event(event); + if !close { + while let Some(event) = window.poll_events().next() { + if self.handle_window_event(event) { + close = true; + break + } + } } + close + } + WindowKind::Headless(..) => { + false } } - close } #[cfg(any(target_os = "linux", target_os = "android"))] @@ -445,23 +566,30 @@ impl Window { // because it doesn't call X11 functions from another thread, so doesn't // hit the same issues explained below. if opts::get().use_webrender { - let event = match self.window.wait_events().next() { - None => { - warn!("Window event stream closed."); - return false; - }, - Some(event) => event, - }; - let mut close = self.handle_window_event(event); - if !close { - while let Some(event) = self.window.poll_events().next() { - if self.handle_window_event(event) { - close = true; - break + match self.kind { + WindowKind::Window(ref window) => { + let event = match window.wait_events().next() { + None => { + warn!("Window event stream closed."); + return false; + }, + Some(event) => event, + }; + let mut close = self.handle_window_event(event); + if !close { + while let Some(event) = window.poll_events().next() { + if self.handle_window_event(event) { + close = true; + break + } + } } + close + } + WindowKind::Headless(..) => { + false } } - close } else { // TODO(gw): This is an awful hack to work around the // broken way we currently call X11 from multiple threads. @@ -480,14 +608,21 @@ impl Window { // // See https://github.com/servo/servo/issues/5780 // - let first_event = self.window.poll_events().next(); + match self.kind { + WindowKind::Window(ref window) => { + let first_event = window.poll_events().next(); - match first_event { - Some(event) => { - self.handle_window_event(event) + match first_event { + Some(event) => { + self.handle_window_event(event) + } + None => { + thread::sleep(Duration::from_millis(16)); + false + } + } } - None => { - thread::sleep(Duration::from_millis(16)); + WindowKind::Headless(..) => { false } } @@ -504,8 +639,13 @@ impl Window { // polling so that we don't block on a GUI event // such as mouse click. if opts::get().output_file.is_some() || opts::get().exit_after_load || opts::get().headless { - while let Some(event) = self.window.poll_events().next() { - close_event = self.handle_window_event(event) || close_event; + match self.kind { + WindowKind::Window(ref window) => { + while let Some(event) = window.poll_events().next() { + close_event = self.handle_window_event(event) || close_event; + } + } + WindowKind::Headless(..) => {} } } else { close_event = self.handle_next_event(); @@ -671,44 +811,89 @@ fn create_window_proxy(_: &Window) -> Option { #[cfg(not(target_os = "android"))] fn create_window_proxy(window: &Window) -> Option { - Some(window.window.create_window_proxy()) + match window.kind { + WindowKind::Window(ref window) => { + Some(window.create_window_proxy()) + } + WindowKind::Headless(..) => { + None + } + } } impl WindowMethods for Window { fn framebuffer_size(&self) -> TypedSize2D { - let scale_factor = self.window.hidpi_factor() as u32; - // TODO(ajeffrey): can this fail? - let (width, height) = self.window.get_inner_size().expect("Failed to get window inner size."); - TypedSize2D::new(width * scale_factor, height * scale_factor) + match self.kind { + WindowKind::Window(ref window) => { + let scale_factor = window.hidpi_factor() as u32; + // TODO(ajeffrey): can this fail? + let (width, height) = window.get_inner_size().expect("Failed to get window inner size."); + TypedSize2D::new(width * scale_factor, height * scale_factor) + } + WindowKind::Headless(ref context) => { + TypedSize2D::new(context.width, context.height) + } + } } fn size(&self) -> TypedSize2D { - // TODO(ajeffrey): can this fail? - let (width, height) = self.window.get_inner_size().expect("Failed to get window inner size."); - TypedSize2D::new(width as f32, height as f32) + match self.kind { + WindowKind::Window(ref window) => { + // TODO(ajeffrey): can this fail? + let (width, height) = window.get_inner_size().expect("Failed to get window inner size."); + TypedSize2D::new(width as f32, height as f32) + } + WindowKind::Headless(ref context) => { + TypedSize2D::new(context.width as f32, context.height as f32) + } + } } fn client_window(&self) -> (Size2D, Point2D) { - // TODO(ajeffrey): can this fail? - let (width, height) = self.window.get_outer_size().expect("Failed to get window outer size."); - let size = Size2D::new(width, height); - // TODO(ajeffrey): can this fail? - let (x, y) = self.window.get_position().expect("Failed to get window position."); - let origin = Point2D::new(x as i32, y as i32); - (size, origin) + match self.kind { + WindowKind::Window(ref window) => { + // TODO(ajeffrey): can this fail? + let (width, height) = window.get_outer_size().expect("Failed to get window outer size."); + let size = Size2D::new(width, height); + // TODO(ajeffrey): can this fail? + let (x, y) = window.get_position().expect("Failed to get window position."); + let origin = Point2D::new(x as i32, y as i32); + (size, origin) + } + WindowKind::Headless(ref context) => { + let size = TypedSize2D::new(context.width, context.height); + (size, Point2D::zero()) + } + } + } fn set_inner_size(&self, size: Size2D) { - self.window.set_inner_size(size.width as u32, size.height as u32) + match self.kind { + WindowKind::Window(ref window) => { + window.set_inner_size(size.width as u32, size.height as u32) + } + WindowKind::Headless(..) => {} + } } fn set_position(&self, point: Point2D) { - self.window.set_position(point.x, point.y) + match self.kind { + WindowKind::Window(ref window) => { + window.set_position(point.x, point.y) + } + WindowKind::Headless(..) => {} + } } fn present(&self) { - if let Err(err) = self.window.swap_buffers() { - warn!("Failed to swap window buffers ({}).", err); + match self.kind { + WindowKind::Window(ref window) => { + if let Err(err) = window.swap_buffers() { + warn!("Failed to swap window buffers ({}).", err); + } + } + WindowKind::Headless(..) => {} } } @@ -727,7 +912,14 @@ impl WindowMethods for Window { #[cfg(not(target_os = "windows"))] fn scale_factor(&self) -> ScaleFactor { - ScaleFactor::new(self.window.hidpi_factor()) + match self.kind { + WindowKind::Window(ref window) => { + ScaleFactor::new(window.hidpi_factor()) + } + WindowKind::Headless(..) => { + ScaleFactor::new(1.0) + } + } } #[cfg(target_os = "windows")] @@ -738,18 +930,23 @@ impl WindowMethods for Window { } fn set_page_title(&self, title: Option) { - let fallback_title: String = if let Some(ref current_url) = *self.current_url.borrow() { - current_url.to_string() - } else { - String::from("Untitled") - }; + match self.kind { + WindowKind::Window(ref window) => { + let fallback_title: String = if let Some(ref current_url) = *self.current_url.borrow() { + current_url.to_string() + } else { + String::from("Untitled") + }; - let title = match title { - Some(ref title) if title.len() > 0 => &**title, - _ => &fallback_title, - }; - let title = format!("{} - Servo", title); - self.window.set_title(&title); + let title = match title { + Some(ref title) if title.len() > 0 => &**title, + _ => &fallback_title, + }; + let title = format!("{} - Servo", title); + window.set_title(&title); + } + WindowKind::Headless(..) => {} + } } fn set_page_url(&self, url: Url) { @@ -764,7 +961,12 @@ impl WindowMethods for Window { fn load_end(&self, _: bool, _: bool, root: bool) { if root && opts::get().no_native_titlebar { - self.window.show() + match self.kind { + WindowKind::Window(ref window) => { + window.show(); + } + WindowKind::Headless(..) => {} + } } } @@ -776,46 +978,51 @@ impl WindowMethods for Window { /// Has no effect on Android. fn set_cursor(&self, c: Cursor) { - use glutin::MouseCursor; + match self.kind { + WindowKind::Window(ref window) => { + use glutin::MouseCursor; - let glutin_cursor = match c { - Cursor::None => MouseCursor::NoneCursor, - Cursor::Default => MouseCursor::Default, - Cursor::Pointer => MouseCursor::Hand, - Cursor::ContextMenu => MouseCursor::ContextMenu, - Cursor::Help => MouseCursor::Help, - Cursor::Progress => MouseCursor::Progress, - Cursor::Wait => MouseCursor::Wait, - Cursor::Cell => MouseCursor::Cell, - Cursor::Crosshair => MouseCursor::Crosshair, - Cursor::Text => MouseCursor::Text, - Cursor::VerticalText => MouseCursor::VerticalText, - Cursor::Alias => MouseCursor::Alias, - Cursor::Copy => MouseCursor::Copy, - Cursor::Move => MouseCursor::Move, - Cursor::NoDrop => MouseCursor::NoDrop, - Cursor::NotAllowed => MouseCursor::NotAllowed, - Cursor::Grab => MouseCursor::Grab, - Cursor::Grabbing => MouseCursor::Grabbing, - Cursor::EResize => MouseCursor::EResize, - Cursor::NResize => MouseCursor::NResize, - Cursor::NeResize => MouseCursor::NeResize, - Cursor::NwResize => MouseCursor::NwResize, - Cursor::SResize => MouseCursor::SResize, - Cursor::SeResize => MouseCursor::SeResize, - Cursor::SwResize => MouseCursor::SwResize, - Cursor::WResize => MouseCursor::WResize, - Cursor::EwResize => MouseCursor::EwResize, - Cursor::NsResize => MouseCursor::NsResize, - Cursor::NeswResize => MouseCursor::NeswResize, - Cursor::NwseResize => MouseCursor::NwseResize, - Cursor::ColResize => MouseCursor::ColResize, - Cursor::RowResize => MouseCursor::RowResize, - Cursor::AllScroll => MouseCursor::AllScroll, - Cursor::ZoomIn => MouseCursor::ZoomIn, - Cursor::ZoomOut => MouseCursor::ZoomOut, - }; - self.window.set_cursor(glutin_cursor); + let glutin_cursor = match c { + Cursor::None => MouseCursor::NoneCursor, + Cursor::Default => MouseCursor::Default, + Cursor::Pointer => MouseCursor::Hand, + Cursor::ContextMenu => MouseCursor::ContextMenu, + Cursor::Help => MouseCursor::Help, + Cursor::Progress => MouseCursor::Progress, + Cursor::Wait => MouseCursor::Wait, + Cursor::Cell => MouseCursor::Cell, + Cursor::Crosshair => MouseCursor::Crosshair, + Cursor::Text => MouseCursor::Text, + Cursor::VerticalText => MouseCursor::VerticalText, + Cursor::Alias => MouseCursor::Alias, + Cursor::Copy => MouseCursor::Copy, + Cursor::Move => MouseCursor::Move, + Cursor::NoDrop => MouseCursor::NoDrop, + Cursor::NotAllowed => MouseCursor::NotAllowed, + Cursor::Grab => MouseCursor::Grab, + Cursor::Grabbing => MouseCursor::Grabbing, + Cursor::EResize => MouseCursor::EResize, + Cursor::NResize => MouseCursor::NResize, + Cursor::NeResize => MouseCursor::NeResize, + Cursor::NwResize => MouseCursor::NwResize, + Cursor::SResize => MouseCursor::SResize, + Cursor::SeResize => MouseCursor::SeResize, + Cursor::SwResize => MouseCursor::SwResize, + Cursor::WResize => MouseCursor::WResize, + Cursor::EwResize => MouseCursor::EwResize, + Cursor::NsResize => MouseCursor::NsResize, + Cursor::NeswResize => MouseCursor::NeswResize, + Cursor::NwseResize => MouseCursor::NwseResize, + Cursor::ColResize => MouseCursor::ColResize, + Cursor::RowResize => MouseCursor::RowResize, + Cursor::AllScroll => MouseCursor::AllScroll, + Cursor::ZoomIn => MouseCursor::ZoomIn, + Cursor::ZoomOut => MouseCursor::ZoomOut, + }; + window.set_cursor(glutin_cursor); + } + WindowKind::Headless(..) => {} + } } fn set_favicon(&self, _: Url) { @@ -831,7 +1038,14 @@ impl WindowMethods for Window { unsafe { match opts::get().render_api { RenderApi::GL => { - NativeDisplay::new(self.window.platform_display() as *mut xlib::Display) + match self.kind { + WindowKind::Window(ref window) => { + NativeDisplay::new(window.platform_display() as *mut xlib::Display) + } + WindowKind::Headless(..) => { + unreachable!() + } + } }, RenderApi::ES2 => { NativeDisplay::new_egl_display() diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 7c4827f8b62..c6ea363dd05 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -7,6 +7,7 @@ # option. This file may not be copied, modified, or distributed # except according to those terms. +from glob import glob import gzip import itertools import locale @@ -47,6 +48,17 @@ def setlocale(name): locale.setlocale(locale.LC_ALL, saved_locale) +def find_dep_path_newest(package, bin_path): + deps_path = path.join(path.split(bin_path)[0], "build") + with cd(deps_path): + candidates = glob(package + '-*') + candidates = (path.join(deps_path, c) for c in candidates) + candidate_times = sorted(((path.getmtime(c), c) for c in candidates), reverse=True) + if len(candidate_times) > 0: + return candidate_times[0][1] + return None + + def archive_deterministically(dir_to_archive, dest_archive, prepend_path=None): """Create a .tar.gz archive in a deterministic (reproducible) manner. diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index 733ec665cd6..5f40683e19c 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -9,7 +9,6 @@ from __future__ import print_function, unicode_literals -from glob import glob import os import os.path as path import subprocess @@ -23,7 +22,7 @@ from mach.decorators import ( Command, ) -from servo.command_base import CommandBase, cd, call, check_call, is_windows, is_macosx +from servo.command_base import CommandBase, call, check_call, find_dep_path_newest, is_windows, is_macosx def read_file(filename, if_exists=False): @@ -33,18 +32,6 @@ def read_file(filename, if_exists=False): return f.read() -def find_dep_path_newest(package, bin_path): - deps_path = path.join(path.split(bin_path)[0], "build") - with cd(deps_path): - print(os.getcwd()) - candidates = glob(package + '-*') - candidates = (path.join(deps_path, c) for c in candidates) - candidate_times = sorted(((path.getmtime(c), c) for c in candidates), reverse=True) - if len(candidate_times) > 0: - return candidate_times[0][1] - return None - - @CommandProvider class PostBuildCommands(CommandBase): @Command('run', diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 96dfd789bed..fba90a17994 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -25,7 +25,7 @@ from mach.decorators import ( Command, ) -from servo.command_base import CommandBase, call, cd, check_call, host_triple +from servo.command_base import BuildNotFound, CommandBase, call, cd, check_call, find_dep_path_newest, host_triple from wptrunner import wptcommandline from update import updatecommandline from servo_tidy import tidy @@ -413,6 +413,32 @@ class MachCommands(CommandBase): # Helper for test_css and test_wpt: def wptrunner(self, run_file, **kwargs): + # On Linux and mac, find the OSMesa software rendering library and + # add it to the dynamic linker search path. + if sys.platform.startswith('linux'): + try: + args = [self.get_binary_path(True, False)] + osmesa_path = path.join(find_dep_path_newest('osmesa-src', args[0]), "out", "lib", "gallium") + os.environ["LD_LIBRARY_PATH"] = osmesa_path + os.environ["GALLIUM_DRIVER"] = "softpipe" + except BuildNotFound: + # This can occur when cross compiling (e.g. arm64), in which case + # we won't run the tests anyway so can safely ignore this step. + pass + if sys.platform.startswith('darwin'): + try: + args = [self.get_binary_path(True, False)] + osmesa_path = path.join(find_dep_path_newest('osmesa-src', args[0]), + "out", "src", "gallium", "targets", "osmesa", ".libs") + glapi_path = path.join(find_dep_path_newest('osmesa-src', args[0]), + "out", "src", "mapi", "shared-glapi", ".libs") + os.environ["DYLD_LIBRARY_PATH"] = osmesa_path + ":" + glapi_path + os.environ["GALLIUM_DRIVER"] = "softpipe" + except BuildNotFound: + # This can occur when cross compiling (e.g. arm64), in which case + # we won't run the tests anyway so can safely ignore this step. + pass + os.environ["RUST_BACKTRACE"] = "1" kwargs["debug"] = not kwargs["release"] if kwargs.pop("chaos"): diff --git a/tests/wpt/harness/requirements_servo.txt b/tests/wpt/harness/requirements_servo.txt index 22bcfa123a5..d6cd28a8f52 100644 --- a/tests/wpt/harness/requirements_servo.txt +++ b/tests/wpt/harness/requirements_servo.txt @@ -1 +1,3 @@ mozprocess >= 0.19 +Mako >= 1.0.4 + diff --git a/tests/wpt/harness/wptrunner/browsers/servo.py b/tests/wpt/harness/wptrunner/browsers/servo.py index bc90cefcfc9..1ea017377fe 100644 --- a/tests/wpt/harness/wptrunner/browsers/servo.py +++ b/tests/wpt/harness/wptrunner/browsers/servo.py @@ -64,7 +64,7 @@ def render_arg(render_backend): class ServoBrowser(NullBrowser): def __init__(self, logger, binary, debug_info=None, binary_args=None, - user_stylesheets=None, render_backend="cpu"): + user_stylesheets=None, render_backend="webrender"): NullBrowser.__init__(self, logger) self.binary = binary self.debug_info = debug_info diff --git a/tests/wpt/harness/wptrunner/browsers/servodriver.py b/tests/wpt/harness/wptrunner/browsers/servodriver.py index 2c05a4dd505..ab4dc7956b9 100644 --- a/tests/wpt/harness/wptrunner/browsers/servodriver.py +++ b/tests/wpt/harness/wptrunner/browsers/servodriver.py @@ -80,7 +80,7 @@ class ServoWebDriverBrowser(Browser): used_ports = set() def __init__(self, logger, binary, debug_info=None, webdriver_host="127.0.0.1", - user_stylesheets=None, render_backend="cpu"): + user_stylesheets=None, render_backend="webrender"): Browser.__init__(self, logger) self.binary = binary self.webdriver_host = webdriver_host diff --git a/tests/wpt/harness/wptrunner/executors/executorservo.py b/tests/wpt/harness/wptrunner/executors/executorservo.py index ca684d4ef22..15092056a93 100644 --- a/tests/wpt/harness/wptrunner/executors/executorservo.py +++ b/tests/wpt/harness/wptrunner/executors/executorservo.py @@ -222,6 +222,9 @@ class ServoRefTestExecutor(ProcessTestExecutor): if dpi: command += ["--device-pixel-ratio", dpi] + # Run ref tests in headless mode + command += ["-z"] + self.command = debug_args + command env = os.environ.copy() diff --git a/tests/wpt/harness/wptrunner/wptcommandline.py b/tests/wpt/harness/wptrunner/wptcommandline.py index 3b059378e09..c068a69d4f6 100644 --- a/tests/wpt/harness/wptrunner/wptcommandline.py +++ b/tests/wpt/harness/wptrunner/wptcommandline.py @@ -173,7 +173,7 @@ def create_parser(product_choices=None): default=[], action="append", dest="user_stylesheets", help="Inject a user CSS stylesheet into every test.") servo_group.add_argument("--servo-backend", - default="cpu", choices=["cpu", "webrender"], + default="webrender", choices=["cpu", "webrender"], help="Rendering backend to use with Servo.") diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-x.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-x.htm.ini new file mode 100644 index 00000000000..4f828f8bab8 --- /dev/null +++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-x.htm.ini @@ -0,0 +1,4 @@ +[background-repeat-repeat-x.htm] + type: reftest + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-y.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-y.htm.ini new file mode 100644 index 00000000000..354350d036e --- /dev/null +++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-repeat-y.htm.ini @@ -0,0 +1,4 @@ +[background-repeat-repeat-y.htm] + type: reftest + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-round-roundup.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-round-roundup.htm.ini index 098afe4f28c..2f6315c47aa 100644 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-round-roundup.htm.ini +++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-round-roundup.htm.ini @@ -1,3 +1,4 @@ [background-repeat-round-roundup.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-013.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-025.htm.ini similarity index 67% rename from tests/wpt/metadata-css/css21_dev/html4/font-size-013.htm.ini rename to tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-025.htm.ini index 6ed7519cbdf..2bd41b3848e 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-013.htm.ini +++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-025.htm.ini @@ -1,4 +1,4 @@ -[font-size-013.htm] +[background-size-025.htm] type: reftest expected: if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-028.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-028.htm.ini new file mode 100644 index 00000000000..66c4851abcc --- /dev/null +++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-028.htm.ini @@ -0,0 +1,3 @@ +[background-size-028.htm] + type: testharness + expected: FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-030.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-030.htm.ini new file mode 100644 index 00000000000..ecbc488f722 --- /dev/null +++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-030.htm.ini @@ -0,0 +1,3 @@ +[background-size-030.htm] + type: testharness + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-sorting-004.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-contain.htm.ini similarity index 52% rename from tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-sorting-004.htm.ini rename to tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-contain.htm.ini index 7a4c7a4f978..e3d8314d108 100644 --- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-sorting-004.htm.ini +++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-contain.htm.ini @@ -1,3 +1,3 @@ -[transform3d-sorting-004.htm] +[background-size-contain.htm] type: reftest expected: FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-bottom-left-radius-011.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-bottom-left-radius-011.htm.ini deleted file mode 100644 index 3ed81c13387..00000000000 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-bottom-left-radius-011.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[border-bottom-left-radius-011.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-bottom-right-radius-011.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-bottom-right-radius-011.htm.ini deleted file mode 100644 index 816c8c62956..00000000000 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-bottom-right-radius-011.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[border-bottom-right-radius-011.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-radius-horizontal-value-is-zero.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-radius-horizontal-value-is-zero.htm.ini deleted file mode 100644 index 7a0fbe92551..00000000000 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-radius-horizontal-value-is-zero.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[border-radius-horizontal-value-is-zero.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-top-left-radius-011.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-top-left-radius-011.htm.ini deleted file mode 100644 index fddaea2672e..00000000000 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-top-left-radius-011.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[border-top-left-radius-011.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-top-right-radius-011.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-top-right-radius-011.htm.ini deleted file mode 100644 index 3cc787365bc..00000000000 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/border-top-right-radius-011.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[border-top-right-radius-011.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-decor-3_dev/html/text-decoration-line-012.htm.ini b/tests/wpt/metadata-css/css-text-decor-3_dev/html/text-decoration-line-012.htm.ini index 6708c4ef5fb..694b4990354 100644 --- a/tests/wpt/metadata-css/css-text-decor-3_dev/html/text-decoration-line-012.htm.ini +++ b/tests/wpt/metadata-css/css-text-decor-3_dev/html/text-decoration-line-012.htm.ini @@ -1,3 +1,4 @@ [text-decoration-line-012.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filter-grayscale-001.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-rotate-2d-3d-001.htm.ini similarity index 55% rename from tests/wpt/metadata-css/filters-1_dev/html/filter-grayscale-001.htm.ini rename to tests/wpt/metadata-css/css-transforms-1_dev/html/css-rotate-2d-3d-001.htm.ini index 71e4fe702c2..3802e1ecaf9 100644 --- a/tests/wpt/metadata-css/filters-1_dev/html/filter-grayscale-001.htm.ini +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-rotate-2d-3d-001.htm.ini @@ -1,3 +1,3 @@ -[filter-grayscale-001.htm] +[css-rotate-2d-3d-001.htm] type: reftest expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-scale-nested-001.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-scale-nested-001.htm.ini new file mode 100644 index 00000000000..6ed612b76e4 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-scale-nested-001.htm.ini @@ -0,0 +1,3 @@ +[css-scale-nested-001.htm] + type: reftest + expected: CRASH diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-X-negative.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-X-negative.htm.ini new file mode 100644 index 00000000000..427c5d3f807 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-X-negative.htm.ini @@ -0,0 +1,3 @@ +[css-transform-3d-rotate3d-X-negative.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-X-positive.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-X-positive.htm.ini new file mode 100644 index 00000000000..deef20882da --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-X-positive.htm.ini @@ -0,0 +1,3 @@ +[css-transform-3d-rotate3d-X-positive.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-Y-negative.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-Y-negative.htm.ini new file mode 100644 index 00000000000..d621d7c2585 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-Y-negative.htm.ini @@ -0,0 +1,3 @@ +[css-transform-3d-rotate3d-Y-negative.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-Y-positive.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-Y-positive.htm.ini new file mode 100644 index 00000000000..9d6626f21a0 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotate3d-Y-positive.htm.ini @@ -0,0 +1,3 @@ +[css-transform-3d-rotate3d-Y-positive.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateX-negative.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateX-negative.htm.ini new file mode 100644 index 00000000000..072d7e746e8 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateX-negative.htm.ini @@ -0,0 +1,3 @@ +[css-transform-3d-rotateX-negative.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateX-positive.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateX-positive.htm.ini new file mode 100644 index 00000000000..321d493aa9d --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateX-positive.htm.ini @@ -0,0 +1,3 @@ +[css-transform-3d-rotateX-positive.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateY-negative.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateY-negative.htm.ini new file mode 100644 index 00000000000..75d9eb87856 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateY-negative.htm.ini @@ -0,0 +1,3 @@ +[css-transform-3d-rotateY-negative.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateY-positive.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateY-positive.htm.ini new file mode 100644 index 00000000000..bd606003734 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transform-3d-rotateY-positive.htm.ini @@ -0,0 +1,3 @@ +[css-transform-3d-rotateY-positive.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transforms-3d-on-anonymous-block-001.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transforms-3d-on-anonymous-block-001.htm.ini index 09c75600242..605b45575ea 100644 --- a/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transforms-3d-on-anonymous-block-001.htm.ini +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/css-transforms-3d-on-anonymous-block-001.htm.ini @@ -1,2 +1,4 @@ [css-transforms-3d-on-anonymous-block-001.htm] type: reftest + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/perspective-translateZ-negative.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/perspective-translateZ-negative.htm.ini deleted file mode 100644 index 67e18f4d00e..00000000000 --- a/tests/wpt/metadata-css/css-transforms-1_dev/html/perspective-translateZ-negative.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[perspective-translateZ-negative.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/scale-zero-001.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/scale-zero-001.htm.ini new file mode 100644 index 00000000000..8581ed9a834 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/scale-zero-001.htm.ini @@ -0,0 +1,3 @@ +[scale-zero-001.htm] + type: reftest + expected: CRASH diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-014.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-014.htm.ini new file mode 100644 index 00000000000..35ed3719065 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-014.htm.ini @@ -0,0 +1,4 @@ +[transform-input-014.htm] + type: reftest + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-015.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-015.htm.ini new file mode 100644 index 00000000000..30e34b688a6 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-015.htm.ini @@ -0,0 +1,4 @@ +[transform-input-015.htm] + type: reftest + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filter-contrast-002.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini similarity index 55% rename from tests/wpt/metadata-css/filters-1_dev/html/filter-contrast-002.htm.ini rename to tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini index 60b3336d8ac..1c921a68c69 100644 --- a/tests/wpt/metadata-css/filters-1_dev/html/filter-contrast-002.htm.ini +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-017.htm.ini @@ -1,3 +1,3 @@ -[filter-contrast-002.htm] +[transform-input-017.htm] type: reftest expected: FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filter-grayscale-004.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini similarity index 55% rename from tests/wpt/metadata-css/filters-1_dev/html/filter-grayscale-004.htm.ini rename to tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini index e5756339f62..23299ad9e96 100644 --- a/tests/wpt/metadata-css/filters-1_dev/html/filter-grayscale-004.htm.ini +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-018.htm.ini @@ -1,3 +1,3 @@ -[filter-grayscale-004.htm] +[transform-input-018.htm] type: reftest expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-019.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-019.htm.ini new file mode 100644 index 00000000000..e82b6718013 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-input-019.htm.ini @@ -0,0 +1,3 @@ +[transform-input-019.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-singular-001.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-singular-001.htm.ini new file mode 100644 index 00000000000..d292950feee --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-singular-001.htm.ini @@ -0,0 +1,3 @@ +[transform-singular-001.htm] + type: reftest + expected: CRASH diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-table-006.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-table-006.htm.ini new file mode 100644 index 00000000000..c7eff1d8768 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform-table-006.htm.ini @@ -0,0 +1,3 @@ +[transform-table-006.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-perspective-003.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-perspective-003.htm.ini new file mode 100644 index 00000000000..499e9ed9cbd --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-perspective-003.htm.ini @@ -0,0 +1,3 @@ +[transform3d-perspective-003.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-perspective-004.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-perspective-004.htm.ini new file mode 100644 index 00000000000..26b48d4bcd1 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-perspective-004.htm.ini @@ -0,0 +1,3 @@ +[transform3d-perspective-004.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-perspective-005.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-perspective-005.htm.ini new file mode 100644 index 00000000000..5f2b7b06fda --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-perspective-005.htm.ini @@ -0,0 +1,3 @@ +[transform3d-perspective-005.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-scale-004.htm.ini b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-scale-004.htm.ini new file mode 100644 index 00000000000..e978219dd35 --- /dev/null +++ b/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-scale-004.htm.ini @@ -0,0 +1,3 @@ +[transform3d-scale-004.htm] + type: reftest + expected: CRASH diff --git a/tests/wpt/metadata-css/css-transitions-1_dev/html/pseudo-elements-001.htm.ini b/tests/wpt/metadata-css/css-transitions-1_dev/html/pseudo-elements-001.htm.ini index f786f4bc4ac..895b227441a 100644 --- a/tests/wpt/metadata-css/css-transitions-1_dev/html/pseudo-elements-001.htm.ini +++ b/tests/wpt/metadata-css/css-transitions-1_dev/html/pseudo-elements-001.htm.ini @@ -5,3 +5,4 @@ [transition padding-left on :after / values] expected: FAIL + diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-016.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abspos-008.htm.ini similarity index 73% rename from tests/wpt/metadata-css/css21_dev/html4/font-size-016.htm.ini rename to tests/wpt/metadata-css/css21_dev/html4/abspos-008.htm.ini index 7d640c50b85..fcebf4a9594 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-016.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/abspos-008.htm.ini @@ -1,4 +1,4 @@ -[font-size-016.htm] +[abspos-008.htm] type: reftest expected: if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-values-b.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abspos-019.htm.ini similarity index 56% rename from tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-values-b.htm.ini rename to tests/wpt/metadata-css/css21_dev/html4/abspos-019.htm.ini index 4017760afd0..e899657cbfd 100644 --- a/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-values-b.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/abspos-019.htm.ini @@ -1,3 +1,3 @@ -[t425-hsla-values-b.htm] +[abspos-019.htm] type: reftest expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/abspos-020.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abspos-020.htm.ini new file mode 100644 index 00000000000..f631c9486f7 --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/abspos-020.htm.ini @@ -0,0 +1,3 @@ +[abspos-020.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini new file mode 100644 index 00000000000..4f828f8bab8 --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-x.htm.ini @@ -0,0 +1,4 @@ +[background-repeat-repeat-x.htm] + type: reftest + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini new file mode 100644 index 00000000000..354350d036e --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/background-repeat-repeat-y.htm.ini @@ -0,0 +1,4 @@ +[background-repeat-repeat-y.htm] + type: reftest + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-001.htm.ini new file mode 100644 index 00000000000..2201944da6e --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-001.htm.ini @@ -0,0 +1,3 @@ +[border-left-width-applies-to-001.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-002.htm.ini new file mode 100644 index 00000000000..7c71b8d3a74 --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-002.htm.ini @@ -0,0 +1,3 @@ +[border-left-width-applies-to-002.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-003.htm.ini new file mode 100644 index 00000000000..f6f0ca91afb --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/border-left-width-applies-to-003.htm.ini @@ -0,0 +1,3 @@ +[border-left-width-applies-to-003.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-001.htm.ini new file mode 100644 index 00000000000..dfcbb45e21f --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-001.htm.ini @@ -0,0 +1,3 @@ +[border-top-width-applies-to-001.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-002.htm.ini new file mode 100644 index 00000000000..e2236de8651 --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-002.htm.ini @@ -0,0 +1,3 @@ +[border-top-width-applies-to-002.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-003.htm.ini new file mode 100644 index 00000000000..550fa6d7e7d --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/border-top-width-applies-to-003.htm.ini @@ -0,0 +1,3 @@ +[border-top-width-applies-to-003.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5525-fltblck-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5525-fltblck-000.htm.ini new file mode 100644 index 00000000000..560da0512ec --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/c5525-fltblck-000.htm.ini @@ -0,0 +1,4 @@ +[c5525-fltblck-000.htm] + type: reftest + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini deleted file mode 100644 index deef4416853..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-001.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini deleted file mode 100644 index fc9230118ee..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-002.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini deleted file mode 100644 index e7375013226..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-004.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini deleted file mode 100644 index c795ff4514a..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-005.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-023.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-023.htm.ini deleted file mode 100644 index 4e9925ac103..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-023.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-023.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-024.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-024.htm.ini deleted file mode 100644 index daaa6418c8f..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-024.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-024.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-026.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-026.htm.ini deleted file mode 100644 index b67f2870f74..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-026.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-026.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-027.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-027.htm.ini deleted file mode 100644 index 7e172200878..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-027.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-027.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-034.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-034.htm.ini deleted file mode 100644 index 91f2b9ecad0..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-034.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-034.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-035.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-035.htm.ini deleted file mode 100644 index 96b3e223b68..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-035.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-035.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-037.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-037.htm.ini deleted file mode 100644 index 0f60ab0cf27..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-037.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-037.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-038.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-038.htm.ini deleted file mode 100644 index 6d491a1532c..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-038.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-038.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-045.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-045.htm.ini deleted file mode 100644 index f1de6acbb4a..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-045.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-045.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-046.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-046.htm.ini deleted file mode 100644 index 690080e380b..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-046.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-046.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-048.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-048.htm.ini deleted file mode 100644 index 7b231298c79..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-048.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-048.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-049.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-049.htm.ini deleted file mode 100644 index 6078b860bb3..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-049.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-049.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-056.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-056.htm.ini deleted file mode 100644 index bcbd4b350d5..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-056.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-056.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-057.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-057.htm.ini deleted file mode 100644 index 320cdf64286..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-057.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-057.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-059.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-059.htm.ini deleted file mode 100644 index 01469a0846d..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-059.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-059.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-060.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-060.htm.ini deleted file mode 100644 index c55927a5522..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-060.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-060.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-067.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-067.htm.ini deleted file mode 100644 index e78ea454c2f..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-067.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-067.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-068.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-068.htm.ini deleted file mode 100644 index 2d062f3eb49..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-068.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-068.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-070.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-070.htm.ini deleted file mode 100644 index 9777488ea44..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-070.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-070.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-071.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-071.htm.ini deleted file mode 100644 index 0018a7d2574..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-071.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-071.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-078.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-078.htm.ini deleted file mode 100644 index 34a42434072..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-078.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-078.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-079.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-079.htm.ini deleted file mode 100644 index bc19ff41dbd..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-079.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-079.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-081.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-081.htm.ini deleted file mode 100644 index 4aab55bdcd8..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-081.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-081.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-082.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-082.htm.ini deleted file mode 100644 index 944a4faa07d..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-082.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-082.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini deleted file mode 100644 index 778e5040570..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-089.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini deleted file mode 100644 index cee1000c0ff..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-090.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini deleted file mode 100644 index 556fee70a0a..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-092.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini deleted file mode 100644 index 796ac0041af..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-093.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini deleted file mode 100644 index 7b6e4078b05..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-100.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini deleted file mode 100644 index b9f8127516f..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-101.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini deleted file mode 100644 index 1c0291c692b..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[font-size-102.htm] - type: reftest - expected: - if os == "mac": PASS - FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-zero-1.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-zero-1.htm.ini deleted file mode 100644 index 3574c4793e1..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-zero-1.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-zero-1.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-zero-2.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-zero-2.htm.ini deleted file mode 100644 index fa3bda4ec1a..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-zero-2.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[font-size-zero-2.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/painting-order-underline-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/painting-order-underline-001.htm.ini new file mode 100644 index 00000000000..d15121603e5 --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/painting-order-underline-001.htm.ini @@ -0,0 +1,4 @@ +[painting-order-underline-001.htm] + type: reftest + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/pseudo-elements-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/pseudo-elements-001.htm.ini index f786f4bc4ac..895b227441a 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/pseudo-elements-001.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/pseudo-elements-001.htm.ini @@ -5,3 +5,4 @@ [transition padding-left on :after / values] expected: FAIL + diff --git a/tests/wpt/metadata-css/css21_dev/html4/root-box-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/root-box-003.htm.ini index c65c5b6cadb..3143cf72d07 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/root-box-003.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/root-box-003.htm.ini @@ -1,3 +1,3 @@ [root-box-003.htm] type: reftest - expected: FAIL + expected: TIMEOUT diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-cover.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-115.htm.ini similarity index 61% rename from tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-cover.htm.ini rename to tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-115.htm.ini index e965ab0dfde..3d8394340bd 100644 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-cover.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-115.htm.ini @@ -1,4 +1,4 @@ -[background-size-cover.htm] +[table-anonymous-objects-115.htm] type: reftest expected: if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-116.htm.ini similarity index 61% rename from tests/wpt/metadata-css/css21_dev/html4/font-size-015.htm.ini rename to tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-116.htm.ini index c544b0466f6..8a91903002f 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-015.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-116.htm.ini @@ -1,4 +1,4 @@ -[font-size-015.htm] +[table-anonymous-objects-116.htm] type: reftest expected: if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-121.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-121.htm.ini new file mode 100644 index 00000000000..66a75b9a7ce --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-121.htm.ini @@ -0,0 +1,4 @@ +[table-anonymous-objects-121.htm] + type: reftest + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-122.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-122.htm.ini new file mode 100644 index 00000000000..4d53a9941b4 --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-122.htm.ini @@ -0,0 +1,4 @@ +[table-anonymous-objects-122.htm] + type: reftest + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-173.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-173.htm.ini new file mode 100644 index 00000000000..3e58a46acbc --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-173.htm.ini @@ -0,0 +1,4 @@ +[table-anonymous-objects-173.htm] + type: reftest + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-174.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-174.htm.ini new file mode 100644 index 00000000000..7509b21ada7 --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-174.htm.ini @@ -0,0 +1,4 @@ +[table-anonymous-objects-174.htm] + type: reftest + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-175.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-175.htm.ini new file mode 100644 index 00000000000..ff5fd329956 --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-175.htm.ini @@ -0,0 +1,4 @@ +[table-anonymous-objects-175.htm] + type: reftest + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-176.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-176.htm.ini new file mode 100644 index 00000000000..f685e743053 --- /dev/null +++ b/tests/wpt/metadata-css/css21_dev/html4/table-anonymous-objects-176.htm.ini @@ -0,0 +1,4 @@ +[table-anonymous-objects-176.htm] + type: reftest + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-blur.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-blur.htm.ini deleted file mode 100644 index 142337d2d39..00000000000 --- a/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-blur.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css-filters-animation-blur.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-brightness.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-brightness.htm.ini index ee26622e1e9..121b2598fe6 100644 --- a/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-brightness.htm.ini +++ b/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-brightness.htm.ini @@ -1,3 +1,3 @@ [css-filters-animation-brightness.htm] type: reftest - expected: FAIL + expected: CRASH diff --git a/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-combined-001.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-combined-001.htm.ini deleted file mode 100644 index 28deb704c45..00000000000 --- a/tests/wpt/metadata-css/filters-1_dev/html/css-filters-animation-combined-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css-filters-animation-combined-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filter-contrast-003.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filter-contrast-003.htm.ini index 35baf0187a8..2d2f45594ad 100644 --- a/tests/wpt/metadata-css/filters-1_dev/html/filter-contrast-003.htm.ini +++ b/tests/wpt/metadata-css/filters-1_dev/html/filter-contrast-003.htm.ini @@ -1,3 +1,3 @@ [filter-contrast-003.htm] - type: reftest + type: testharness expected: FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filter-invert-001-test.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filter-invert-001-test.htm.ini deleted file mode 100644 index 35297feab35..00000000000 --- a/tests/wpt/metadata-css/filters-1_dev/html/filter-invert-001-test.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[filter-invert-001-test.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filter-invert-002-test.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filter-invert-002-test.htm.ini deleted file mode 100644 index 1388cf8cfef..00000000000 --- a/tests/wpt/metadata-css/filters-1_dev/html/filter-invert-002-test.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[filter-invert-002-test.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-sorting-002.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filter-saturate-001-test.htm.ini similarity index 51% rename from tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-sorting-002.htm.ini rename to tests/wpt/metadata-css/filters-1_dev/html/filter-saturate-001-test.htm.ini index 649447b9d66..43197c5b837 100644 --- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-sorting-002.htm.ini +++ b/tests/wpt/metadata-css/filters-1_dev/html/filter-saturate-001-test.htm.ini @@ -1,3 +1,3 @@ -[transform3d-sorting-002.htm] +[filter-saturate-001-test.htm] type: reftest expected: FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filters-grayscale-001-test.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filters-grayscale-001-test.htm.ini deleted file mode 100644 index f7ee1c8051e..00000000000 --- a/tests/wpt/metadata-css/filters-1_dev/html/filters-grayscale-001-test.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[filters-grayscale-001-test.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filters-sepia-001-test.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filters-sepia-001-test.htm.ini deleted file mode 100644 index 33cbc58027e..00000000000 --- a/tests/wpt/metadata-css/filters-1_dev/html/filters-sepia-001-test.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[filters-sepia-001-test.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-001.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-001.htm.ini new file mode 100644 index 00000000000..aad56d32579 --- /dev/null +++ b/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-001.htm.ini @@ -0,0 +1,3 @@ +[filters-test-brightness-001.htm] + type: reftest + expected: CRASH diff --git a/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-002.htm.ini b/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-002.htm.ini new file mode 100644 index 00000000000..5f60bdd1db3 --- /dev/null +++ b/tests/wpt/metadata-css/filters-1_dev/html/filters-test-brightness-002.htm.ini @@ -0,0 +1,3 @@ +[filters-test-brightness-002.htm] + type: reftest + expected: CRASH diff --git a/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini index 3d6b19f8d72..4aedd0a31e6 100644 --- a/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini @@ -1,23 +1,3 @@ [send-entity-body-document.htm] type: testharness - [XML document, windows-1252] - expected: FAIL - - [HTML document, invalid UTF-8] - expected: FAIL - - [HTML document, shift-jis] - expected: FAIL - - [plain text file] - expected: FAIL - - [image file] - expected: FAIL - - [img tag] - expected: FAIL - - [empty div] - expected: FAIL - + disabled: https://github.com/servo/servo/issues/9490 diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/001.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/001.html.ini index 74b62c078df..86c15b26af0 100644 --- a/tests/wpt/metadata/html/browsers/history/the-history-interface/001.html.ini +++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/001.html.ini @@ -34,6 +34,9 @@ [pushState must not be allowed to create cross-origin URLs (data:URI)] expected: FAIL + [pushState should not actually load the new URL] + expected: FAIL + [security errors are expected to be thrown in the context of the document that owns the history object] expected: FAIL diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/002.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/002.html.ini index 57fa69ebb97..c8350da8e2e 100644 --- a/tests/wpt/metadata/html/browsers/history/the-history-interface/002.html.ini +++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/002.html.ini @@ -67,6 +67,9 @@ [replaceState must not be able to use an error object as data] expected: FAIL + [replaceState should not actually load the new URL] + expected: FAIL + [security errors are expected to be thrown in the context of the document that owns the history object (2)] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-bindAttribLocation-aliasing.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-bindAttribLocation-aliasing.html.ini new file mode 100644 index 00000000000..4a283182df8 --- /dev/null +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-bindAttribLocation-aliasing.html.ini @@ -0,0 +1,770 @@ +[gl-bindAttribLocation-aliasing.html] + type: testharness + [WebGL test #1: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #2: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #3: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #4: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #5: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #6: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #7: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #8: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #9: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #10: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #11: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #12: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #13: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #14: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #15: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #16: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #18: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #19: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #20: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #21: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #22: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #23: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #24: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #25: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #26: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #27: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #28: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #29: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #30: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #31: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #32: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #33: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #35: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #36: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #37: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #38: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #39: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #40: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #41: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #42: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #43: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #44: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #45: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #46: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #47: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #48: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #49: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #50: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #52: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #53: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #54: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #55: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #56: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #57: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #58: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #59: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #60: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #61: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #62: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #63: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #64: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #65: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #66: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #67: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #69: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #70: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #71: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #72: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #73: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #74: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #75: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #76: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #77: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #78: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #79: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #80: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #81: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #82: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #83: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #84: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #86: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #87: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #88: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #89: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #90: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #91: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #92: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #93: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #94: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #95: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #96: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #97: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #98: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #99: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #100: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #101: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #103: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #104: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #105: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #106: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #107: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #108: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #109: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #110: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #111: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #112: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #113: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #114: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #115: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #116: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #117: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #118: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #120: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #121: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #122: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #123: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #124: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #125: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #126: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #127: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #128: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #129: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #130: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #131: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #132: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #133: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #134: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #135: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #137: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #138: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #139: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #140: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #141: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #142: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #143: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #144: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #145: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #146: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #147: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #148: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #149: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #150: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #151: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #152: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #154: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #155: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #156: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #157: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #158: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #159: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #160: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #161: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #162: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #163: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #164: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #165: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #166: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #167: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #168: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #169: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #171: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #172: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #173: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #174: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #175: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #176: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #177: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #178: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #179: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #180: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #181: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #182: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #183: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #184: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #185: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #186: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #188: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #189: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #190: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #191: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #192: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #193: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #194: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #195: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #196: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #197: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #198: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #199: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #200: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #201: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #202: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #203: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #205: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #206: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #207: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #208: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #209: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #210: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #211: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #212: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #213: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #214: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #215: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #216: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #217: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #218: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #219: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #220: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #222: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #223: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #224: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #225: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #226: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #227: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #228: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #229: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #230: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #231: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #232: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #233: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #234: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #235: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #236: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #237: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #239: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #240: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #241: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #242: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #243: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #244: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #245: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #246: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #247: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #248: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #249: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #250: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #251: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #252: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #253: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #254: Link should fail when both types are aliased to location 15] + expected: FAIL + + [WebGL test #256: Link should fail when both types are aliased to location 0] + expected: FAIL + + [WebGL test #257: Link should fail when both types are aliased to location 1] + expected: FAIL + + [WebGL test #258: Link should fail when both types are aliased to location 2] + expected: FAIL + + [WebGL test #259: Link should fail when both types are aliased to location 3] + expected: FAIL + + [WebGL test #260: Link should fail when both types are aliased to location 4] + expected: FAIL + + [WebGL test #261: Link should fail when both types are aliased to location 5] + expected: FAIL + + [WebGL test #262: Link should fail when both types are aliased to location 6] + expected: FAIL + + [WebGL test #263: Link should fail when both types are aliased to location 7] + expected: FAIL + + [WebGL test #264: Link should fail when both types are aliased to location 8] + expected: FAIL + + [WebGL test #265: Link should fail when both types are aliased to location 9] + expected: FAIL + + [WebGL test #266: Link should fail when both types are aliased to location 10] + expected: FAIL + + [WebGL test #267: Link should fail when both types are aliased to location 11] + expected: FAIL + + [WebGL test #268: Link should fail when both types are aliased to location 12] + expected: FAIL + + [WebGL test #269: Link should fail when both types are aliased to location 13] + expected: FAIL + + [WebGL test #270: Link should fail when both types are aliased to location 14] + expected: FAIL + + [WebGL test #271: Link should fail when both types are aliased to location 15] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-bindAttribLocation-matrix.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-bindAttribLocation-matrix.html.ini new file mode 100644 index 00000000000..4e12c662099 --- /dev/null +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-bindAttribLocation-matrix.html.ini @@ -0,0 +1,347 @@ +[gl-bindAttribLocation-matrix.html] + type: testharness + [WebGL test #1: Matrix with location 0 and vector with location 0 should not link.] + expected: FAIL + + [WebGL test #2: Matrix with location 0 and vector with location 1 should not link.] + expected: FAIL + + [WebGL test #4: Matrix with location 1 and vector with location 1 should not link.] + expected: FAIL + + [WebGL test #5: Matrix with location 1 and vector with location 2 should not link.] + expected: FAIL + + [WebGL test #7: Matrix with location 2 and vector with location 2 should not link.] + expected: FAIL + + [WebGL test #8: Matrix with location 2 and vector with location 3 should not link.] + expected: FAIL + + [WebGL test #10: Matrix with location 3 and vector with location 3 should not link.] + expected: FAIL + + [WebGL test #11: Matrix with location 3 and vector with location 4 should not link.] + expected: FAIL + + [WebGL test #13: Matrix with location 4 and vector with location 4 should not link.] + expected: FAIL + + [WebGL test #14: Matrix with location 4 and vector with location 5 should not link.] + expected: FAIL + + [WebGL test #16: Matrix with location 5 and vector with location 5 should not link.] + expected: FAIL + + [WebGL test #17: Matrix with location 5 and vector with location 6 should not link.] + expected: FAIL + + [WebGL test #19: Matrix with location 6 and vector with location 6 should not link.] + expected: FAIL + + [WebGL test #20: Matrix with location 6 and vector with location 7 should not link.] + expected: FAIL + + [WebGL test #22: Matrix with location 7 and vector with location 7 should not link.] + expected: FAIL + + [WebGL test #23: Matrix with location 7 and vector with location 8 should not link.] + expected: FAIL + + [WebGL test #25: Matrix with location 8 and vector with location 8 should not link.] + expected: FAIL + + [WebGL test #26: Matrix with location 8 and vector with location 9 should not link.] + expected: FAIL + + [WebGL test #28: Matrix with location 9 and vector with location 9 should not link.] + expected: FAIL + + [WebGL test #29: Matrix with location 9 and vector with location 10 should not link.] + expected: FAIL + + [WebGL test #31: Matrix with location 10 and vector with location 10 should not link.] + expected: FAIL + + [WebGL test #32: Matrix with location 10 and vector with location 11 should not link.] + expected: FAIL + + [WebGL test #34: Matrix with location 11 and vector with location 11 should not link.] + expected: FAIL + + [WebGL test #35: Matrix with location 11 and vector with location 12 should not link.] + expected: FAIL + + [WebGL test #37: Matrix with location 12 and vector with location 12 should not link.] + expected: FAIL + + [WebGL test #38: Matrix with location 12 and vector with location 13 should not link.] + expected: FAIL + + [WebGL test #40: Matrix with location 13 and vector with location 13 should not link.] + expected: FAIL + + [WebGL test #41: Matrix with location 13 and vector with location 14 should not link.] + expected: FAIL + + [WebGL test #43: Matrix with location 0 and vector with location 0 should not link.] + expected: FAIL + + [WebGL test #44: Matrix with location 0 and vector with location 1 should not link.] + expected: FAIL + + [WebGL test #45: Matrix with location 0 and vector with location 2 should not link.] + expected: FAIL + + [WebGL test #47: Matrix with location 1 and vector with location 1 should not link.] + expected: FAIL + + [WebGL test #48: Matrix with location 1 and vector with location 2 should not link.] + expected: FAIL + + [WebGL test #49: Matrix with location 1 and vector with location 3 should not link.] + expected: FAIL + + [WebGL test #51: Matrix with location 2 and vector with location 2 should not link.] + expected: FAIL + + [WebGL test #52: Matrix with location 2 and vector with location 3 should not link.] + expected: FAIL + + [WebGL test #53: Matrix with location 2 and vector with location 4 should not link.] + expected: FAIL + + [WebGL test #55: Matrix with location 3 and vector with location 3 should not link.] + expected: FAIL + + [WebGL test #56: Matrix with location 3 and vector with location 4 should not link.] + expected: FAIL + + [WebGL test #57: Matrix with location 3 and vector with location 5 should not link.] + expected: FAIL + + [WebGL test #59: Matrix with location 4 and vector with location 4 should not link.] + expected: FAIL + + [WebGL test #60: Matrix with location 4 and vector with location 5 should not link.] + expected: FAIL + + [WebGL test #61: Matrix with location 4 and vector with location 6 should not link.] + expected: FAIL + + [WebGL test #63: Matrix with location 5 and vector with location 5 should not link.] + expected: FAIL + + [WebGL test #64: Matrix with location 5 and vector with location 6 should not link.] + expected: FAIL + + [WebGL test #65: Matrix with location 5 and vector with location 7 should not link.] + expected: FAIL + + [WebGL test #67: Matrix with location 6 and vector with location 6 should not link.] + expected: FAIL + + [WebGL test #68: Matrix with location 6 and vector with location 7 should not link.] + expected: FAIL + + [WebGL test #69: Matrix with location 6 and vector with location 8 should not link.] + expected: FAIL + + [WebGL test #71: Matrix with location 7 and vector with location 7 should not link.] + expected: FAIL + + [WebGL test #72: Matrix with location 7 and vector with location 8 should not link.] + expected: FAIL + + [WebGL test #73: Matrix with location 7 and vector with location 9 should not link.] + expected: FAIL + + [WebGL test #75: Matrix with location 8 and vector with location 8 should not link.] + expected: FAIL + + [WebGL test #76: Matrix with location 8 and vector with location 9 should not link.] + expected: FAIL + + [WebGL test #77: Matrix with location 8 and vector with location 10 should not link.] + expected: FAIL + + [WebGL test #79: Matrix with location 9 and vector with location 9 should not link.] + expected: FAIL + + [WebGL test #80: Matrix with location 9 and vector with location 10 should not link.] + expected: FAIL + + [WebGL test #81: Matrix with location 9 and vector with location 11 should not link.] + expected: FAIL + + [WebGL test #83: Matrix with location 10 and vector with location 10 should not link.] + expected: FAIL + + [WebGL test #84: Matrix with location 10 and vector with location 11 should not link.] + expected: FAIL + + [WebGL test #85: Matrix with location 10 and vector with location 12 should not link.] + expected: FAIL + + [WebGL test #87: Matrix with location 11 and vector with location 11 should not link.] + expected: FAIL + + [WebGL test #88: Matrix with location 11 and vector with location 12 should not link.] + expected: FAIL + + [WebGL test #89: Matrix with location 11 and vector with location 13 should not link.] + expected: FAIL + + [WebGL test #91: Matrix with location 12 and vector with location 12 should not link.] + expected: FAIL + + [WebGL test #92: Matrix with location 12 and vector with location 13 should not link.] + expected: FAIL + + [WebGL test #93: Matrix with location 12 and vector with location 14 should not link.] + expected: FAIL + + [WebGL test #95: Matrix with location 0 and vector with location 0 should not link.] + expected: FAIL + + [WebGL test #96: Matrix with location 0 and vector with location 1 should not link.] + expected: FAIL + + [WebGL test #97: Matrix with location 0 and vector with location 2 should not link.] + expected: FAIL + + [WebGL test #98: Matrix with location 0 and vector with location 3 should not link.] + expected: FAIL + + [WebGL test #100: Matrix with location 1 and vector with location 1 should not link.] + expected: FAIL + + [WebGL test #101: Matrix with location 1 and vector with location 2 should not link.] + expected: FAIL + + [WebGL test #102: Matrix with location 1 and vector with location 3 should not link.] + expected: FAIL + + [WebGL test #103: Matrix with location 1 and vector with location 4 should not link.] + expected: FAIL + + [WebGL test #105: Matrix with location 2 and vector with location 2 should not link.] + expected: FAIL + + [WebGL test #106: Matrix with location 2 and vector with location 3 should not link.] + expected: FAIL + + [WebGL test #107: Matrix with location 2 and vector with location 4 should not link.] + expected: FAIL + + [WebGL test #108: Matrix with location 2 and vector with location 5 should not link.] + expected: FAIL + + [WebGL test #110: Matrix with location 3 and vector with location 3 should not link.] + expected: FAIL + + [WebGL test #111: Matrix with location 3 and vector with location 4 should not link.] + expected: FAIL + + [WebGL test #112: Matrix with location 3 and vector with location 5 should not link.] + expected: FAIL + + [WebGL test #113: Matrix with location 3 and vector with location 6 should not link.] + expected: FAIL + + [WebGL test #115: Matrix with location 4 and vector with location 4 should not link.] + expected: FAIL + + [WebGL test #116: Matrix with location 4 and vector with location 5 should not link.] + expected: FAIL + + [WebGL test #117: Matrix with location 4 and vector with location 6 should not link.] + expected: FAIL + + [WebGL test #118: Matrix with location 4 and vector with location 7 should not link.] + expected: FAIL + + [WebGL test #120: Matrix with location 5 and vector with location 5 should not link.] + expected: FAIL + + [WebGL test #121: Matrix with location 5 and vector with location 6 should not link.] + expected: FAIL + + [WebGL test #122: Matrix with location 5 and vector with location 7 should not link.] + expected: FAIL + + [WebGL test #123: Matrix with location 5 and vector with location 8 should not link.] + expected: FAIL + + [WebGL test #125: Matrix with location 6 and vector with location 6 should not link.] + expected: FAIL + + [WebGL test #126: Matrix with location 6 and vector with location 7 should not link.] + expected: FAIL + + [WebGL test #127: Matrix with location 6 and vector with location 8 should not link.] + expected: FAIL + + [WebGL test #128: Matrix with location 6 and vector with location 9 should not link.] + expected: FAIL + + [WebGL test #130: Matrix with location 7 and vector with location 7 should not link.] + expected: FAIL + + [WebGL test #131: Matrix with location 7 and vector with location 8 should not link.] + expected: FAIL + + [WebGL test #132: Matrix with location 7 and vector with location 9 should not link.] + expected: FAIL + + [WebGL test #133: Matrix with location 7 and vector with location 10 should not link.] + expected: FAIL + + [WebGL test #135: Matrix with location 8 and vector with location 8 should not link.] + expected: FAIL + + [WebGL test #136: Matrix with location 8 and vector with location 9 should not link.] + expected: FAIL + + [WebGL test #137: Matrix with location 8 and vector with location 10 should not link.] + expected: FAIL + + [WebGL test #138: Matrix with location 8 and vector with location 11 should not link.] + expected: FAIL + + [WebGL test #140: Matrix with location 9 and vector with location 9 should not link.] + expected: FAIL + + [WebGL test #141: Matrix with location 9 and vector with location 10 should not link.] + expected: FAIL + + [WebGL test #142: Matrix with location 9 and vector with location 11 should not link.] + expected: FAIL + + [WebGL test #143: Matrix with location 9 and vector with location 12 should not link.] + expected: FAIL + + [WebGL test #145: Matrix with location 10 and vector with location 10 should not link.] + expected: FAIL + + [WebGL test #146: Matrix with location 10 and vector with location 11 should not link.] + expected: FAIL + + [WebGL test #147: Matrix with location 10 and vector with location 12 should not link.] + expected: FAIL + + [WebGL test #148: Matrix with location 10 and vector with location 13 should not link.] + expected: FAIL + + [WebGL test #150: Matrix with location 11 and vector with location 11 should not link.] + expected: FAIL + + [WebGL test #151: Matrix with location 11 and vector with location 12 should not link.] + expected: FAIL + + [WebGL test #152: Matrix with location 11 and vector with location 13 should not link.] + expected: FAIL + + [WebGL test #153: Matrix with location 11 and vector with location 14 should not link.] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-disabled-vertex-attrib.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-disabled-vertex-attrib.html.ini index b6bfc0e81f1..610dd02ca7f 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-disabled-vertex-attrib.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-disabled-vertex-attrib.html.ini @@ -4,3 +4,6 @@ expected: if os == "mac": FAIL + [WebGL test #15: at (0, 0) expected: 0,255,0,255 was 255,0,0,255] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini index 5561797ccd9..f56805c97f3 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini @@ -2,7 +2,7 @@ type: testharness expected: if os == "linux": TIMEOUT - if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): ERROR + if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "webrender"): ERROR [WebGL test #9: gl.isShader(vertexShader) should be true. Threw exception TypeError: gl.isShader is not a function] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html.ini index 1b4eefa2449..73a2e36675d 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html.ini @@ -3,3 +3,6 @@ [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL + [WebGL test #5: at (16, 0) expected: 0,0,0,0 was 0,255,0,255] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini index 60adada9d97..233a86900b8 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini @@ -48,3 +48,150 @@ [WebGL test #83: context does not exist] expected: FAIL + [WebGL test #2: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #3: at (48, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #4: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #5: at (0, 96) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #7: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #8: at (24, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #9: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #10: at (0, 24) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #12: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #13: at (12, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #14: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #15: at (0, 48) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #17: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #19: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #23: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #24: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #25: at (0, 96) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #27: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #28: at (48, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #30: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #32: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #34: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #35: at (0, 96) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #37: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #38: at (48, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #39: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #42: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #44: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #47: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #48: at (40, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #49: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #50: at (0, 88) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #52: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #53: at (44, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #54: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #55: at (0, 80) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #57: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #59: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #63: at (32, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #64: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #65: at (0, 96) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #67: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #68: at (24, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #70: at (0, 64) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #73: at (32, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #74: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #75: at (0, 48) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #77: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #80: at (0, 64) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/negative-one-index.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/negative-one-index.html.ini index badd4525287..8595b8d5ae3 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/negative-one-index.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/negative-one-index.html.ini @@ -3,3 +3,9 @@ [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL + [WebGL test #0: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #2: at (0, 49) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/simple.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/simple.html.ini index 8063f25fe73..0f65f4fa3c1 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/simple.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/simple.html.ini @@ -6,3 +6,6 @@ [WebGL test #2: getError expected: NO_ERROR. Was INVALID_ENUM : there should be no errors] expected: FAIL + [WebGL test #0: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/triangle.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/triangle.html.ini index 51567cc68bf..c29e8c99b9a 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/triangle.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/triangle.html.ini @@ -3,3 +3,9 @@ [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL + [WebGL test #0: at (0, 0) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + + [WebGL test #2: at (0, 49) expected: 0,0,0,0 was 153,153,153,255] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgb565.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgb565.html.ini index fa018f5a0a2..7e5c39a8d6f 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgb565.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgb565.html.ini @@ -6,3 +6,6 @@ [WebGL test #0: at (0, 0) expected: 0,255,0,255 was 0,28,255,255] expected: FAIL + [WebGL test #0: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgba5551.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgba5551.html.ini index 639a34ba9d4..8e314c9e6b6 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgba5551.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgba5551.html.ini @@ -9,3 +9,6 @@ [WebGL test #0: at (0, 0) expected: 0,255,0,255 was 0,25,255,255] expected: FAIL + [WebGL test #0: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image.html.ini index d3d276dcd60..02c340cacb1 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image.html.ini @@ -3,3 +3,6 @@ [WebGL test #0: at (4, 4) expected: 0,255,0 was 255,0,0] expected: FAIL + [WebGL test #0: at (4, 4) expected: 0,255,0 was 0,0,0] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html.ini index d085d3caa20..8baa4869dcf 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html.ini @@ -3,3 +3,6 @@ [WebGL test #0: at (0, 0) expected: 255,0,0 was 255,227,0] expected: FAIL + [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,0,0] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html.ini index 8b2d2f9f05a..18a20f6fb7f 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html.ini @@ -3,3 +3,6 @@ [WebGL test #0: at (0, 0) expected: 255,0,0 was 255,255,0] expected: FAIL + [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,0,0] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html.ini index df755efeb59..11a836cd9e4 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html.ini @@ -6,3 +6,6 @@ [WebGL test #0: at (0, 0) expected: 255,0,0 was 255,230,0] expected: FAIL + [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,0,0] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html.ini index 452f122b752..7909dba022d 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html.ini @@ -3,3 +3,6 @@ [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,255,0] expected: FAIL + [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,0,0] + expected: FAIL + diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-webgl.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-webgl.html.ini index 0a51acfd229..5f5c59cb100 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-webgl.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-webgl.html.ini @@ -9,3 +9,12 @@ [WebGL test #3: at (1, 0) expected: 0,255,0,255 was 255,0,255,255] expected: FAIL + [WebGL test #3: at (0, 0) expected: 0,255,0,255 was 0,0,0,255] + expected: FAIL + + [WebGL test #4: at (0, 0) expected: 0,0,255,255 was 0,0,0,255] + expected: FAIL + + [WebGL test #2: at (0, 0) expected: 255,0,0,255 was 0,0,0,255] + expected: FAIL + diff --git a/tests/wpt/mozilla/meta/css/acid2_noscroll.html.ini b/tests/wpt/mozilla/meta/css/acid2_noscroll.html.ini new file mode 100644 index 00000000000..bd8c17817cc --- /dev/null +++ b/tests/wpt/mozilla/meta/css/acid2_noscroll.html.ini @@ -0,0 +1,3 @@ +[acid2_noscroll.html] + type: reftest + expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/blur_a.html.ini b/tests/wpt/mozilla/meta/css/blur_a.html.ini new file mode 100644 index 00000000000..ef40355e47a --- /dev/null +++ b/tests/wpt/mozilla/meta/css/blur_a.html.ini @@ -0,0 +1,3 @@ +[blur_a.html] + type: reftest + expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/border_black_ridge_a.html.ini b/tests/wpt/mozilla/meta/css/border_black_ridge_a.html.ini new file mode 100644 index 00000000000..9b22dd76823 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/border_black_ridge_a.html.ini @@ -0,0 +1,3 @@ +[border_black_ridge_a.html] + type: reftest + expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/border_radius_elliptical_a.html.ini b/tests/wpt/mozilla/meta/css/border_radius_elliptical_a.html.ini new file mode 100644 index 00000000000..e2be30c3f1c --- /dev/null +++ b/tests/wpt/mozilla/meta/css/border_radius_elliptical_a.html.ini @@ -0,0 +1,4 @@ +[border_radius_elliptical_a.html] + type: reftest + expected: + if os == "mac": FAIL diff --git a/tests/wpt/mozilla/meta/css/border_radius_zero_sizes_a.html.ini b/tests/wpt/mozilla/meta/css/border_radius_zero_sizes_a.html.ini new file mode 100644 index 00000000000..7ce4f1d5bd2 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/border_radius_zero_sizes_a.html.ini @@ -0,0 +1,3 @@ +[border_radius_zero_sizes_a.html] + type: reftest + expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/borders_a.html.ini b/tests/wpt/mozilla/meta/css/borders_a.html.ini new file mode 100644 index 00000000000..6d2949aab46 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/borders_a.html.ini @@ -0,0 +1,3 @@ +[borders_a.html] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-sorting-003.htm.ini b/tests/wpt/mozilla/meta/css/canvas_linear_gradient_a.html.ini similarity index 50% rename from tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-sorting-003.htm.ini rename to tests/wpt/mozilla/meta/css/canvas_linear_gradient_a.html.ini index d300b088b84..83fbcd03a0c 100644 --- a/tests/wpt/metadata-css/css-transforms-1_dev/html/transform3d-sorting-003.htm.ini +++ b/tests/wpt/mozilla/meta/css/canvas_linear_gradient_a.html.ini @@ -1,3 +1,3 @@ -[transform3d-sorting-003.htm] +[canvas_linear_gradient_a.html] type: reftest expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/filter_sepia_a.html.ini b/tests/wpt/mozilla/meta/css/filter_sepia_a.html.ini new file mode 100644 index 00000000000..f3ffeb5d36a --- /dev/null +++ b/tests/wpt/mozilla/meta/css/filter_sepia_a.html.ini @@ -0,0 +1,3 @@ +[filter_sepia_a.html] + type: reftest + expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/hide_after_create.html.ini b/tests/wpt/mozilla/meta/css/hide_after_create.html.ini new file mode 100644 index 00000000000..b8b26ab16c2 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/hide_after_create.html.ini @@ -0,0 +1,3 @@ +[hide_after_create.html] + type: reftest + disabled: https://github.com/servo/servo/issues/13059 diff --git a/tests/wpt/mozilla/meta/css/iframe/hide_layers1.html.ini b/tests/wpt/mozilla/meta/css/iframe/hide_layers1.html.ini new file mode 100644 index 00000000000..c37dfe54b07 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/iframe/hide_layers1.html.ini @@ -0,0 +1,3 @@ +[hide_layers1.html] + type: reftest + disabled: https://github.com/servo/servo/issues/13059 diff --git a/tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini b/tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini new file mode 100644 index 00000000000..5f47c95fb0b --- /dev/null +++ b/tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini @@ -0,0 +1,4 @@ +[text_decoration_underline_subpx_a.html] + type: reftest + expected: + if os == "linux": FAIL diff --git a/tests/wpt/mozilla/meta/css/text_shadow_blur_a.html.ini b/tests/wpt/mozilla/meta/css/text_shadow_blur_a.html.ini new file mode 100644 index 00000000000..3ad8a9c02b5 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/text_shadow_blur_a.html.ini @@ -0,0 +1,3 @@ +[text_shadow_blur_a.html] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-012.htm.ini b/tests/wpt/mozilla/meta/css/transform_skew_a.html.ini similarity index 69% rename from tests/wpt/metadata-css/css21_dev/html4/font-size-012.htm.ini rename to tests/wpt/mozilla/meta/css/transform_skew_a.html.ini index 9e0c37c3269..2540aa1a870 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-012.htm.ini +++ b/tests/wpt/mozilla/meta/css/transform_skew_a.html.ini @@ -1,4 +1,4 @@ -[font-size-012.htm] +[transform_skew_a.html] type: reftest expected: if os == "linux": FAIL diff --git a/tests/wpt/mozilla/meta/css/viewport_meta.html.ini b/tests/wpt/mozilla/meta/css/viewport_meta.html.ini index e21ca57b360..a0166a230d5 100644 --- a/tests/wpt/mozilla/meta/css/viewport_meta.html.ini +++ b/tests/wpt/mozilla/meta/css/viewport_meta.html.ini @@ -1,3 +1,4 @@ prefs: [layout.viewport.enabled:true] [viewport_meta.html] type: reftest + expected: FAIL diff --git a/tests/wpt/mozilla/meta/css/viewport_rule.html.ini b/tests/wpt/mozilla/meta/css/viewport_rule.html.ini index a015a2452bf..9701fc34674 100644 --- a/tests/wpt/mozilla/meta/css/viewport_rule.html.ini +++ b/tests/wpt/mozilla/meta/css/viewport_rule.html.ini @@ -1,3 +1,4 @@ prefs: [layout.viewport.enabled:true] [viewport_rule.html] type: reftest + expected: FAIL