diff options
307 files changed, 704 insertions, 1234 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 5d29140e356..5d7b72b0910 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -2,9 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use AnimationTickType; use CompositionPipeline; -use CompositorMsg as ConstellationMsg; use SendableFrameTree; use app_units::Au; use compositor_layer::{CompositorData, CompositorLayer, RcCompositorLayer, WantsScrollEventsFlag}; @@ -37,8 +35,9 @@ use msg::constellation_msg::{WindowSizeData, WindowSizeType}; use profile_traits::mem::{self, ReportKind, Reporter, ReporterRequest}; use profile_traits::time::{self, ProfilerCategory, profile}; use script_traits::CompositorEvent::{MouseMoveEvent, MouseButtonEvent, TouchEvent}; -use script_traits::{AnimationState, ConstellationControlMsg, LayoutControlMsg}; -use script_traits::{MouseButton, MouseEventType, TouchpadPressurePhase, TouchEventType, TouchId}; +use script_traits::{AnimationState, AnimationTickType, ConstellationControlMsg}; +use script_traits::{ConstellationMsg, LayoutControlMsg, MouseButton}; +use script_traits::{MouseEventType, TouchpadPressurePhase, TouchEventType, TouchId}; use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::collections::{HashMap, HashSet}; use std::fs::File; diff --git a/components/compositing/compositor_thread.rs b/components/compositing/compositor_thread.rs index 79beb580daf..69c60cd2e0b 100644 --- a/components/compositing/compositor_thread.rs +++ b/components/compositing/compositor_thread.rs @@ -4,7 +4,6 @@ //! Communication with the compositor thread. -use CompositorMsg as ConstellationMsg; use SendableFrameTree; use compositor::{self, CompositingReason}; use euclid::point::Point2D; @@ -16,7 +15,7 @@ use layers::platform::surface::{NativeDisplay, NativeSurface}; use msg::constellation_msg::{Image, Key, KeyModifiers, KeyState, PipelineId}; use profile_traits::mem; use profile_traits::time; -use script_traits::{AnimationState, EventResult, ScriptToCompositorMsg}; +use script_traits::{AnimationState, ConstellationMsg, EventResult, ScriptToCompositorMsg}; use std::fmt::{Debug, Error, Formatter}; use std::rc::Rc; use std::sync::mpsc::{Receiver, Sender, channel}; diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index e1e3305dca8..472c7bbd71f 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -29,7 +29,6 @@ extern crate net_traits; #[macro_use] extern crate profile_traits; extern crate script_traits; -extern crate serde; extern crate style_traits; extern crate time; extern crate url; @@ -39,18 +38,13 @@ extern crate webrender; extern crate webrender_traits; pub use compositor_thread::{CompositorEventListener, CompositorProxy, CompositorThread}; -use euclid::size::{Size2D, TypedSize2D}; +use euclid::size::TypedSize2D; use gfx::paint_thread::ChromeToPaintMsg; -use gfx_traits::Epoch; use ipc_channel::ipc::{IpcSender}; use layout_traits::LayoutControlChan; -use msg::constellation_msg::{FrameId, Key, KeyState, KeyModifiers, LoadData}; -use msg::constellation_msg::{NavigationDirection, PipelineId, SubpageId}; -use msg::constellation_msg::{WebDriverCommandMsg, WindowSizeData, WindowSizeType}; +use msg::constellation_msg::PipelineId; use script_traits::ConstellationControlMsg; -use std::collections::HashMap; use std::sync::mpsc::Sender; -use url::Url; use util::geometry::PagePx; mod compositor; @@ -61,41 +55,6 @@ mod surface_map; mod touch; pub mod windowing; -/// Specifies whether the script or layout thread needs to be ticked for animation. -#[derive(Deserialize, Serialize)] -pub enum AnimationTickType { - Script, - Layout, -} - -/// Messages from the compositor to the constellation. -#[derive(Deserialize, Serialize)] -pub enum CompositorMsg { - Exit, - FrameSize(PipelineId, Size2D<f32>), - /// Request that the constellation send the FrameId corresponding to the document - /// with the provided pipeline id - GetFrame(PipelineId, IpcSender<Option<FrameId>>), - /// Request that the constellation send the current pipeline id for the provided frame - /// id, or for the root frame if this is None, over a provided channel. - /// Also returns a boolean saying whether the document has finished loading or not. - GetPipeline(Option<FrameId>, IpcSender<Option<(PipelineId, bool)>>), - /// Requests that the constellation inform the compositor of the title of the pipeline - /// immediately. - GetPipelineTitle(PipelineId), - InitLoadUrl(Url), - /// Query the constellation to see if the current compositor output is stable - IsReadyToSaveImage(HashMap<PipelineId, Epoch>), - KeyEvent(Key, KeyState, KeyModifiers), - LoadUrl(PipelineId, LoadData), - Navigate(Option<(PipelineId, SubpageId)>, NavigationDirection), - WindowSize(WindowSizeData, WindowSizeType), - /// Requests that the constellation instruct layout to begin a new tick of the animation. - TickAnimation(PipelineId, AnimationTickType), - /// Dispatch a webdriver command - WebDriverCommand(WebDriverCommandMsg), -} - pub struct SendableFrameTree { pub pipeline: CompositionPipeline, pub size: Option<TypedSize2D<PagePx, f32>>, diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs index d0cd2973001..f595b4f6573 100644 --- a/components/constellation/constellation.rs +++ b/components/constellation/constellation.rs @@ -13,10 +13,9 @@ use canvas::canvas_paint_thread::CanvasPaintThread; use canvas::webgl_paint_thread::WebGLPaintThread; use canvas_traits::CanvasMsg; use clipboard::ClipboardContext; -use compositing::CompositorMsg as FromCompositorMsg; +use compositing::SendableFrameTree; use compositing::compositor_thread::CompositorProxy; use compositing::compositor_thread::Msg as ToCompositorMsg; -use compositing::{AnimationTickType, SendableFrameTree}; use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg}; use euclid::scale_factor::ScaleFactor; use euclid::size::{Size2D, TypedSize2D}; @@ -49,7 +48,8 @@ use profile_traits::time; use rand::{random, Rng, SeedableRng, StdRng}; #[cfg(not(target_os = "windows"))] use sandboxing::content_process_sandbox_profile; -use script_traits::{AnimationState, CompositorEvent, ConstellationControlMsg}; +use script_traits::{AnimationState, AnimationTickType, CompositorEvent}; +use script_traits::{ConstellationControlMsg, ConstellationMsg as FromCompositorMsg}; use script_traits::{DocumentState, LayoutControlMsg}; use script_traits::{IFrameLoadInfo, IFrameSandboxState, TimerEventRequest}; use script_traits::{LayoutMsg as FromLayoutMsg, ScriptMsg as FromScriptMsg, ScriptThreadFactory}; diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs index 8f9252bd263..dcab55b3656 100644 --- a/components/constellation/pipeline.rs +++ b/components/constellation/pipeline.rs @@ -130,7 +130,6 @@ impl Pipeline { .expect("Pipeline main chan");; let (script_to_compositor_chan, script_to_compositor_port) = ipc::channel() .expect("Pipeline script to compositor chan"); - let mut pipeline_port = Some(pipeline_port); let window_size = state.window_size.map(|size| { WindowSizeData { @@ -159,7 +158,7 @@ impl Pipeline { let (layout_content_process_shutdown_chan, layout_content_process_shutdown_port) = ipc::channel().expect("Pipeline layout content shutdown chan"); - let (script_chan, script_port) = match state.script_chan { + let (script_chan, script_port, pipeline_port) = match state.script_chan { Some(script_chan) => { let (containing_pipeline_id, subpage_id) = state.parent_info.expect("script_pipeline != None but subpage_id == None"); @@ -170,8 +169,7 @@ impl Pipeline { load_data: state.load_data.clone(), paint_chan: layout_to_paint_chan.clone().to_opaque(), panic_chan: state.panic_chan.clone(), - pipeline_port: mem::replace(&mut pipeline_port, None) - .expect("script_pipeline != None but pipeline_port == None"), + pipeline_port: pipeline_port, layout_shutdown_chan: layout_shutdown_chan.clone(), content_process_shutdown_chan: layout_content_process_shutdown_chan.clone(), }; @@ -179,11 +177,11 @@ impl Pipeline { if let Err(e) = script_chan.send(ConstellationControlMsg::AttachLayout(new_layout_info)) { warn!("Sending to script during pipeline creation failed ({})", e); } - (script_chan, None) + (script_chan, None, None) } None => { let (script_chan, script_port) = ipc::channel().expect("Pipeline script chan"); - (script_chan, Some(script_port)) + (script_chan, Some(script_port), Some(pipeline_port)) } }; diff --git a/components/gfx/font_context.rs b/components/gfx/font_context.rs index 42415d9b833..d6c26083bf0 100644 --- a/components/gfx/font_context.rs +++ b/components/gfx/font_context.rs @@ -223,38 +223,35 @@ impl FontContext { } } - // If unable to create any of the specified fonts, create one from the - // list of last resort fonts for this platform. - if fonts.is_empty() { - let mut cache_hit = false; - for cached_font_entry in &self.fallback_font_cache { - let cached_font = cached_font_entry.font.borrow(); - if cached_font.descriptor == desc && - cached_font.requested_pt_size == style.font_size && - cached_font.variant == style.font_variant { - fonts.push(cached_font_entry.font.clone()); - cache_hit = true; - break; - } + // Add a last resort font as a fallback option. + let mut cache_hit = false; + for cached_font_entry in &self.fallback_font_cache { + let cached_font = cached_font_entry.font.borrow(); + if cached_font.descriptor == desc && + cached_font.requested_pt_size == style.font_size && + cached_font.variant == style.font_variant { + fonts.push(cached_font_entry.font.clone()); + cache_hit = true; + break; } + } - if !cache_hit { - let template_info = self.font_cache_thread.last_resort_font_template(desc.clone()); - let layout_font = self.create_layout_font(template_info.font_template, - desc.clone(), - style.font_size, - style.font_variant, - template_info.font_key); - match layout_font { - Ok(layout_font) => { - let layout_font = Rc::new(RefCell::new(layout_font)); - self.fallback_font_cache.push(FallbackFontCacheEntry { - font: layout_font.clone(), - }); - fonts.push(layout_font); - } - Err(_) => debug!("Failed to create fallback layout font!") + if !cache_hit { + let template_info = self.font_cache_thread.last_resort_font_template(desc.clone()); + let layout_font = self.create_layout_font(template_info.font_template, + desc.clone(), + style.font_size, + style.font_variant, + template_info.font_key); + match layout_font { + Ok(layout_font) => { + let layout_font = Rc::new(RefCell::new(layout_font)); + self.fallback_font_cache.push(FallbackFontCacheEntry { + font: layout_font.clone(), + }); + fonts.push(layout_font); } + Err(_) => debug!("Failed to create fallback layout font!") } } diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 520e4c5ab66..f2da09b734c 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -1971,6 +1971,11 @@ impl Fragment { } } SpecificFragmentInfo::ScannedText(ref text_fragment) => { + // Fragments with no glyphs don't contribute any inline metrics. + // TODO: Filter out these fragments during flow construction? + if text_fragment.content_size.inline == Au(0) { + return InlineMetrics::new(Au(0), Au(0), Au(0)); + } // See CSS 2.1 § 10.8.1. let line_height = self.calculate_line_height(layout_context); let font_derived_metrics = diff --git a/components/layout/text.rs b/components/layout/text.rs index 1848a9b8741..3ba9be9f949 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -197,17 +197,12 @@ impl TextRunScanner { for (byte_index, character) in text.char_indices() { // Search for the first font in this font group that contains a glyph for this // character. - let mut font_index = 0; + let font_index = fontgroup.fonts.iter().position(|font| { + font.borrow().glyph_index(character).is_some() + }).unwrap_or(0); + // The following code panics one way or another if this condition isn't met. assert!(fontgroup.fonts.len() > 0); - while font_index < fontgroup.fonts.len() - 1 { - if fontgroup.fonts.get(font_index).unwrap().borrow() - .glyph_index(character) - .is_some() { - break - } - font_index += 1; - } let bidi_level = match bidi_levels { Some(levels) => levels[*paragraph_bytes_processed], diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index 6d537c40ea5..df9251f3888 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -16,6 +16,7 @@ use std::ascii::AsciiExt; use std::borrow::ToOwned; use std::cell::Ref; use string_cache::Atom; +use style::parser::ParserContextExtraData; use style::properties::{PropertyDeclaration, Shorthand}; use style::properties::{is_supported_property, parse_one_declaration}; use style::selector_impl::PseudoElement; @@ -240,7 +241,9 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration { // Step 6 let window = window_from_node(&*self.owner); - let declarations = parse_one_declaration(&property, &value, &window.get_url(), window.css_error_reporter()); + let declarations = + parse_one_declaration(&property, &value, &window.get_url(), window.css_error_reporter(), + ParserContextExtraData::default()); // Step 7 let declarations = if let Ok(declarations) = declarations { diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index ec33deb1608..f5832089202 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -86,6 +86,7 @@ use std::sync::Arc; use std::sync::atomic::{AtomicUsize, Ordering}; use string_cache::{Atom, BorrowedAtom, BorrowedNamespace, Namespace, QualName}; use style::element_state::*; +use style::parser::ParserContextExtraData; use style::properties::DeclaredValue; use style::properties::longhands::{self, background_image, border_spacing, font_family, overflow_x, font_size}; use style::properties::{PropertyDeclaration, PropertyDeclarationBlock, parse_style_attribute}; @@ -1977,7 +1978,8 @@ impl VirtualMethods for Element { *self.style_attribute.borrow_mut() = mutation.new_value(attr).map(|value| { let win = window_from_node(self); - parse_style_attribute(&value, &doc.base_url(), win.css_error_reporter()) + parse_style_attribute(&value, &doc.base_url(), win.css_error_reporter(), + ParserContextExtraData::default()) }); if node.is_in_doc() { node.dirty(NodeDamage::NodeStyleDamaged); diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index dbc0d4f8f1f..8977d45048e 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -271,22 +271,22 @@ impl LayoutHTMLInputElementHelpers for LayoutJS<HTMLInputElement> { impl HTMLInputElementMethods for HTMLInputElement { - // https://html.spec.whatwg.org/multipage/#attr-input-accept + // https://html.spec.whatwg.org/multipage/#dom-input-accept make_getter!(Accept, "accept"); - // https://html.spec.whatwg.org/multipage/#attr-input-accept + // https://html.spec.whatwg.org/multipage/#dom-input-accept make_setter!(SetAccept, "accept"); - // https://html.spec.whatwg.org/multipage/#attr-input-alt + // https://html.spec.whatwg.org/multipage/#dom-input-alt make_getter!(Alt, "alt"); - // https://html.spec.whatwg.org/multipage/#attr-input-alt + // https://html.spec.whatwg.org/multipage/#dom-input-alt make_setter!(SetAlt, "alt"); - // https://html.spec.whatwg.org/multipage/#attr-input-dirName + // https://html.spec.whatwg.org/multipage/#dom-input-dirName make_getter!(DirName, "dirname"); - // https://html.spec.whatwg.org/multipage/#attr-input-dirName + // https://html.spec.whatwg.org/multipage/#dom-input-dirName make_setter!(SetDirName, "dirname"); // https://html.spec.whatwg.org/multipage/#dom-fe-disabled @@ -415,10 +415,10 @@ impl HTMLInputElementMethods for HTMLInputElement { // https://html.spec.whatwg.org/multipage/#attr-fe-name make_atomic_setter!(SetName, "name"); - // https://html.spec.whatwg.org/multipage/#attr-input-placeholder + // https://html.spec.whatwg.org/multipage/#dom-input-placeholder make_getter!(Placeholder, "placeholder"); - // https://html.spec.whatwg.org/multipage/#attr-input-placeholder + // https://html.spec.whatwg.org/multipage/#dom-input-placeholder make_setter!(SetPlaceholder, "placeholder"); // https://html.spec.whatwg.org/multipage/#dom-input-formaction @@ -454,10 +454,10 @@ impl HTMLInputElementMethods for HTMLInputElement { // https://html.spec.whatwg.org/multipage/#attr-fs-formnovalidate make_bool_setter!(SetFormNoValidate, "formnovalidate"); - // https://html.spec.whatwg.org/multipage/#attr-input-max + // https://html.spec.whatwg.org/multipage/#dom-input-max make_getter!(Max, "max"); - // https://html.spec.whatwg.org/multipage/#attr-input-max + // https://html.spec.whatwg.org/multipage/#dom-input-max make_setter!(SetMax, "max"); // https://html.spec.whatwg.org/multipage/#dom-input-maxlength @@ -466,40 +466,40 @@ impl HTMLInputElementMethods for HTMLInputElement { // https://html.spec.whatwg.org/multipage/#dom-input-maxlength make_limited_int_setter!(SetMaxLength, "maxlength", DEFAULT_MAX_LENGTH); - // https://html.spec.whatwg.org/multipage/#attr-input-min + // https://html.spec.whatwg.org/multipage/#dom-input-min make_getter!(Min, "min"); - // https://html.spec.whatwg.org/multipage/#attr-input-min + // https://html.spec.whatwg.org/multipage/#dom-input-min make_setter!(SetMin, "min"); - // https://html.spec.whatwg.org/multipage/#attr-input-multiple + // https://html.spec.whatwg.org/multipage/#dom-input-multiple make_bool_getter!(Multiple, "multiple"); - // https://html.spec.whatwg.org/multipage/#attr-input-multiple + // https://html.spec.whatwg.org/multipage/#dom-input-multiple make_bool_setter!(SetMultiple, "multiple"); - // https://html.spec.whatwg.org/multipage/#attr-input-pattern + // https://html.spec.whatwg.org/multipage/#dom-input-pattern make_getter!(Pattern, "pattern"); - // https://html.spec.whatwg.org/multipage/#attr-input-pattern + // https://html.spec.whatwg.org/multipage/#dom-input-pattern make_setter!(SetPattern, "pattern"); - // https://html.spec.whatwg.org/multipage/#attr-input-required + // https://html.spec.whatwg.org/multipage/#dom-input-required make_bool_getter!(Required, "required"); - // https://html.spec.whatwg.org/multipage/#attr-input-required + // https://html.spec.whatwg.org/multipage/#dom-input-required make_bool_setter!(SetRequired, "required"); - // https://html.spec.whatwg.org/multipage/#attr-input-src - make_getter!(Src, "src"); + // https://html.spec.whatwg.org/multipage/#dom-input-src + make_url_getter!(Src, "src"); - // https://html.spec.whatwg.org/multipage/#attr-input-src - make_setter!(SetSrc, "src"); + // https://html.spec.whatwg.org/multipage/#dom-input-src + make_url_setter!(SetSrc, "src"); - // https://html.spec.whatwg.org/multipage/#attr-input-step + // https://html.spec.whatwg.org/multipage/#dom-input-step make_getter!(Step, "step"); - // https://html.spec.whatwg.org/multipage/#attr-input-step + // https://html.spec.whatwg.org/multipage/#dom-input-step make_setter!(SetStep, "step"); // https://html.spec.whatwg.org/multipage/#dom-input-indeterminate @@ -881,6 +881,7 @@ impl VirtualMethods for HTMLInputElement { fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue { match name { + &atom!("accept") => AttrValue::from_comma_separated_tokenlist(value.into()), &atom!("name") => AttrValue::from_atomic(value.into()), &atom!("size") => AttrValue::from_limited_u32(value.into(), DEFAULT_INPUT_SIZE), &atom!("type") => AttrValue::from_atomic(value.into()), diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 18ff43c000b..88de9756267 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -38,6 +38,7 @@ use std::mem; use std::sync::{Arc, Mutex}; use string_cache::Atom; use style::media_queries::{MediaQueryList, parse_media_query_list}; +use style::parser::ParserContextExtraData; use style::servo::Stylesheet; use style::stylesheets::Origin; use url::Url; @@ -307,7 +308,8 @@ impl AsyncResponseListener for StylesheetContext { let mut sheet = Stylesheet::from_bytes(&data, final_url, protocol_encoding_label, Some(environment_encoding), Origin::Author, - win.css_error_reporter()); + win.css_error_reporter(), + ParserContextExtraData::default()); let media = self.media.take().unwrap(); sheet.set_media(Some(media)); let sheet = Arc::new(sheet); diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index 8d4a05eb9b7..62395b682d1 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -18,6 +18,7 @@ use layout_interface::{LayoutChan, Msg}; use std::sync::Arc; use string_cache::Atom; use style::media_queries::parse_media_query_list; +use style::parser::ParserContextExtraData; use style::servo::Stylesheet; use style::stylesheets::Origin; @@ -60,7 +61,8 @@ impl HTMLStyleElement { }; let data = node.GetTextContent().expect("Element.textContent must be a string"); - let mut sheet = Stylesheet::from_str(&data, url, Origin::Author, win.css_error_reporter()); + let mut sheet = Stylesheet::from_str(&data, url, Origin::Author, win.css_error_reporter(), + ParserContextExtraData::default()); let mut css_parser = CssParser::new(&mq_str); let media = parse_media_query_list(&mut css_parser); sheet.set_media(Some(media)); diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 2dee02fec59..8d39895ed46 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -41,9 +41,10 @@ use gfx_traits::Epoch; use gfx_traits::LayerId; use ipc_channel::ipc::{IpcReceiver, IpcSender}; use libc::c_void; -use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData}; -use msg::constellation_msg::{PanicMsg, PipelineId, PipelineNamespaceId}; -use msg::constellation_msg::{SubpageId, WindowSizeData, WindowSizeType}; +use msg::constellation_msg::{FrameId, Key, KeyModifiers, KeyState, LoadData}; +use msg::constellation_msg::{NavigationDirection, PanicMsg, PipelineId}; +use msg::constellation_msg::{PipelineNamespaceId, SubpageId, WindowSizeData}; +use msg::constellation_msg::{WebDriverCommandMsg, WindowSizeType}; use msg::webdriver_msg::WebDriverScriptCommand; use net_traits::ResourceThreads; use net_traits::bluetooth_thread::BluetoothMethodMsg; @@ -51,6 +52,8 @@ use net_traits::image_cache_thread::ImageCacheThread; use net_traits::response::HttpsState; use profile_traits::mem; use std::any::Any; +use std::collections::HashMap; +use url::Url; use util::ipc::OptionalOpaqueIpcSender; pub use script_msg::{LayoutMsg, ScriptMsg}; @@ -491,3 +494,47 @@ impl MozBrowserErrorType { } } } + +/// Specifies whether the script or layout thread needs to be ticked for animation. +#[derive(Deserialize, Serialize)] +pub enum AnimationTickType { + /// The script thread. + Script, + /// The layout thread. + Layout, +} + +/// Messages to the constellation. +#[derive(Deserialize, Serialize)] +pub enum ConstellationMsg { + /// Exit the constellation. + Exit, + /// Inform the constellation of the size of the viewport. + FrameSize(PipelineId, Size2D<f32>), + /// Request that the constellation send the FrameId corresponding to the document + /// with the provided pipeline id + GetFrame(PipelineId, IpcSender<Option<FrameId>>), + /// Request that the constellation send the current pipeline id for the provided frame + /// id, or for the root frame if this is None, over a provided channel. + /// Also returns a boolean saying whether the document has finished loading or not. + GetPipeline(Option<FrameId>, IpcSender<Option<(PipelineId, bool)>>), + /// Requests that the constellation inform the compositor of the title of the pipeline + /// immediately. + GetPipelineTitle(PipelineId), + /// Request to load the initial page. + InitLoadUrl(Url), + /// Query the constellation to see if the current compositor output is stable + IsReadyToSaveImage(HashMap<PipelineId, Epoch>), + /// Inform the constellation of a key event. + KeyEvent(Key, KeyState, KeyModifiers), + /// Request to load a page. + LoadUrl(PipelineId, LoadData), + /// Request to navigate a frame. + Navigate(Option<(PipelineId, SubpageId)>, NavigationDirection), + /// Inform the constellation of a window being resized. + WindowSize(WindowSizeData, WindowSizeType), + /// Requests that the constellation instruct layout to begin a new tick of the animation. + TickAnimation(PipelineId, AnimationTickType), + /// Dispatch a webdriver command + WebDriverCommand(WebDriverCommandMsg), +} diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 8e69e676201..335c040e61c 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -2480,7 +2480,6 @@ dependencies = [ name = "webdriver_server" version = "0.0.1" dependencies = [ - "compositing 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2490,6 +2489,7 @@ dependencies = [ "plugins 0.0.1", "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", + "script_traits 0.0.1", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 16403134a1b..e208a4e89f1 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -58,7 +58,6 @@ fn webdriver(port: u16, constellation: Sender<ConstellationMsg>) { fn webdriver(_port: u16, _constellation: Sender<ConstellationMsg>) { } use compositing::CompositorEventListener; -use compositing::CompositorMsg as ConstellationMsg; use compositing::compositor_thread::InitialCompositorState; use compositing::windowing::WindowEvent; use compositing::windowing::WindowMethods; @@ -79,6 +78,7 @@ use profile::mem as profile_mem; use profile::time as profile_time; use profile_traits::mem; use profile_traits::time; +use script_traits::ConstellationMsg; use std::rc::Rc; use std::sync::mpsc::Sender; use util::resource_files::resources_dir_path; diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 5198dc05b14..566506e987e 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -11,7 +11,7 @@ name = "style" path = "lib.rs" [features] -gecko = [] +gecko = ["gecko_bindings"] [dependencies] app_units = {version = "0.2.3", features = ["plugins"]} @@ -20,6 +20,7 @@ cssparser = {version = "0.5.5", features = ["heap_size", "serde-serialization"]} encoding = "0.2" euclid = {version = "0.6.4", features = ["plugins"]} fnv = "1.0" +gecko_bindings = {path = "../../ports/geckolib/gecko_bindings", optional = true} heapsize = "0.3.0" heapsize_plugin = "0.1.2" lazy_static = "0.2" diff --git a/components/style/attr.rs b/components/style/attr.rs index 8bb307040ea..0ba247e101f 100644 --- a/components/style/attr.rs +++ b/components/style/attr.rs @@ -11,7 +11,7 @@ use std::str::FromStr; use string_cache::{Atom, Namespace}; use url::Url; use util::str::{LengthOrPercentageOrAuto, HTML_SPACE_CHARACTERS}; -use util::str::{read_exponent, read_fraction, read_numbers, split_html_space_chars}; +use util::str::{read_exponent, read_fraction, read_numbers, split_commas, split_html_space_chars}; use values::specified::{Length}; // Duplicated from script::dom::values. @@ -124,6 +124,15 @@ impl AttrValue { AttrValue::TokenList(tokens, atoms) } + pub fn from_comma_separated_tokenlist(tokens: String) -> AttrValue { + let atoms = split_commas(&tokens).map(Atom::from) + .fold(vec![], |mut acc, atom| { + if !acc.contains(&atom) { acc.push(atom) } + acc + }); + AttrValue::TokenList(tokens, atoms) + } + #[cfg(not(feature = "gecko"))] // Gecko can't borrow atoms as UTF-8. pub fn from_atomic_tokens(atoms: Vec<Atom>) -> AttrValue { use util::str::str_join; @@ -151,12 +160,12 @@ impl AttrValue { // https://html.spec.whatwg.org/multipage/#reflecting-content-attributes-in-idl-attributes:idl-double pub fn from_double(string: String, default: f64) -> AttrValue { let result = parse_double(&string).unwrap_or(default); - let result = if result.is_infinite() { - default + + if result.is_normal() { + AttrValue::Double(string, result) } else { - result - }; - AttrValue::Double(string, result) + AttrValue::Double(string, default) + } } // https://html.spec.whatwg.org/multipage/#limited-to-only-non-negative-numbers diff --git a/components/style/lib.rs b/components/style/lib.rs index 00d5d079066..4ec45e45e04 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -28,6 +28,8 @@ extern crate cssparser; extern crate encoding; extern crate euclid; extern crate fnv; +#[cfg(feature = "gecko")] +extern crate gecko_bindings; extern crate heapsize; #[allow(unused_extern_crates)] #[macro_use] diff --git a/components/style/parser.rs b/components/style/parser.rs index b044367e8dd..eadb778db55 100644 --- a/components/style/parser.rs +++ b/components/style/parser.rs @@ -5,20 +5,47 @@ use cssparser::{Parser, SourcePosition}; use error_reporting::ParseErrorReporter; +#[cfg(feature = "gecko")] +use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI}; use selectors::parser::ParserContext as SelectorParserContext; use stylesheets::Origin; use url::Url; +#[cfg(not(feature = "gecko"))] +pub struct ParserContextExtraData; + +#[cfg(feature = "gecko")] +pub struct ParserContextExtraData { + pub base: Option<GeckoArcURI>, + pub referrer: Option<GeckoArcURI>, + pub principal: Option<GeckoArcPrincipal>, +} + +impl ParserContextExtraData { + #[cfg(not(feature = "gecko"))] + pub fn default() -> ParserContextExtraData { + ParserContextExtraData + } + + #[cfg(feature = "gecko")] + pub fn default() -> ParserContextExtraData { + ParserContextExtraData { base: None, referrer: None, principal: None } + } +} + pub struct ParserContext<'a> { pub stylesheet_origin: Origin, pub base_url: &'a Url, pub selector_context: SelectorParserContext, pub error_reporter: Box<ParseErrorReporter + Send>, + pub extra_data: ParserContextExtraData, } impl<'a> ParserContext<'a> { - pub fn new(stylesheet_origin: Origin, base_url: &'a Url, error_reporter: Box<ParseErrorReporter + Send>) - -> ParserContext<'a> { + pub fn new_with_extra_data(stylesheet_origin: Origin, base_url: &'a Url, + error_reporter: Box<ParseErrorReporter + Send>, + extra_data: ParserContextExtraData) + -> ParserContext<'a> { let mut selector_context = SelectorParserContext::new(); selector_context.in_user_agent_stylesheet = stylesheet_origin == Origin::UserAgent; ParserContext { @@ -26,8 +53,15 @@ impl<'a> ParserContext<'a> { base_url: base_url, selector_context: selector_context, error_reporter: error_reporter, + extra_data: extra_data, } } + + pub fn new(stylesheet_origin: Origin, base_url: &'a Url, error_reporter: Box<ParseErrorReporter + Send>) + -> ParserContext<'a> { + let extra_data = ParserContextExtraData::default(); + ParserContext::new_with_extra_data(stylesheet_origin, base_url, error_reporter, extra_data) + } } diff --git a/components/style/properties/helpers.mako.rs b/components/style/properties/helpers.mako.rs index af052179d2c..86961c89192 100644 --- a/components/style/properties/helpers.mako.rs +++ b/components/style/properties/helpers.mako.rs @@ -43,7 +43,7 @@ #![allow(unused_imports)] % if not property.derived_from: use cssparser::Parser; - use parser::ParserContext; + use parser::{ParserContext, ParserContextExtraData}; use properties::{CSSWideKeyword, DeclaredValue, Shorthand}; % endif use error_reporting::ParseErrorReporter; diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs index 6fd36b71a4d..f80a42c88d2 100644 --- a/components/style/properties/longhand/box.mako.rs +++ b/components/style/properties/longhand/box.mako.rs @@ -851,3 +851,78 @@ ${helpers.single_keyword("-moz-appearance", gecko_ffi_name="mAppearance", gecko_constant_prefix="NS_THEME", products="gecko")} + +// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-binding +<%helpers:longhand name="-moz-binding" products="gecko"> + use cssparser::{CssStringWriter, ToCss}; + use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI}; + use std::fmt::{self, Write}; + use url::Url; + use values::computed::ComputedValueAsSpecified; + + #[derive(PartialEq, Clone, Debug, HeapSizeOf)] + pub struct UrlExtraData { + pub base: GeckoArcURI, + pub referrer: GeckoArcURI, + pub principal: GeckoArcPrincipal, + } + + #[derive(PartialEq, Clone, Debug, HeapSizeOf)] + pub enum SpecifiedValue { + Url(Url, UrlExtraData), + None, + } + + impl ComputedValueAsSpecified for SpecifiedValue {} + + impl ToCss for SpecifiedValue { + fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { + use values::LocalToCss; + match *self { + SpecifiedValue::Url(ref url, _) => { + url.to_css(dest) + } + SpecifiedValue::None => { + try!(dest.write_str("none")); + Ok(()) + } + } + } + } + + pub mod computed_value { + pub type T = super::SpecifiedValue; + } + + #[inline] pub fn get_initial_value() -> SpecifiedValue { + SpecifiedValue::None + } + + pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> { + if input.try(|input| input.expect_ident_matching("none")).is_ok() { + return Ok(SpecifiedValue::None); + } + + let url = context.parse_url(&*try!(input.expect_url())); + match context.extra_data { + ParserContextExtraData { + base: Some(ref base), + referrer: Some(ref referrer), + principal: Some(ref principal), + } => { + let extra_data = UrlExtraData { + base: base.clone(), + referrer: referrer.clone(), + principal: principal.clone(), + }; + Ok(SpecifiedValue::Url(url, extra_data)) + }, + _ => { + // FIXME(heycam) should ensure we always have a principal, etc., when parsing + // style attributes and re-parsing due to CSS Variables. + println!("stylo: skipping -moz-binding declaration without ParserContextExtraData"); + Err(()) + }, + } + } +</%helpers:longhand> diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index dc15f7339d0..ec6fe6562e0 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -29,7 +29,7 @@ use euclid::size::Size2D; use string_cache::Atom; use computed_values; use logical_geometry::{LogicalMargin, PhysicalSide, WritingMode}; -use parser::{ParserContext, log_css_error}; +use parser::{ParserContext, ParserContextExtraData, log_css_error}; use selectors::matching::DeclarationBlock; use stylesheets::Origin; use values::AuExtensionMethods; @@ -185,13 +185,18 @@ mod property_bit_field { if let DeclaredValue::WithVariables { ref css, first_token_type, ref base_url, from_shorthand } = *value { + // FIXME(heycam): A ParserContextExtraData should be built from data + // stored in the WithVariables, in case variable expansion results in + // a url() value. + let extra_data = ParserContextExtraData::default(); substitute_variables_${property.ident}_slow(css, first_token_type, base_url, from_shorthand, custom_properties, f, - error_reporter); + error_reporter, + extra_data); } else { f(value); } @@ -206,7 +211,8 @@ mod property_bit_field { from_shorthand: Option<Shorthand>, custom_properties: &Option<Arc<::custom_properties::ComputedValuesMap>>, f: F, - error_reporter: &mut StdBox<ParseErrorReporter + Send>) + error_reporter: &mut StdBox<ParseErrorReporter + Send>, + extra_data: ParserContextExtraData) where F: FnOnce(&DeclaredValue<longhands::${property.ident}::SpecifiedValue>) { f(& ::custom_properties::substitute(css, first_token_type, custom_properties) @@ -215,8 +221,9 @@ mod property_bit_field { // // FIXME(pcwalton): Cloning the error reporter is slow! But so are custom // properties, so whatever... - let context = ParserContext::new( - ::stylesheets::Origin::Author, base_url, (*error_reporter).clone()); + let context = ParserContext::new_with_extra_data( + ::stylesheets::Origin::Author, base_url, (*error_reporter).clone(), + extra_data); Parser::new(&css).parse_entirely(|input| { match from_shorthand { None => { @@ -256,15 +263,17 @@ pub struct PropertyDeclarationBlock { pub normal: Arc<Vec<PropertyDeclaration>>, } -pub fn parse_style_attribute(input: &str, base_url: &Url, error_reporter: StdBox<ParseErrorReporter + Send>) +pub fn parse_style_attribute(input: &str, base_url: &Url, error_reporter: StdBox<ParseErrorReporter + Send>, + extra_data: ParserContextExtraData) -> PropertyDeclarationBlock { - let context = ParserContext::new(Origin::Author, base_url, error_reporter); + let context = ParserContext::new_with_extra_data(Origin::Author, base_url, error_reporter, extra_data); parse_property_declaration_list(&context, &mut Parser::new(input)) } -pub fn parse_one_declaration(name: &str, input: &str, base_url: &Url, error_reporter: StdBox<ParseErrorReporter + Send>) +pub fn parse_one_declaration(name: &str, input: &str, base_url: &Url, error_reporter: StdBox<ParseErrorReporter + Send>, + extra_data: ParserContextExtraData) -> Result<Vec<PropertyDeclaration>, ()> { - let context = ParserContext::new(Origin::Author, base_url, error_reporter); + let context = ParserContext::new_with_extra_data(Origin::Author, base_url, error_reporter, extra_data); let mut results = vec![]; match PropertyDeclaration::parse(name, &context, &mut Parser::new(input), &mut results) { PropertyDeclarationParseResult::ValidOrIgnoredDeclaration => Ok(results), diff --git a/components/style/selector_matching.rs b/components/style/selector_matching.rs index c1989348f50..017a7443624 100644 --- a/components/style/selector_matching.rs +++ b/components/style/selector_matching.rs @@ -9,6 +9,7 @@ use dom::PresentationalHintsSynthetizer; use element_state::*; use error_reporting::StdoutErrorReporter; use media_queries::{Device, MediaType}; +use parser::ParserContextExtraData; use properties::{self, PropertyDeclaration, PropertyDeclarationBlock}; use restyle_hints::{ElementSnapshot, RestyleHint, DependencySet}; use selector_impl::{SelectorImplExt, ServoSelectorImpl}; @@ -46,7 +47,8 @@ lazy_static! { None, None, Origin::UserAgent, - box StdoutErrorReporter); + box StdoutErrorReporter, + ParserContextExtraData::default()); stylesheets.push(ua_stylesheet); } Err(..) => { @@ -57,7 +59,8 @@ lazy_static! { } for &(ref contents, ref url) in &opts::get().user_stylesheets { stylesheets.push(Stylesheet::from_bytes( - &contents, url.clone(), None, None, Origin::User, box StdoutErrorReporter)); + &contents, url.clone(), None, None, Origin::User, box StdoutErrorReporter, + ParserContextExtraData::default())); } stylesheets }; @@ -73,7 +76,8 @@ lazy_static! { None, None, Origin::UserAgent, - box StdoutErrorReporter) + box StdoutErrorReporter, + ParserContextExtraData::default()) }, Err(..) => { error!("Stylist failed to load 'quirks-mode.css'!"); diff --git a/components/style/stylesheets.rs b/components/style/stylesheets.rs index 7a978263b2b..4de57e81d40 100644 --- a/components/style/stylesheets.rs +++ b/components/style/stylesheets.rs @@ -8,7 +8,7 @@ use encoding::EncodingRef; use error_reporting::ParseErrorReporter; use font_face::{FontFaceRule, parse_font_face_block}; use media_queries::{Device, MediaQueryList, parse_media_query_list}; -use parser::{ParserContext, log_css_error}; +use parser::{ParserContext, ParserContextExtraData, log_css_error}; use properties::{PropertyDeclarationBlock, parse_property_declaration_list}; use selectors::parser::{Selector, SelectorImpl, parse_selector_list}; use smallvec::SmallVec; @@ -83,32 +83,37 @@ impl<Impl: SelectorImpl> Stylesheet<Impl> { pub fn from_bytes_iter<I: Iterator<Item=Vec<u8>>>( input: I, base_url: Url, protocol_encoding_label: Option<&str>, environment_encoding: Option<EncodingRef>, origin: Origin, - error_reporter: Box<ParseErrorReporter + Send>) -> Stylesheet<Impl> { + error_reporter: Box<ParseErrorReporter + Send>, + extra_data: ParserContextExtraData) -> Stylesheet<Impl> { let mut bytes = vec![]; // TODO: incremental decoding and tokenization/parsing for chunk in input { bytes.extend_from_slice(&chunk) } Stylesheet::from_bytes(&bytes, base_url, protocol_encoding_label, - environment_encoding, origin, error_reporter) + environment_encoding, origin, error_reporter, + extra_data) } pub fn from_bytes(bytes: &[u8], base_url: Url, protocol_encoding_label: Option<&str>, environment_encoding: Option<EncodingRef>, - origin: Origin, error_reporter: Box<ParseErrorReporter + Send>) + origin: Origin, error_reporter: Box<ParseErrorReporter + Send>, + extra_data: ParserContextExtraData) -> Stylesheet<Impl> { // TODO: bytes.as_slice could be bytes.container_as_bytes() let (string, _) = decode_stylesheet_bytes( bytes, protocol_encoding_label, environment_encoding); - Stylesheet::from_str(&string, base_url, origin, error_reporter) + Stylesheet::from_str(&string, base_url, origin, error_reporter, extra_data) } pub fn from_str(css: &str, base_url: Url, origin: Origin, - error_reporter: Box<ParseErrorReporter + Send>) -> Stylesheet<Impl> { + error_reporter: Box<ParseErrorReporter + Send>, + extra_data: ParserContextExtraData) -> Stylesheet<Impl> { let rule_parser = TopLevelRuleParser { - context: ParserContext::new(origin, &base_url, error_reporter.clone()), + context: ParserContext::new_with_extra_data(origin, &base_url, error_reporter.clone(), + extra_data), state: Cell::new(State::Start), _impl: PhantomData, }; diff --git a/components/style/values.rs b/components/style/values.rs index 2f295bd8775..9492a028cfc 100644 --- a/components/style/values.rs +++ b/components/style/values.rs @@ -90,13 +90,13 @@ pub const FONT_MEDIUM_PX: i32 = 16; pub mod specified { use app_units::Au; - use cssparser::{self, CssStringWriter, Parser, ToCss, Token}; + use cssparser::{self, Parser, ToCss, Token}; use euclid::size::Size2D; use parser::ParserContext; use std::ascii::AsciiExt; use std::cmp; use std::f32::consts::PI; - use std::fmt::{self, Write}; + use std::fmt; use std::ops::Mul; use style_traits::values::specified::AllowedNumericType; use super::AuExtensionMethods; @@ -1224,12 +1224,10 @@ pub mod specified { impl ToCss for Image { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { + use values::LocalToCss; match *self { Image::Url(ref url) => { - try!(dest.write_str("url(\"")); - try!(write!(&mut CssStringWriter::new(dest), "{}", url)); - try!(dest.write_str("\")")); - Ok(()) + url.to_css(dest) } Image::LinearGradient(ref gradient) => gradient.to_css(dest) } diff --git a/components/util/str.rs b/components/util/str.rs index fe23c1b5ff6..7af63f4c7f3 100644 --- a/components/util/str.rs +++ b/components/util/str.rs @@ -41,6 +41,10 @@ pub fn split_html_space_chars<'a>(s: &'a str) -> s.split(HTML_SPACE_CHARACTERS).filter(not_empty as fn(&&str) -> bool) } +pub fn split_commas<'a>(s: &'a str) -> Filter<Split<'a, char>, fn(&&str) -> bool> { + fn not_empty(&split: &&str) -> bool { !split.is_empty() } + s.split(',').filter(not_empty as fn(&&str) -> bool) +} fn is_ascii_digit(c: &char) -> bool { match *c { diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index de365ebdae3..d2e22b98b1a 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -9,7 +9,6 @@ name = "webdriver_server" path = "lib.rs" [dependencies] -compositing = {path = "../compositing"} msg = {path = "../msg"} plugins = {path = "../plugins"} util = {path = "../util"} @@ -20,6 +19,7 @@ log = "0.3.5" hyper = "0.9" rustc-serialize = "0.3.4" regex = "0.1.55" +script_traits = {path = "../script_traits"} url = {version = "1.0.0", features = ["heap_size"]} uuid = { version = "0.2", features = ["v4"] } webdriver = "0.9" diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 92c339fb7d5..83771a1b070 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -10,7 +10,6 @@ #![deny(unsafe_code)] -extern crate compositing; extern crate euclid; extern crate hyper; extern crate image; @@ -18,6 +17,7 @@ extern crate ipc_channel; extern crate msg; extern crate regex; extern crate rustc_serialize; +extern crate script_traits; extern crate url; extern crate util; extern crate uuid; @@ -25,7 +25,6 @@ extern crate webdriver; mod keys; -use compositing::CompositorMsg as ConstellationMsg; use euclid::Size2D; use hyper::method::Method::{self, Post}; use image::{DynamicImage, ImageFormat, RgbImage}; @@ -37,6 +36,7 @@ use msg::webdriver_msg::{LoadStatus, WebDriverFrameId, WebDriverJSError, WebDriv use regex::Captures; use rustc_serialize::base64::{CharacterSet, Config, Newline, ToBase64}; use rustc_serialize::json::{Json, ToJson}; +use script_traits::ConstellationMsg; use std::borrow::ToOwned; use std::collections::BTreeMap; use std::net::{SocketAddr, SocketAddrV4}; diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index a21f7c2de47..5f86dec09d8 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2341,7 +2341,6 @@ dependencies = [ name = "webdriver_server" version = "0.0.1" dependencies = [ - "compositing 0.0.1", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2351,6 +2350,7 @@ dependencies = [ "plugins 0.0.1", "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", + "script_traits 0.0.1", "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index 08bab05fb1e..0e843f16f6f 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -453,6 +453,7 @@ dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gecko_bindings 0.0.1", "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/geckolib/gecko_bindings/bindings.rs b/ports/geckolib/gecko_bindings/bindings.rs index 6d943733a27..425fa65ea12 100644 --- a/ports/geckolib/gecko_bindings/bindings.rs +++ b/ports/geckolib/gecko_bindings/bindings.rs @@ -25,6 +25,8 @@ use structs::nsStyleSVGReset; use structs::nsStyleColumn; use structs::nsStyleEffects; use structs::SheetParsingMode; +use structs::nsMainThreadPtrHandle; +use structs::nsMainThreadPtrHolder; use heapsize::HeapSizeOf; unsafe impl Send for nsStyleFont {} unsafe impl Sync for nsStyleFont {} @@ -102,6 +104,8 @@ impl HeapSizeOf for nsStyleEffects { fn heap_size_of_children(&self) -> usize { pub enum nsIAtom { } pub enum nsINode { } pub type RawGeckoNode = nsINode; +pub enum nsIPrincipal { } +pub enum nsIURI { } pub enum Element { } pub type RawGeckoElement = Element; pub enum nsIDocument { } @@ -110,6 +114,8 @@ pub enum ServoNodeData { } pub enum ServoComputedValues { } pub enum RawServoStyleSheet { } pub enum RawServoStyleSet { } +pub type ThreadSafePrincipalHolder = nsMainThreadPtrHolder<nsIPrincipal>; +pub type ThreadSafeURIHolder = nsMainThreadPtrHolder<nsIURI>; extern "C" { pub fn Gecko_ChildrenCount(node: *mut RawGeckoNode) -> u32; pub fn Gecko_NodeIsElement(node: *mut RawGeckoNode) -> bool; @@ -138,6 +144,8 @@ extern "C" { pub fn Gecko_IsVisitedLink(element: *mut RawGeckoElement) -> bool; pub fn Gecko_IsUnvisitedLink(element: *mut RawGeckoElement) -> bool; pub fn Gecko_IsRootElement(element: *mut RawGeckoElement) -> bool; + pub fn Gecko_LocalName(element: *mut RawGeckoElement) -> *mut nsIAtom; + pub fn Gecko_Namespace(element: *mut RawGeckoElement) -> *mut nsIAtom; pub fn Gecko_GetNodeData(node: *mut RawGeckoNode) -> *mut ServoNodeData; pub fn Gecko_SetNodeData(node: *mut RawGeckoNode, data: *mut ServoNodeData); @@ -159,8 +167,25 @@ extern "C" { pub fn Gecko_SetListStyleType(style_struct: *mut nsStyleList, type_: u32); pub fn Gecko_CopyListStyleTypeFrom(dst: *mut nsStyleList, src: *const nsStyleList); + pub fn Gecko_AddRefPrincipalArbitraryThread(aPtr: + *mut ThreadSafePrincipalHolder); + pub fn Gecko_ReleasePrincipalArbitraryThread(aPtr: + *mut ThreadSafePrincipalHolder); + pub fn Gecko_AddRefURIArbitraryThread(aPtr: *mut ThreadSafeURIHolder); + pub fn Gecko_ReleaseURIArbitraryThread(aPtr: *mut ThreadSafeURIHolder); + pub fn Gecko_SetMozBinding(style_struct: *mut nsStyleDisplay, + string_bytes: *const u8, string_length: u32, + base_uri: *mut ThreadSafeURIHolder, + referrer: *mut ThreadSafeURIHolder, + principal: *mut ThreadSafePrincipalHolder); + pub fn Gecko_CopyMozBindingFrom(des: *mut nsStyleDisplay, + src: *const nsStyleDisplay); pub fn Servo_StylesheetFromUTF8Bytes(bytes: *const u8, length: u32, - parsing_mode: SheetParsingMode) + parsing_mode: SheetParsingMode, + base: *mut ThreadSafeURIHolder, + referrer: *mut ThreadSafeURIHolder, + principal: + *mut ThreadSafePrincipalHolder) -> *mut RawServoStyleSheet; pub fn Servo_AddRefStyleSheet(sheet: *mut RawServoStyleSheet); pub fn Servo_ReleaseStyleSheet(sheet: *mut RawServoStyleSheet); @@ -202,8 +227,6 @@ extern "C" { ns: *mut nsIAtom, name: *mut nsIAtom, length: *mut u32) -> *const ::std::os::raw::c_char; - pub fn Gecko_LocalName(element: *mut RawGeckoElement) -> *mut nsIAtom; - pub fn Gecko_Namespace(element: *mut RawGeckoElement) -> *mut nsIAtom; pub fn Gecko_Construct_nsStyleFont(ptr: *mut nsStyleFont); pub fn Gecko_CopyConstruct_nsStyleFont(ptr: *mut nsStyleFont, other: *const nsStyleFont); diff --git a/ports/geckolib/gecko_bindings/lib.rs b/ports/geckolib/gecko_bindings/lib.rs index b6d684b5891..d1bfb30985d 100644 --- a/ports/geckolib/gecko_bindings/lib.rs +++ b/ports/geckolib/gecko_bindings/lib.rs @@ -2,9 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#![feature(concat_idents)] +#![feature(type_macros)] + extern crate heapsize; #[allow(dead_code, non_camel_case_types)] pub mod bindings; +pub mod ptr; #[allow(dead_code, non_camel_case_types, non_snake_case, non_upper_case_globals)] pub mod structs; diff --git a/ports/geckolib/gecko_bindings/ptr.rs b/ports/geckolib/gecko_bindings/ptr.rs new file mode 100644 index 00000000000..089df6f70b1 --- /dev/null +++ b/ports/geckolib/gecko_bindings/ptr.rs @@ -0,0 +1,59 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use bindings::*; +use heapsize::HeapSizeOf; +use std::fmt::{self, Debug}; + +// Defines an Arc-like type that manages a refcounted Gecko object stored +// in a ThreadSafeFooHolder smart pointer. Used in tandem with the +// NS_DECL_HOLDER_FFI_REFCOUNTING-defined types and functions in Gecko. +macro_rules! define_holder_arc { + ($arc_type:ident, $name:ident, $holder_type:ident) => ( + #[derive(PartialEq)] + pub struct $arc_type { + ptr: *mut $holder_type, + } + + impl $arc_type { + pub fn new(data: *mut $holder_type) -> $arc_type { + debug_assert!(!data.is_null()); + unsafe { concat_idents!(Gecko_AddRef, $name, ArbitraryThread)(data); } + $arc_type { + ptr: data + } + } + + pub fn as_raw(&self) -> *mut $holder_type { self.ptr } + } + + unsafe impl Send for $arc_type {} + unsafe impl Sync for $arc_type {} + + impl Clone for $arc_type { + fn clone(&self) -> $arc_type { + $arc_type::new(self.ptr) + } + } + + impl Drop for $arc_type { + fn drop(&mut self) { + unsafe { concat_idents!(Gecko_Release, $name, ArbitraryThread)(self.ptr); } + } + } + + impl HeapSizeOf for $arc_type { + fn heap_size_of_children(&self) -> usize { 0 } + } + + impl Debug for $arc_type { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, stringify!($name)) + } + } + ) +} + +define_holder_arc!(GeckoArcPrincipal, Principal, ThreadSafePrincipalHolder); +define_holder_arc!(GeckoArcURI, URI, ThreadSafeURIHolder); diff --git a/ports/geckolib/gecko_bindings/structs.rs b/ports/geckolib/gecko_bindings/structs.rs index c2d4d178089..f736bc2896b 100644 --- a/ports/geckolib/gecko_bindings/structs.rs +++ b/ports/geckolib/gecko_bindings/structs.rs @@ -2747,7 +2747,6 @@ pub struct piecewise_construct_t; impl ::std::clone::Clone for piecewise_construct_t { fn clone(&self) -> Self { *self } } -pub enum tuple { } #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct pair<_T1, _T2> { @@ -3779,6 +3778,56 @@ pub type nscolor = u32; #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] pub enum nsHexColorType { NoAlpha = 0, AllowAlpha = 1, } /** + * Class to safely handle main-thread-only pointers off the main thread. + * + * Classes like XPCWrappedJS are main-thread-only, which means that it is + * forbidden to call methods on instances of these classes off the main thread. + * For various reasons (see bug 771074), this restriction recently began to + * apply to AddRef/Release as well. + * + * This presents a problem for consumers that wish to hold a callback alive + * on non-main-thread code. A common example of this is the proxy callback + * pattern, where non-main-thread code holds a strong-reference to the callback + * object, and dispatches new Runnables (also with a strong reference) to the + * main thread in order to execute the callback. This involves several AddRef + * and Release calls on the other thread, which is (now) verboten. + * + * The basic idea of this class is to introduce a layer of indirection. + * nsMainThreadPtrHolder is a threadsafe reference-counted class that internally + * maintains one strong reference to the main-thread-only object. It must be + * instantiated on the main thread (so that the AddRef of the underlying object + * happens on the main thread), but consumers may subsequently pass references + * to the holder anywhere they please. These references are meant to be opaque + * when accessed off-main-thread (assertions enforce this). + * + * The semantics of RefPtr<nsMainThreadPtrHolder<T> > would be cumbersome, so + * we also introduce nsMainThreadPtrHandle<T>, which is conceptually identical + * to the above (though it includes various convenience methods). The basic + * pattern is as follows. + * + * // On the main thread: + * nsCOMPtr<nsIFooCallback> callback = ...; + * nsMainThreadPtrHandle<nsIFooCallback> callbackHandle = + * new nsMainThreadPtrHolder<nsIFooCallback>(callback); + * // Pass callbackHandle to structs/classes that might be accessed on other + * // threads. + * + * All structs and classes that might be accessed on other threads should store + * an nsMainThreadPtrHandle<T> rather than an nsCOMPtr<T>. + */ +#[repr(C)] +#[derive(Debug)] +pub struct nsMainThreadPtrHolder<T> { + pub mRefCnt: ThreadSafeAutoRefCnt, + pub mRawPtr: *mut T, + pub mStrict: bool, +} +#[repr(C)] +#[derive(Debug)] +pub struct nsMainThreadPtrHandle<T> { + pub mPtr: RefPtr<T>, +} +/** * This structure precedes the string buffers "we" allocate. It may be the * case that nsTAString::mData does not point to one of these special * buffers. The mFlags member variable distinguishes the buffer type. @@ -3800,12 +3849,21 @@ fn bindgen_test_layout_nsStringBuffer() { } pub enum CSSStyleSheet { } #[repr(C)] +pub struct URLValueData { + pub _bindgen_opaque_blob: [u64; 5usize], +} +#[test] +fn bindgen_test_layout_URLValueData() { + assert_eq!(::std::mem::size_of::<URLValueData>() , 40usize); + assert_eq!(::std::mem::align_of::<URLValueData>() , 8usize); +} +#[repr(C)] pub struct URLValue { - pub _bindgen_opaque_blob: [u64; 7usize], + pub _bindgen_opaque_blob: [u64; 6usize], } #[test] fn bindgen_test_layout_URLValue() { - assert_eq!(::std::mem::size_of::<URLValue>() , 56usize); + assert_eq!(::std::mem::size_of::<URLValue>() , 48usize); assert_eq!(::std::mem::align_of::<URLValue>() , 8usize); } #[repr(C)] @@ -4553,22 +4611,22 @@ pub enum nsStyleUnit { } #[repr(C)] #[derive(Debug, Copy)] -pub struct nsStyleCoord_h_unnamed_10 { +pub struct nsStyleCoord_h_unnamed_14 { pub mInt: __BindgenUnionField<i32>, pub mFloat: __BindgenUnionField<f32>, pub mPointer: __BindgenUnionField<*mut ::std::os::raw::c_void>, pub _bindgen_data_: u64, } -impl nsStyleCoord_h_unnamed_10 { } -impl ::std::clone::Clone for nsStyleCoord_h_unnamed_10 { +impl nsStyleCoord_h_unnamed_14 { } +impl ::std::clone::Clone for nsStyleCoord_h_unnamed_14 { fn clone(&self) -> Self { *self } } #[test] -fn bindgen_test_layout_nsStyleCoord_h_unnamed_10() { - assert_eq!(::std::mem::size_of::<nsStyleCoord_h_unnamed_10>() , 8usize); - assert_eq!(::std::mem::align_of::<nsStyleCoord_h_unnamed_10>() , 8usize); +fn bindgen_test_layout_nsStyleCoord_h_unnamed_14() { + assert_eq!(::std::mem::size_of::<nsStyleCoord_h_unnamed_14>() , 8usize); + assert_eq!(::std::mem::align_of::<nsStyleCoord_h_unnamed_14>() , 8usize); } -pub type nsStyleUnion = nsStyleCoord_h_unnamed_10; +pub type nsStyleUnion = nsStyleCoord_h_unnamed_14; /** * Class that hold a single size specification used by the style * system. The size specification consists of two parts -- a number @@ -4763,27 +4821,27 @@ pub enum nsStyleImageType { pub struct nsStyleImage { pub mSubImages: u64, pub mType: nsStyleImageType, - pub nsStyleImage_nsStyleStruct_h_unnamed_13: nsStyleImage_nsStyleStruct_h_unnamed_13, + pub nsStyleImage_nsStyleStruct_h_unnamed_17: nsStyleImage_nsStyleStruct_h_unnamed_17, pub mCropRect: nsAutoPtr<nsStyleSides>, pub mImageTracked: bool, } #[repr(C)] #[derive(Debug, Copy)] -pub struct nsStyleImage_nsStyleStruct_h_unnamed_13 { +pub struct nsStyleImage_nsStyleStruct_h_unnamed_17 { pub mImage: __BindgenUnionField<*mut imgRequestProxy>, pub mGradient: __BindgenUnionField<*mut nsStyleGradient>, pub mElementId: __BindgenUnionField<*mut ::std::os::raw::c_ushort>, pub _bindgen_data_: u64, } -impl nsStyleImage_nsStyleStruct_h_unnamed_13 { } -impl ::std::clone::Clone for nsStyleImage_nsStyleStruct_h_unnamed_13 { +impl nsStyleImage_nsStyleStruct_h_unnamed_17 { } +impl ::std::clone::Clone for nsStyleImage_nsStyleStruct_h_unnamed_17 { fn clone(&self) -> Self { *self } } #[test] -fn bindgen_test_layout_nsStyleImage_nsStyleStruct_h_unnamed_13() { - assert_eq!(::std::mem::size_of::<nsStyleImage_nsStyleStruct_h_unnamed_13>() +fn bindgen_test_layout_nsStyleImage_nsStyleStruct_h_unnamed_17() { + assert_eq!(::std::mem::size_of::<nsStyleImage_nsStyleStruct_h_unnamed_17>() , 8usize); - assert_eq!(::std::mem::align_of::<nsStyleImage_nsStyleStruct_h_unnamed_13>() + assert_eq!(::std::mem::align_of::<nsStyleImage_nsStyleStruct_h_unnamed_17>() , 8usize); } #[test] @@ -4833,7 +4891,7 @@ pub struct nsStyleImageLayers { } #[repr(u32)] #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] -pub enum nsStyleImageLayers_nsStyleStruct_h_unnamed_14 { +pub enum nsStyleImageLayers_nsStyleStruct_h_unnamed_18 { shorthand = 0, color = 1, image = 2, @@ -5298,7 +5356,7 @@ fn bindgen_test_layout_nsStyleVisibility() { #[derive(Debug, Copy)] pub struct nsTimingFunction { pub mType: nsTimingFunction_Type, - pub nsTimingFunction_nsStyleStruct_h_unnamed_15: nsTimingFunction_nsStyleStruct_h_unnamed_15, + pub nsTimingFunction_nsStyleStruct_h_unnamed_19: nsTimingFunction_nsStyleStruct_h_unnamed_19, } #[repr(i32)] #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] @@ -5325,56 +5383,56 @@ pub enum nsTimingFunction_StepSyntax { pub enum nsTimingFunction_Keyword { Implicit = 0, Explicit = 1, } #[repr(C)] #[derive(Debug, Copy)] -pub struct nsTimingFunction_nsStyleStruct_h_unnamed_15 { - pub mFunc: __BindgenUnionField<nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_16>, - pub nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_17: __BindgenUnionField<nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_17>, +pub struct nsTimingFunction_nsStyleStruct_h_unnamed_19 { + pub mFunc: __BindgenUnionField<nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_20>, + pub nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_21: __BindgenUnionField<nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_21>, pub _bindgen_data_: [u32; 4usize], } -impl nsTimingFunction_nsStyleStruct_h_unnamed_15 { } -impl ::std::clone::Clone for nsTimingFunction_nsStyleStruct_h_unnamed_15 { +impl nsTimingFunction_nsStyleStruct_h_unnamed_19 { } +impl ::std::clone::Clone for nsTimingFunction_nsStyleStruct_h_unnamed_19 { fn clone(&self) -> Self { *self } } #[test] -fn bindgen_test_layout_nsTimingFunction_nsStyleStruct_h_unnamed_15() { - assert_eq!(::std::mem::size_of::<nsTimingFunction_nsStyleStruct_h_unnamed_15>() +fn bindgen_test_layout_nsTimingFunction_nsStyleStruct_h_unnamed_19() { + assert_eq!(::std::mem::size_of::<nsTimingFunction_nsStyleStruct_h_unnamed_19>() , 16usize); - assert_eq!(::std::mem::align_of::<nsTimingFunction_nsStyleStruct_h_unnamed_15>() + assert_eq!(::std::mem::align_of::<nsTimingFunction_nsStyleStruct_h_unnamed_19>() , 4usize); } #[repr(C)] #[derive(Debug, Copy)] -pub struct nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_16 { +pub struct nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_20 { pub mX1: f32, pub mY1: f32, pub mX2: f32, pub mY2: f32, } impl ::std::clone::Clone for - nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_16 { + nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_20 { fn clone(&self) -> Self { *self } } #[test] -fn bindgen_test_layout_nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_16() { - assert_eq!(::std::mem::size_of::<nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_16>() +fn bindgen_test_layout_nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_20() { + assert_eq!(::std::mem::size_of::<nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_20>() , 16usize); - assert_eq!(::std::mem::align_of::<nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_16>() + assert_eq!(::std::mem::align_of::<nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_20>() , 4usize); } #[repr(C)] #[derive(Debug, Copy)] -pub struct nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_17 { +pub struct nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_21 { pub mStepSyntax: nsTimingFunction_StepSyntax, pub mSteps: u32, } impl ::std::clone::Clone for - nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_17 { + nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_21 { fn clone(&self) -> Self { *self } } #[test] -fn bindgen_test_layout_nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_17() { - assert_eq!(::std::mem::size_of::<nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_17>() +fn bindgen_test_layout_nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_21() { + assert_eq!(::std::mem::size_of::<nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_21>() , 8usize); - assert_eq!(::std::mem::align_of::<nsTimingFunction_nsStyleStruct_h_unnamed_15_nsStyleStruct_h_unnamed_17>() + assert_eq!(::std::mem::align_of::<nsTimingFunction_nsStyleStruct_h_unnamed_19_nsStyleStruct_h_unnamed_21>() , 4usize); } impl ::std::clone::Clone for nsTimingFunction { @@ -5519,26 +5577,26 @@ pub enum nsStyleContentType { #[derive(Debug)] pub struct nsStyleContentData { pub mType: nsStyleContentType, - pub mContent: nsStyleContentData_nsStyleStruct_h_unnamed_18, + pub mContent: nsStyleContentData_nsStyleStruct_h_unnamed_22, pub mImageTracked: bool, } #[repr(C)] #[derive(Debug, Copy)] -pub struct nsStyleContentData_nsStyleStruct_h_unnamed_18 { +pub struct nsStyleContentData_nsStyleStruct_h_unnamed_22 { pub mString: __BindgenUnionField<*mut ::std::os::raw::c_ushort>, pub mImage: __BindgenUnionField<*mut imgRequestProxy>, pub mCounters: __BindgenUnionField<*mut Array>, pub _bindgen_data_: u64, } -impl nsStyleContentData_nsStyleStruct_h_unnamed_18 { } -impl ::std::clone::Clone for nsStyleContentData_nsStyleStruct_h_unnamed_18 { +impl nsStyleContentData_nsStyleStruct_h_unnamed_22 { } +impl ::std::clone::Clone for nsStyleContentData_nsStyleStruct_h_unnamed_22 { fn clone(&self) -> Self { *self } } #[test] -fn bindgen_test_layout_nsStyleContentData_nsStyleStruct_h_unnamed_18() { - assert_eq!(::std::mem::size_of::<nsStyleContentData_nsStyleStruct_h_unnamed_18>() +fn bindgen_test_layout_nsStyleContentData_nsStyleStruct_h_unnamed_22() { + assert_eq!(::std::mem::size_of::<nsStyleContentData_nsStyleStruct_h_unnamed_22>() , 8usize); - assert_eq!(::std::mem::align_of::<nsStyleContentData_nsStyleStruct_h_unnamed_18>() + assert_eq!(::std::mem::align_of::<nsStyleContentData_nsStyleStruct_h_unnamed_22>() , 8usize); } #[test] @@ -5672,26 +5730,26 @@ pub enum nsStyleSVGOpacitySource { #[repr(C)] #[derive(Debug)] pub struct nsStyleSVGPaint { - pub mPaint: nsStyleSVGPaint_nsStyleStruct_h_unnamed_19, + pub mPaint: nsStyleSVGPaint_nsStyleStruct_h_unnamed_23, pub mType: nsStyleSVGPaintType, pub mFallbackColor: nscolor, } #[repr(C)] #[derive(Debug, Copy)] -pub struct nsStyleSVGPaint_nsStyleStruct_h_unnamed_19 { +pub struct nsStyleSVGPaint_nsStyleStruct_h_unnamed_23 { pub mColor: __BindgenUnionField<nscolor>, pub mPaintServer: __BindgenUnionField<*mut nsIURI>, pub _bindgen_data_: u64, } -impl nsStyleSVGPaint_nsStyleStruct_h_unnamed_19 { } -impl ::std::clone::Clone for nsStyleSVGPaint_nsStyleStruct_h_unnamed_19 { +impl nsStyleSVGPaint_nsStyleStruct_h_unnamed_23 { } +impl ::std::clone::Clone for nsStyleSVGPaint_nsStyleStruct_h_unnamed_23 { fn clone(&self) -> Self { *self } } #[test] -fn bindgen_test_layout_nsStyleSVGPaint_nsStyleStruct_h_unnamed_19() { - assert_eq!(::std::mem::size_of::<nsStyleSVGPaint_nsStyleStruct_h_unnamed_19>() +fn bindgen_test_layout_nsStyleSVGPaint_nsStyleStruct_h_unnamed_23() { + assert_eq!(::std::mem::size_of::<nsStyleSVGPaint_nsStyleStruct_h_unnamed_23>() , 8usize); - assert_eq!(::std::mem::align_of::<nsStyleSVGPaint_nsStyleStruct_h_unnamed_19>() + assert_eq!(::std::mem::align_of::<nsStyleSVGPaint_nsStyleStruct_h_unnamed_23>() , 8usize); } #[test] @@ -5758,25 +5816,25 @@ fn bindgen_test_layout_nsStyleBasicShape() { #[derive(Debug)] pub struct nsStyleClipPath { pub mType: i32, - pub nsStyleClipPath_nsStyleStruct_h_unnamed_20: nsStyleClipPath_nsStyleStruct_h_unnamed_20, + pub nsStyleClipPath_nsStyleStruct_h_unnamed_24: nsStyleClipPath_nsStyleStruct_h_unnamed_24, pub mSizingBox: u8, } #[repr(C)] #[derive(Debug, Copy)] -pub struct nsStyleClipPath_nsStyleStruct_h_unnamed_20 { +pub struct nsStyleClipPath_nsStyleStruct_h_unnamed_24 { pub mBasicShape: __BindgenUnionField<*mut nsStyleBasicShape>, pub mURL: __BindgenUnionField<*mut nsIURI>, pub _bindgen_data_: u64, } -impl nsStyleClipPath_nsStyleStruct_h_unnamed_20 { } -impl ::std::clone::Clone for nsStyleClipPath_nsStyleStruct_h_unnamed_20 { +impl nsStyleClipPath_nsStyleStruct_h_unnamed_24 { } +impl ::std::clone::Clone for nsStyleClipPath_nsStyleStruct_h_unnamed_24 { fn clone(&self) -> Self { *self } } #[test] -fn bindgen_test_layout_nsStyleClipPath_nsStyleStruct_h_unnamed_20() { - assert_eq!(::std::mem::size_of::<nsStyleClipPath_nsStyleStruct_h_unnamed_20>() +fn bindgen_test_layout_nsStyleClipPath_nsStyleStruct_h_unnamed_24() { + assert_eq!(::std::mem::size_of::<nsStyleClipPath_nsStyleStruct_h_unnamed_24>() , 8usize); - assert_eq!(::std::mem::align_of::<nsStyleClipPath_nsStyleStruct_h_unnamed_20>() + assert_eq!(::std::mem::align_of::<nsStyleClipPath_nsStyleStruct_h_unnamed_24>() , 8usize); } #[test] @@ -5789,24 +5847,24 @@ fn bindgen_test_layout_nsStyleClipPath() { pub struct nsStyleFilter { pub mType: i32, pub mFilterParameter: nsStyleCoord, - pub nsStyleFilter_nsStyleStruct_h_unnamed_21: nsStyleFilter_nsStyleStruct_h_unnamed_21, + pub nsStyleFilter_nsStyleStruct_h_unnamed_25: nsStyleFilter_nsStyleStruct_h_unnamed_25, } #[repr(C)] #[derive(Debug, Copy)] -pub struct nsStyleFilter_nsStyleStruct_h_unnamed_21 { +pub struct nsStyleFilter_nsStyleStruct_h_unnamed_25 { pub mURL: __BindgenUnionField<*mut nsIURI>, pub mDropShadow: __BindgenUnionField<*mut nsCSSShadowArray>, pub _bindgen_data_: u64, } -impl nsStyleFilter_nsStyleStruct_h_unnamed_21 { } -impl ::std::clone::Clone for nsStyleFilter_nsStyleStruct_h_unnamed_21 { +impl nsStyleFilter_nsStyleStruct_h_unnamed_25 { } +impl ::std::clone::Clone for nsStyleFilter_nsStyleStruct_h_unnamed_25 { fn clone(&self) -> Self { *self } } #[test] -fn bindgen_test_layout_nsStyleFilter_nsStyleStruct_h_unnamed_21() { - assert_eq!(::std::mem::size_of::<nsStyleFilter_nsStyleStruct_h_unnamed_21>() +fn bindgen_test_layout_nsStyleFilter_nsStyleStruct_h_unnamed_25() { + assert_eq!(::std::mem::size_of::<nsStyleFilter_nsStyleStruct_h_unnamed_25>() , 8usize); - assert_eq!(::std::mem::align_of::<nsStyleFilter_nsStyleStruct_h_unnamed_21>() + assert_eq!(::std::mem::align_of::<nsStyleFilter_nsStyleStruct_h_unnamed_25>() , 8usize); } #[test] diff --git a/ports/geckolib/gecko_bindings/tools/regen_bindings.sh b/ports/geckolib/gecko_bindings/tools/regen_bindings.sh index cce6f21ddfb..da147247541 100755 --- a/ports/geckolib/gecko_bindings/tools/regen_bindings.sh +++ b/ports/geckolib/gecko_bindings/tools/regen_bindings.sh @@ -50,7 +50,7 @@ do done # Other mapped types. -for TYPE in SheetParsingMode +for TYPE in SheetParsingMode nsMainThreadPtrHandle nsMainThreadPtrHolder do MAP_GECKO_TYPES=$MAP_GECKO_TYPES"-blacklist-type $TYPE " MAP_GECKO_TYPES=$MAP_GECKO_TYPES"-raw-line 'use structs::$TYPE;' " @@ -59,6 +59,8 @@ done # Check for the include directory. +export OBJDIR="$1" +export SRCDIR="$1/.." # Not necessarily true, but let's assume. export DIST_INCLUDE="$1/dist/include" if [ ! -d "$DIST_INCLUDE" ]; then echo "$DIST_INCLUDE: directory not found" @@ -72,6 +74,8 @@ export RUST_BACKTRACE=1 eval ./rust-bindgen/target/debug/bindgen \ -x c++ -std=gnu++0x \ "-I$DIST_INCLUDE" \ + "-I$DIST_INCLUDE/nspr/" \ + "-I$SRCDIR/nsprpub/pr/include/" \ $PLATFORM_DEPENDENT_DEFINES \ -o ../bindings.rs \ -no-type-renaming \ diff --git a/ports/geckolib/gecko_bindings/tools/regen_style_structs.sh b/ports/geckolib/gecko_bindings/tools/regen_style_structs.sh index 5f9c77c146a..64b56284026 100755 --- a/ports/geckolib/gecko_bindings/tools/regen_style_structs.sh +++ b/ports/geckolib/gecko_bindings/tools/regen_style_structs.sh @@ -102,8 +102,10 @@ export RUST_BACKTRACE=1 -match "pair" \ -match "SheetParsingMode.h" \ -match "StaticPtr.h" \ + -match "nsProxyRelease.h" \ -blacklist-type "IsDestructibleFallbackImpl" \ -blacklist-type "IsDestructibleFallback" \ + -blacklist-type "nsProxyReleaseEvent" \ -opaque-type "nsIntMargin" \ -opaque-type "nsIntPoint" \ -opaque-type "nsIntRect" \ @@ -116,6 +118,7 @@ export RUST_BACKTRACE=1 -opaque-type "CounterStyleManager" \ -opaque-type "ImageValue" \ -opaque-type "URLValue" \ + -opaque-type "URLValueData" \ -opaque-type "nsIPrincipal" \ -opaque-type "nsDataHashtable" \ -opaque-type "imgIRequest" \ diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 0755b893b16..578fb5a1a77 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -10,7 +10,8 @@ use env_logger; use euclid::Size2D; use gecko_bindings::bindings::{RawGeckoDocument, RawGeckoElement, RawGeckoNode}; use gecko_bindings::bindings::{RawServoStyleSet, RawServoStyleSheet, ServoComputedValues, ServoNodeData}; -use gecko_bindings::bindings::{nsIAtom}; +use gecko_bindings::bindings::{ThreadSafePrincipalHolder, ThreadSafeURIHolder, nsIAtom}; +use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI}; use gecko_bindings::structs::SheetParsingMode; use properties::GeckoComputedValues; use selector_impl::{GeckoSelectorImpl, PseudoElement, SharedStyleContext, Stylesheet}; @@ -24,6 +25,7 @@ use style::context::{ReflowGoal}; use style::dom::{TDocument, TElement, TNode}; use style::error_reporting::StdoutErrorReporter; use style::parallel; +use style::parser::ParserContextExtraData; use style::properties::ComputedValues; use style::selector_impl::{SelectorImplExt, PseudoElementCascadeType}; use style::stylesheets::Origin; @@ -120,7 +122,11 @@ pub extern "C" fn Servo_DropNodeData(data: *mut ServoNodeData) -> () { #[no_mangle] pub extern "C" fn Servo_StylesheetFromUTF8Bytes(bytes: *const u8, length: u32, - mode: SheetParsingMode) -> *mut RawServoStyleSheet { + mode: SheetParsingMode, + base: *mut ThreadSafeURIHolder, + referrer: *mut ThreadSafeURIHolder, + principal: *mut ThreadSafePrincipalHolder) + -> *mut RawServoStyleSheet { let input = unsafe { from_utf8_unchecked(slice::from_raw_parts(bytes, length as usize)) }; @@ -132,7 +138,13 @@ pub extern "C" fn Servo_StylesheetFromUTF8Bytes(bytes: *const u8, // FIXME(heycam): Pass in the real base URL. let url = Url::parse("about:none").unwrap(); - let sheet = Arc::new(Stylesheet::from_str(input, url, origin, Box::new(StdoutErrorReporter))); + let extra_data = ParserContextExtraData { + base: Some(GeckoArcURI::new(base)), + referrer: Some(GeckoArcURI::new(referrer)), + principal: Some(GeckoArcPrincipal::new(principal)), + }; + let sheet = Arc::new(Stylesheet::from_str(input, url, origin, Box::new(StdoutErrorReporter), + extra_data)); unsafe { transmute(sheet) } diff --git a/ports/geckolib/properties.mako.rs b/ports/geckolib/properties.mako.rs index 55a9a528bbd..387f5e02edb 100644 --- a/ports/geckolib/properties.mako.rs +++ b/ports/geckolib/properties.mako.rs @@ -16,7 +16,8 @@ use gecko_bindings::bindings::Gecko_Construct_${style_struct.gecko_ffi_name}; use gecko_bindings::bindings::Gecko_CopyConstruct_${style_struct.gecko_ffi_name}; use gecko_bindings::bindings::Gecko_Destroy_${style_struct.gecko_ffi_name}; % endfor -use gecko_bindings::bindings::{Gecko_CopyListStyleTypeFrom, Gecko_SetListStyleType}; +use gecko_bindings::bindings::{Gecko_CopyMozBindingFrom, Gecko_CopyListStyleTypeFrom}; +use gecko_bindings::bindings::{Gecko_SetMozBinding, Gecko_SetListStyleType}; use gecko_bindings::structs; use glue::ArcHelpers; use heapsize::HeapSizeOf; @@ -625,7 +626,7 @@ fn static_assert() { </%self:impl_trait> -<%self:impl_trait style_struct_name="Box" skip_longhands="display overflow-y vertical-align"> +<%self:impl_trait style_struct_name="Box" skip_longhands="display overflow-y vertical-align -moz-binding"> // We manually-implement the |display| property until we get general // infrastructure for preffing certain values. @@ -677,6 +678,25 @@ fn static_assert() { self.gecko.mVerticalAlign.mValue = other.gecko.mVerticalAlign.mValue; } + fn set__moz_binding(&mut self, v: longhands::_moz_binding::computed_value::T) { + use style::properties::longhands::_moz_binding::SpecifiedValue as BindingValue; + match v { + BindingValue::None => debug_assert!(self.gecko.mBinding.mRawPtr.is_null()), + BindingValue::Url(ref url, ref extra_data) => { + unsafe { + Gecko_SetMozBinding(&mut self.gecko, + url.as_str().as_ptr(), + url.as_str().len() as u32, + extra_data.base.as_raw(), + extra_data.referrer.as_raw(), + extra_data.principal.as_raw()); + } + } + } + } + fn copy__moz_binding_from(&mut self, other: &Self) { + unsafe { Gecko_CopyMozBindingFrom(&mut self.gecko, &other.gecko); } + } </%self:impl_trait> <%self:impl_trait style_struct_name="Background" skip_longhands="background-color" skip_additionals="*"> diff --git a/ports/geckolib/wrapper.rs b/ports/geckolib/wrapper.rs index e0040cf5745..a30060d416a 100644 --- a/ports/geckolib/wrapper.rs +++ b/ports/geckolib/wrapper.rs @@ -37,6 +37,7 @@ use style::dom::{TDocument, TElement, TNode, TRestyleDamage, UnsafeNode}; use style::element_state::ElementState; #[allow(unused_imports)] // Used in commented-out code. use style::error_reporting::StdoutErrorReporter; +use style::parser::ParserContextExtraData; use style::properties::{PropertyDeclaration, PropertyDeclarationBlock}; #[allow(unused_imports)] // Used in commented-out code. use style::properties::{parse_style_attribute}; @@ -330,7 +331,11 @@ impl<'le> TElement for GeckoElement<'le> { let attr = self.get_attr(&ns!(), &atom!("style")); // FIXME(bholley): Real base URL and error reporter. let base_url = Url::parse("http://www.example.org").unwrap(); - attr.map(|v| parse_style_attribute(&v, &base_url, Box::new(StdoutErrorReporter))) + // FIXME(heycam): Needs real ParserContextExtraData so that URLs parse + // properly. + let extra_data = ParserContextExtraData::default(); + attr.map(|v| parse_style_attribute(&v, &base_url, Box::new(StdoutErrorReporter), + extra_data)) */ } diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 921825dbf96..79e1fb8f3c1 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -178,6 +178,7 @@ class CommandBase(object): self.config["android"].setdefault("sdk", "") self.config["android"].setdefault("ndk", "") self.config["android"].setdefault("toolchain", "") + self.config["android"].setdefault("platform", "android-18") self.config["android"].setdefault("target", "arm-linux-androideabi") self.config.setdefault("gonk", {}) @@ -318,6 +319,8 @@ class CommandBase(object): env["ANDROID_NDK"] = self.config["android"]["ndk"] if self.config["android"]["toolchain"]: env["ANDROID_TOOLCHAIN"] = self.config["android"]["toolchain"] + if self.config["android"]["platform"]: + env["ANDROID_PLATFORM"] = self.config["android"]["platform"] if gonk: if self.config["gonk"]["b2g"]: diff --git a/resources/user-agent.css b/resources/user-agent.css index 50fdae84d9a..9d2c2508d98 100644 --- a/resources/user-agent.css +++ b/resources/user-agent.css @@ -252,6 +252,7 @@ table:matches( input, select, option, optgroup, button, textarea, keygen { text-indent: initial; + text-transform: none; } textarea { white-space: pre-wrap; } diff --git a/servobuild.example b/servobuild.example index ec4de5ee9e9..da3d8d73c80 100644 --- a/servobuild.example +++ b/servobuild.example @@ -41,10 +41,11 @@ debug-mozjs = false # Android information [android] -# Defaults to the value of $ANDROID_SDK, $ANDROID_NDK, $ANDROID_TOOLCHAIN respectively +# Defaults to the value of $ANDROID_SDK, $ANDROID_NDK, $ANDROID_TOOLCHAIN, $ANDROID_PLATFORM respectively #sdk = "/opt/android-sdk" #ndk = "/opt/android-ndk" #toolchain = "/opt/android-toolchain" +#platform = "android-18" # Gonk information # Please fill the ndk/toolchain for Android too diff --git a/support/android/apk/build.xml b/support/android/apk/build.xml index 3d1611517a8..3e22c93f50a 100644 --- a/support/android/apk/build.xml +++ b/support/android/apk/build.xml @@ -36,17 +36,9 @@ <condition property="sdk.dir" value="${env.ANDROID_HOME}"> <isset property="env.ANDROID_HOME" /> </condition> - - <!-- The project.properties file is created and updated by the 'android' - tool, as well as ADT. - - This contains project specific properties such as project target, and library - dependencies. Lower level build properties are stored in ant.properties - (or in .classpath for Eclipse projects). - - This file is an integral part of the build system for your - application and should be checked into Version Control Systems. --> - <loadproperties srcFile="project.properties" /> + <condition property="target" value="${env.ANDROID_PLATFORM}"> + <isset property="env.ANDROID_PLATFORM" /> + </condition> <!-- quick check on sdk.dir --> <fail diff --git a/support/android/apk/jni/Application.mk b/support/android/apk/jni/Application.mk index 3784f3fc6c5..794d4261d5a 100644 --- a/support/android/apk/jni/Application.mk +++ b/support/android/apk/jni/Application.mk @@ -1,2 +1,2 @@ APP_ABI := armeabi -APP_PLATFORM := android-18 +APP_PLATFORM := $(ANDROID_PLATFORM) diff --git a/support/android/apk/project.properties b/support/android/apk/project.properties deleted file mode 100644 index c0442c37105..00000000000 --- a/support/android/apk/project.properties +++ /dev/null @@ -1 +0,0 @@ -target=android-18 diff --git a/support/android/build-apk/src/main.rs b/support/android/build-apk/src/main.rs index f9326f76452..0440cce8711 100644 --- a/support/android/build-apk/src/main.rs +++ b/support/android/build-apk/src/main.rs @@ -27,6 +27,11 @@ fn main() { let ndk_path = env::var("NDK_HOME").ok().expect("Please set the NDK_HOME environment variable"); let ndk_path = Path::new(&ndk_path); + // Get the target android platform from ANDROID_PLATFORM env. Expecting "android-{version}" + let android_platform = env::var("ANDROID_PLATFORM") + .ok() + .expect("Please set the ANDROID_PLATFORM environment variable") + // Get the standalone NDK path from NDK_STANDALONE env. // let standalone_path = env::var("NDK_STANDALONE").ok().unwrap_or("/opt/ndk_standalone".to_string()); // let standalone_path = Path::new(&standalone_path); @@ -97,7 +102,7 @@ fn main() { .arg("--name") .arg("Servo") .arg("--target") - .arg("android-18") + .arg(&android_platform) .arg("--path") .arg(".") .stdout(Stdio::inherit()) diff --git a/support/android/openssl.sh b/support/android/openssl.sh index 18dd9b2f325..c03d077b2ba 100755 --- a/support/android/openssl.sh +++ b/support/android/openssl.sh @@ -36,7 +36,7 @@ _ANDROID_ARCH=arch-arm # Android 5.0, there will likely be another platform added (android-22?). # This value is always used. # _ANDROID_API="android-14" -_ANDROID_API="android-18" +_ANDROID_API="$ANDROID_PLATFORM" # _ANDROID_API="android-19" ##################################################################### diff --git a/tests/unit/style/media_queries.rs b/tests/unit/style/media_queries.rs index daa6f1c2569..c806f4ee8ad 100644 --- a/tests/unit/style/media_queries.rs +++ b/tests/unit/style/media_queries.rs @@ -8,6 +8,7 @@ use euclid::size::Size2D; use std::borrow::ToOwned; use style::error_reporting::ParseErrorReporter; use style::media_queries::*; +use style::parser::ParserContextExtraData; use style::servo::Stylesheet; use style::stylesheets::{Origin, CSSRuleIteratorExt}; use style::values::specified; @@ -25,7 +26,8 @@ impl ParseErrorReporter for CSSErrorReporterTest { fn test_media_rule<F>(css: &str, callback: F) where F: Fn(&MediaQueryList, &str) { let url = Url::parse("http://localhost").unwrap(); - let stylesheet = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest)); + let stylesheet = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest), + ParserContextExtraData::default()); let mut rule_count = 0; for rule in stylesheet.rules().media() { rule_count += 1; @@ -36,7 +38,8 @@ fn test_media_rule<F>(css: &str, callback: F) where F: Fn(&MediaQueryList, &str) fn media_query_test(device: &Device, css: &str, expected_rule_count: usize) { let url = Url::parse("http://localhost").unwrap(); - let ss = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest)); + let ss = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest), + ParserContextExtraData::default()); let rule_count = ss.effective_rules(device).style().count(); assert!(rule_count == expected_rule_count, css.to_owned()); } diff --git a/tests/unit/style/stylesheets.rs b/tests/unit/style/stylesheets.rs index 91822093ea2..a771cae0800 100644 --- a/tests/unit/style/stylesheets.rs +++ b/tests/unit/style/stylesheets.rs @@ -9,6 +9,7 @@ use std::borrow::ToOwned; use std::sync::Arc; use std::sync::Mutex; use string_cache::{Atom, Namespace}; +use style::parser::ParserContextExtraData; use style::properties::{PropertyDeclaration, PropertyDeclarationBlock, DeclaredValue, longhands}; use style::stylesheets::{CSSRule, StyleRule, Origin}; use style::error_reporting::ParseErrorReporter; @@ -26,7 +27,8 @@ fn test_parse_stylesheet() { "; let url = Url::parse("about::test").unwrap(); let stylesheet = Stylesheet::from_str(css, url, Origin::UserAgent, - Box::new(CSSErrorReporterTest)); + Box::new(CSSErrorReporterTest), + ParserContextExtraData::default()); assert_eq!(stylesheet, Stylesheet { origin: Origin::UserAgent, media: None, @@ -205,7 +207,8 @@ fn test_report_error_stylesheet() { let errors = error_reporter.errors.clone(); - Stylesheet::from_str(css, url, Origin::UserAgent, error_reporter); + Stylesheet::from_str(css, url, Origin::UserAgent, error_reporter, + ParserContextExtraData::default()); let mut errors = errors.lock().unwrap(); diff --git a/tests/unit/style/viewport.rs b/tests/unit/style/viewport.rs index 316e7c25340..61168d65ad5 100644 --- a/tests/unit/style/viewport.rs +++ b/tests/unit/style/viewport.rs @@ -8,7 +8,7 @@ use euclid::size::Size2D; use media_queries::CSSErrorReporterTest; use style::error_reporting::ParseErrorReporter; use style::media_queries::{Device, MediaType}; -use style::parser::ParserContext; +use style::parser::{ParserContext, ParserContextExtraData}; use style::servo::Stylesheet; use style::stylesheets::{Origin, CSSRuleIteratorExt}; use style::values::specified::Length::{self, ViewportPercentage}; @@ -20,7 +20,8 @@ use url::Url; macro_rules! stylesheet { ($css:expr, $origin:ident, $error_reporter:expr) => { - Stylesheet::from_str($css, Url::parse("http://localhost").unwrap(), Origin::$origin, $error_reporter); + Stylesheet::from_str($css, Url::parse("http://localhost").unwrap(), Origin::$origin, $error_reporter, + ParserContextExtraData::default()); } } diff --git a/tests/wpt/metadata-css/css-color-3_dev/html4/t422-rgba-onscreen-multiple-boxes-c.htm.ini b/tests/wpt/metadata-css/css-color-3_dev/html4/t422-rgba-onscreen-multiple-boxes-c.htm.ini new file mode 100644 index 00000000000..21de3b17e3a --- /dev/null +++ b/tests/wpt/metadata-css/css-color-3_dev/html4/t422-rgba-onscreen-multiple-boxes-c.htm.ini @@ -0,0 +1,3 @@ +[t422-rgba-onscreen-multiple-boxes-c.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-onscreen-multiple-boxes-c.htm.ini b/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-onscreen-multiple-boxes-c.htm.ini new file mode 100644 index 00000000000..4b30c411968 --- /dev/null +++ b/tests/wpt/metadata-css/css-color-3_dev/html4/t425-hsla-onscreen-multiple-boxes-c.htm.ini @@ -0,0 +1,3 @@ +[t425-hsla-onscreen-multiple-boxes-c.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-001.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-001.htm.ini deleted file mode 100644 index cbf93cb59ab..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-001.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-001.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-002.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-002.htm.ini deleted file mode 100644 index ad926db1645..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-002.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-002.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-003.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-003.htm.ini deleted file mode 100644 index 091ff72aad3..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-003.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-003.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-005.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-005.htm.ini deleted file mode 100644 index 172314a5bcd..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-005.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-005.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-006.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-006.htm.ini deleted file mode 100644 index 9acd5a4ab6b..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-006.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-006.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-007.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-007.htm.ini deleted file mode 100644 index 56aa2d27521..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-007.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-007.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-008.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-008.htm.ini deleted file mode 100644 index a1aa955906b..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-008.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-008.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-009.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-009.htm.ini deleted file mode 100644 index c462d2361a0..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-009.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-009.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-010.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-010.htm.ini deleted file mode 100644 index e45fee8f57f..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-010.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-010.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-011.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-011.htm.ini deleted file mode 100644 index a4aa9922219..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-011.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-011.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-012.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-012.htm.ini deleted file mode 100644 index a01fab39000..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-012.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-012.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-013.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-013.htm.ini deleted file mode 100644 index 765ca0713b9..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-013.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-013.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-014.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-014.htm.ini deleted file mode 100644 index 507a247c1bd..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-014.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-014.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-015.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-015.htm.ini deleted file mode 100644 index 595aae4c6b2..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-015.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-015.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-016.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-016.htm.ini deleted file mode 100644 index 14edb01d67a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-016.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-016.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-017.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-017.htm.ini deleted file mode 100644 index b07f84a6235..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-017.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-017.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-018.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-018.htm.ini deleted file mode 100644 index 7ff419fe93d..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-018.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-018.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-019.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-019.htm.ini deleted file mode 100644 index 577860db3ce..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-019.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-019.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-020.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-020.htm.ini deleted file mode 100644 index 8a42ffc428f..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-020.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-020.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-021.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-021.htm.ini deleted file mode 100644 index b7ee06446d0..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-021.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-021.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-022.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-022.htm.ini deleted file mode 100644 index 381608a3b57..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-022.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-022.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-023.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-023.htm.ini deleted file mode 100644 index 83d94f129ac..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-023.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-023.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-024.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-024.htm.ini deleted file mode 100644 index 4e099c0cfed..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-024.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-024.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-025.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-025.htm.ini deleted file mode 100644 index 8778f9335ef..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-025.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-025.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-027.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-027.htm.ini deleted file mode 100644 index 4ea57b47e8e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-027.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-027.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-028.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-028.htm.ini deleted file mode 100644 index f15b6f2a331..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-028.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-028.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-029.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-029.htm.ini deleted file mode 100644 index cf04b84a66a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-029.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-029.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-030.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-030.htm.ini deleted file mode 100644 index 5960d7cac09..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-030.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-030.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-032.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-032.htm.ini deleted file mode 100644 index ddea2accde4..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-032.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-032.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-034.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-034.htm.ini deleted file mode 100644 index d380f07a311..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-034.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-034.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-036.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-036.htm.ini deleted file mode 100644 index 5911a9431d9..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-036.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-036.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-038.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-038.htm.ini deleted file mode 100644 index 377e1aa1980..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-038.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-038.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-039.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-039.htm.ini deleted file mode 100644 index 891a66210e3..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-039.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-039.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-040.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-040.htm.ini deleted file mode 100644 index 3d4e91850b7..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-040.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-040.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-042.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-042.htm.ini deleted file mode 100644 index d78532eda25..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-042.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-042.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-043.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-043.htm.ini deleted file mode 100644 index dbb53336d88..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-043.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-043.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-044.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-044.htm.ini deleted file mode 100644 index c793f711dea..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-044.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-044.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-045.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-045.htm.ini deleted file mode 100644 index dfb53dfef79..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-045.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-045.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-046.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-046.htm.ini deleted file mode 100644 index 6170a47f37d..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-046.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-046.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-047.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-047.htm.ini deleted file mode 100644 index cbf7ffb1014..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-047.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-047.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-048.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-048.htm.ini deleted file mode 100644 index f98ff51d614..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-048.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-048.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-049.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-049.htm.ini deleted file mode 100644 index 8c5c05a5ad5..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-049.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-049.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-051.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-051.htm.ini deleted file mode 100644 index 275032b828c..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-051.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-051.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-052.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-052.htm.ini deleted file mode 100644 index 32a22233148..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-052.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-052.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-054.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-054.htm.ini deleted file mode 100644 index ea8a7c900e7..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-054.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-054.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-056.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-056.htm.ini deleted file mode 100644 index 41d208588be..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-056.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-056.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-057.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-057.htm.ini deleted file mode 100644 index 7a19d563b04..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-057.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-057.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-058.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-058.htm.ini deleted file mode 100644 index b10041b0015..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-058.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-058.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-059.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-059.htm.ini index 986c46bb7a8..0d885a45f68 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-059.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-059.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-jazh-059.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-060.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-060.htm.ini deleted file mode 100644 index 198855baf09..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-060.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-060.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-230.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-230.htm.ini deleted file mode 100644 index b91e7909271..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-230.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-230.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-232.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-232.htm.ini deleted file mode 100644 index 1009a7de1aa..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-232.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-232.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-234.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-234.htm.ini deleted file mode 100644 index ba8b439681c..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-234.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-234.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-236.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-236.htm.ini deleted file mode 100644 index 0a89638ba8e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-236.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-236.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-238.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-238.htm.ini deleted file mode 100644 index 97b3945aed8..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-238.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-238.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-239.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-239.htm.ini deleted file mode 100644 index 5e8d7fe8044..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-239.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-239.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-240.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-240.htm.ini deleted file mode 100644 index 527e8a9070b..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-240.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-240.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-242.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-242.htm.ini deleted file mode 100644 index eafe11854a3..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-242.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-242.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-243.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-243.htm.ini deleted file mode 100644 index 816bea32f19..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-243.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-243.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-244.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-244.htm.ini deleted file mode 100644 index 65a5584a8f5..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-244.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-244.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-245.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-245.htm.ini deleted file mode 100644 index a6300aaf583..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-245.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-245.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-246.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-246.htm.ini deleted file mode 100644 index 9b89b72953f..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-246.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-246.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-247.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-247.htm.ini deleted file mode 100644 index 57c2544a138..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-247.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-247.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-248.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-248.htm.ini deleted file mode 100644 index 69540d4066a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-248.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-248.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-249.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-249.htm.ini deleted file mode 100644 index 8bf534d5a35..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-249.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-249.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-251.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-251.htm.ini deleted file mode 100644 index d66248ea591..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-251.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-251.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-252.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-252.htm.ini deleted file mode 100644 index 3bc5ddf8fab..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-252.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-252.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-254.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-254.htm.ini deleted file mode 100644 index a09a405c7bc..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-254.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-254.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-256.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-256.htm.ini deleted file mode 100644 index 5a0e7199ab0..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-256.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-256.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-257.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-257.htm.ini deleted file mode 100644 index f59f8a5c171..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-257.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-257.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-258.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-258.htm.ini deleted file mode 100644 index 0f56d5b7ac3..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-258.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-258.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-259.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-259.htm.ini index b5e9f0b7b46..b9a1827cd61 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-259.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-259.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-jazh-259.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-302.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-302.htm.ini deleted file mode 100644 index d1f2be99195..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-302.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-302.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-303.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-303.htm.ini deleted file mode 100644 index 3501b3cdc81..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-303.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-303.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-304.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-304.htm.ini deleted file mode 100644 index 388496a2f2a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-304.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-304.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-306.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-306.htm.ini deleted file mode 100644 index 6d26900bcd8..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-306.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-306.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-308.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-308.htm.ini deleted file mode 100644 index 51aec9f3ee8..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-308.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-308.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-309.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-309.htm.ini deleted file mode 100644 index 57f6ed179c5..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-309.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-309.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-310.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-310.htm.ini deleted file mode 100644 index 1eeb8179368..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-310.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-310.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-311.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-311.htm.ini deleted file mode 100644 index a706b767f25..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-311.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-311.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-312.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-312.htm.ini deleted file mode 100644 index e118c303864..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-312.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-312.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-313.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-313.htm.ini deleted file mode 100644 index 6588f18e323..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-313.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-313.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-314.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-314.htm.ini deleted file mode 100644 index e77e906b6a9..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-314.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-314.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-315.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-315.htm.ini deleted file mode 100644 index adb910c5955..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-315.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-315.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-316.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-316.htm.ini deleted file mode 100644 index 2f7cf830456..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-316.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-316.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-317.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-317.htm.ini deleted file mode 100644 index e4f0a9e30e2..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-317.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-317.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-319.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-319.htm.ini deleted file mode 100644 index 10b74f7e2ed..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-319.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-319.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-320.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-320.htm.ini deleted file mode 100644 index 9ce7a4b7371..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-320.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-320.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-322.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-322.htm.ini deleted file mode 100644 index 542a779d637..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-322.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-322.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-324.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-324.htm.ini deleted file mode 100644 index 659362db99a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-324.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-324.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-325.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-325.htm.ini deleted file mode 100644 index 7f2ce789482..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-325.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-325.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-326.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-326.htm.ini deleted file mode 100644 index abf07afd42a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-326.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-326.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-327.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-327.htm.ini index 0bff4607421..995dcebc8ca 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-327.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-327.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-jazh-327.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-404.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-404.htm.ini deleted file mode 100644 index 779e77c4fb7..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-404.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-404.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-406.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-406.htm.ini deleted file mode 100644 index f80c7b37e44..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-406.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-406.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-408.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-408.htm.ini deleted file mode 100644 index 067a75f2887..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-408.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-408.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-409.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-409.htm.ini deleted file mode 100644 index adaeb4d5c1d..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-409.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-409.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-410.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-410.htm.ini deleted file mode 100644 index 185d7296c00..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-410.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-410.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-411.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-411.htm.ini deleted file mode 100644 index 29ed583b9af..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-411.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-411.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-412.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-412.htm.ini deleted file mode 100644 index 00e010a90f3..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-412.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-412.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-413.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-413.htm.ini deleted file mode 100644 index 3f8500da9b6..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-413.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-413.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-414.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-414.htm.ini deleted file mode 100644 index aa2a94df9ee..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-414.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-414.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-415.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-415.htm.ini deleted file mode 100644 index 448d148d79b..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-415.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-415.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-416.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-416.htm.ini deleted file mode 100644 index 5c6b36186f8..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-416.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-416.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-417.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-417.htm.ini deleted file mode 100644 index f0c94c1ea54..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-417.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-417.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-419.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-419.htm.ini deleted file mode 100644 index 17221ae706c..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-419.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-419.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-420.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-420.htm.ini deleted file mode 100644 index d1b7f1868f6..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-420.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-420.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-422.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-422.htm.ini deleted file mode 100644 index 0d32bc28398..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-422.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-422.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-424.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-424.htm.ini deleted file mode 100644 index c1442b1f70d..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-424.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-424.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-425.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-425.htm.ini deleted file mode 100644 index 0c5338e46ab..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-425.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-425.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-426.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-426.htm.ini deleted file mode 100644 index dbed34a042a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-426.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-jazh-426.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-427.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-427.htm.ini index 347f3935f0c..bf179b261f0 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-427.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-427.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-jazh-427.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-001.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-001.htm.ini deleted file mode 100644 index c595d6d017a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-001.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-001.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-002.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-002.htm.ini deleted file mode 100644 index 622bfdc8356..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-002.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-002.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-003.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-003.htm.ini deleted file mode 100644 index 136b3fa6fc5..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-003.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-003.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-007.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-007.htm.ini deleted file mode 100644 index 8817a0779d1..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-007.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-007.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-008.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-008.htm.ini deleted file mode 100644 index f8af945ae68..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-008.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-008.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-010.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-010.htm.ini deleted file mode 100644 index f8404df7c46..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-010.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-010.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-011.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-011.htm.ini deleted file mode 100644 index bd8d16527f6..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-011.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-011.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-012.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-012.htm.ini deleted file mode 100644 index 8e98d3dab63..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-012.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-012.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-014.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-014.htm.ini index 569c513fe40..97fe9ae287e 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-014.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-014.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-014.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-015.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-015.htm.ini index 713c681ec6e..180374f8deb 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-015.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-015.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-015.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-016.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-016.htm.ini index d0f4fcb3c7b..97699ca8918 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-016.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-016.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-016.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-018.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-018.htm.ini index 50252cc4bb4..3c3041ae590 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-018.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-018.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-018.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-019.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-019.htm.ini index 899d81126da..479dba3f3bf 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-019.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-019.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-019.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-020.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-020.htm.ini index 0780047d9a6..11b3608e8d8 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-020.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-020.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-020.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-021.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-021.htm.ini deleted file mode 100644 index f7dffa6e945..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-021.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-021.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-022.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-022.htm.ini deleted file mode 100644 index 9944d865a2c..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-022.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-022.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-023.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-023.htm.ini index 94431eb1093..748e0cbf02e 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-023.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-023.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-023.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-025.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-025.htm.ini deleted file mode 100644 index c7e53248e71..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-025.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-025.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-027.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-027.htm.ini deleted file mode 100644 index 2f3782f0ac0..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-027.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-027.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-028.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-028.htm.ini deleted file mode 100644 index c9f0a8cdf3c..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-028.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-028.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-029.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-029.htm.ini deleted file mode 100644 index b03eaa405a0..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-029.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-029.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-031.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-031.htm.ini deleted file mode 100644 index 1b15bd59a59..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-031.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-031.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-032.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-032.htm.ini deleted file mode 100644 index 27367e06cec..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-032.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-032.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-033.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-033.htm.ini deleted file mode 100644 index 0b66e0bbb55..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-033.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-033.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-034.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-034.htm.ini deleted file mode 100644 index 2d34477bea3..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-034.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-034.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-035.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-035.htm.ini deleted file mode 100644 index c003d06101f..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-035.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-035.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-037.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-037.htm.ini deleted file mode 100644 index 64c8be39955..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-037.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-037.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-038.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-038.htm.ini deleted file mode 100644 index e5c24bd1a76..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-038.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-038.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-040.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-040.htm.ini deleted file mode 100644 index 5e25cdb355f..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-040.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-040.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-043.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-043.htm.ini deleted file mode 100644 index 004f9522c72..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-043.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-043.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-045.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-045.htm.ini deleted file mode 100644 index 7f9c0509459..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-045.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-045.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-047.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-047.htm.ini deleted file mode 100644 index 0409a2f1ca2..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-047.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-047.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-049.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-049.htm.ini index 7a350ca05a6..d0e2eaa09aa 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-049.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-049.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-049.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-051.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-051.htm.ini index b589c252b51..5a06d960a57 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-051.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-051.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-051.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-052.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-052.htm.ini index cfefb8f51d9..4cff63bb5f1 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-052.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-052.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-052.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-053.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-053.htm.ini index c20d027f067..f2b74e7d1b2 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-053.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-053.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-053.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-055.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-055.htm.ini index 52414f508b7..d03dd0452df 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-055.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-055.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-055.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-056.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-056.htm.ini index f06a831ca22..98e01fd0207 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-056.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-056.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-056.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-057.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-057.htm.ini deleted file mode 100644 index 688ef4fbf79..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-057.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-057.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-058.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-058.htm.ini index 1fd34c735f1..08a409e3c14 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-058.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-058.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-058.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-060.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-060.htm.ini index 1bf01b1e948..53dd94d4b76 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-060.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-060.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-060.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-061.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-061.htm.ini deleted file mode 100644 index 635bc02d66e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-061.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-061.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-063.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-063.htm.ini deleted file mode 100644 index 49facb4b077..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-063.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-063.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-064.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-064.htm.ini deleted file mode 100644 index a622f5776b0..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-064.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-064.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-101.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-101.htm.ini deleted file mode 100644 index 99c41cec268..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-101.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-101.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-102.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-102.htm.ini index 0d81a38fd0b..0c696069ef8 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-102.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-102.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-102.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-103.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-103.htm.ini index aed9e7724b9..e9ff6fa6ce6 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-103.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-103.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-103.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-104.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-104.htm.ini deleted file mode 100644 index 5b781194c00..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-104.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-104.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-105.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-105.htm.ini deleted file mode 100644 index 697aebaec2e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-105.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-105.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-106.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-106.htm.ini deleted file mode 100644 index bc58a0e12cd..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-106.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-106.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-107.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-107.htm.ini deleted file mode 100644 index 4ac3ea734a1..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-107.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-107.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-108.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-108.htm.ini deleted file mode 100644 index d8679adac06..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-108.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-108.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-109.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-109.htm.ini deleted file mode 100644 index 5b3b4f6a6ae..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-109.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-109.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-114.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-114.htm.ini deleted file mode 100644 index 1aa02828fa8..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-114.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-114.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-115.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-115.htm.ini deleted file mode 100644 index 067ee1923b6..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-115.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-115.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-116.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-116.htm.ini deleted file mode 100644 index cc8f66b16db..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-116.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-116.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-117.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-117.htm.ini deleted file mode 100644 index 72e6efc345d..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-117.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-117.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-119.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-119.htm.ini index d795f0ace4d..c0b94276631 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-119.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-119.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-119.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-120.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-120.htm.ini index dced23ff1d1..2eb3997ba04 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-120.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-120.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-120.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-122.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-122.htm.ini index 8228546c813..6617b85d834 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-122.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-122.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-122.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-123.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-123.htm.ini index 0736fcece28..8338d2192e6 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-123.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-123.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-123.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-124.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-124.htm.ini index 7256219d9b2..ba15465d228 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-124.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-124.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-124.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-125.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-125.htm.ini index acdbd1584d3..9fcbb8ef1f0 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-125.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-125.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-125.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-126.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-126.htm.ini deleted file mode 100644 index 3479a1bc5d9..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-126.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-126.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-127.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-127.htm.ini deleted file mode 100644 index ebfeaf2200c..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-127.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-127.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-128.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-128.htm.ini index 02effee2fea..edefdab08b5 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-128.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-128.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-128.htm] type: reftest - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-131.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-131.htm.ini deleted file mode 100644 index b9461119b1e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-131.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-131.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-132.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-132.htm.ini deleted file mode 100644 index 2fec37adb48..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-132.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-132.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-133.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-133.htm.ini deleted file mode 100644 index 547b0ce887e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-133.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-133.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-136.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-136.htm.ini deleted file mode 100644 index 9efc0464cf5..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-136.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-136.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-137.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-137.htm.ini deleted file mode 100644 index bc57327df6e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-137.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-137.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-138.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-138.htm.ini deleted file mode 100644 index d3aa4108bc1..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-138.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-138.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-139.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-139.htm.ini deleted file mode 100644 index 00d613d8b74..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-139.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-139.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-142.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-142.htm.ini deleted file mode 100644 index 945dccff7d6..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-142.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-142.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-143.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-143.htm.ini deleted file mode 100644 index 48290e6d4ae..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-143.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-143.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-144.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-144.htm.ini deleted file mode 100644 index 26f08460644..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-144.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-144.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-146.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-146.htm.ini deleted file mode 100644 index 1d59dff46e9..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-146.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-146.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-147.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-147.htm.ini deleted file mode 100644 index d762a8e47e5..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-147.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-147.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-148.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-148.htm.ini deleted file mode 100644 index e62b7d53663..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-148.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-148.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-149.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-149.htm.ini deleted file mode 100644 index b9d6515e228..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-149.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-149.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-150.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-150.htm.ini deleted file mode 100644 index 2e238670132..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-150.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-150.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-151.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-151.htm.ini deleted file mode 100644 index 28f6215e2ca..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-151.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-151.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-152.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-152.htm.ini deleted file mode 100644 index f232c8435e8..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-152.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-152.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-153.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-153.htm.ini deleted file mode 100644 index e98a7bf51d7..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-153.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-153.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-155.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-155.htm.ini index f31cc2baa63..848d3bd0a5c 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-155.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-155.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-155.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-156.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-156.htm.ini index 1ab63b9c76d..faec96566e5 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-156.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-156.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-156.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-157.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-157.htm.ini index 32988029188..4bf5807dfa4 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-157.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-157.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-157.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-158.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-158.htm.ini index 40ba682bf4a..496f4f8ae5a 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-158.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-158.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-158.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-159.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-159.htm.ini index b7211fea534..94ecb323410 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-159.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-159.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-159.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-160.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-160.htm.ini index 04e573f18af..a5c70d92e5d 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-160.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-160.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-160.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-161.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-161.htm.ini index 3c60b1567cc..d8285ab90aa 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-161.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-161.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-161.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-162.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-162.htm.ini index 125d973413b..c710f010ac5 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-162.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-162.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-162.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-163.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-163.htm.ini deleted file mode 100644 index 5367c641405..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-163.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css3-text-line-break-opclns-163.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-166.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-166.htm.ini index 8d78914bb58..cfad6984aae 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-166.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-166.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-166.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-167.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-167.htm.ini deleted file mode 100644 index cd74fa5d399..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-167.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-167.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-168.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-168.htm.ini deleted file mode 100644 index 6d35f977bce..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-168.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-168.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-169.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-169.htm.ini deleted file mode 100644 index a82ea2ca28a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-169.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-169.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-170.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-170.htm.ini deleted file mode 100644 index 5ef7fee9d09..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-170.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-170.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-171.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-171.htm.ini deleted file mode 100644 index 56bcd4c279c..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-171.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-171.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-206.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-206.htm.ini deleted file mode 100644 index 8fdfecd739f..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-206.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-206.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-207.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-207.htm.ini deleted file mode 100644 index 683fdbec80b..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-207.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-207.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-208.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-208.htm.ini deleted file mode 100644 index e537d3a1395..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-208.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-208.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-209.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-209.htm.ini deleted file mode 100644 index 10d1703711e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-209.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-209.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-210.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-210.htm.ini deleted file mode 100644 index 2c749eb4c3a..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-210.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-210.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-211.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-211.htm.ini deleted file mode 100644 index d4e36d3e476..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-211.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-211.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-214.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-214.htm.ini deleted file mode 100644 index 9cf01797c37..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-214.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-214.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-215.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-215.htm.ini deleted file mode 100644 index 9d4bfcecb54..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-215.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-215.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-216.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-216.htm.ini deleted file mode 100644 index d072374fb0c..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-216.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-216.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-219.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-219.htm.ini index 8ff86436be5..d7ef4423a2e 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-219.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-219.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-219.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-220.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-220.htm.ini index 9eb95c36a67..c53a9dfd701 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-220.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-220.htm.ini @@ -1,3 +1,4 @@ [css3-text-line-break-opclns-220.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-221.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-221.htm.ini deleted file mode 100644 index 5f6bff03a2e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-221.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-221.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-222.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-222.htm.ini deleted file mode 100644 index 7e796f159d5..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-222.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-222.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-223.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-223.htm.ini deleted file mode 100644 index f9f8daa91e7..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-223.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-223.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-224.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-224.htm.ini deleted file mode 100644 index 69cbebe3de5..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-224.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-224.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-225.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-225.htm.ini deleted file mode 100644 index c95a253dbcb..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-225.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-225.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-226.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-226.htm.ini deleted file mode 100644 index 72da4e4e181..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-226.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-226.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-250.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-250.htm.ini deleted file mode 100644 index c5a3bdd9f11..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-250.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-250.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-251.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-251.htm.ini deleted file mode 100644 index 5fefd82d6ef..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-251.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-251.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-252.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-252.htm.ini deleted file mode 100644 index 2c09c6e6ef4..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-252.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-252.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-253.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-253.htm.ini deleted file mode 100644 index 5379542e2c6..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-253.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-253.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-254.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-254.htm.ini deleted file mode 100644 index 096e31a3aec..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-254.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-254.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-255.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-255.htm.ini deleted file mode 100644 index a9463e09cec..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-255.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-255.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-256.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-256.htm.ini deleted file mode 100644 index ad13440a534..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-256.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-256.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-257.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-257.htm.ini deleted file mode 100644 index ec3513e3c3e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-257.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-257.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-258.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-258.htm.ini deleted file mode 100644 index 6bc7606427b..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-258.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-258.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-259.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-259.htm.ini deleted file mode 100644 index 6a3ab9383d2..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-259.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-259.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-260.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-260.htm.ini deleted file mode 100644 index 607070b2afa..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-260.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-260.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-261.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-261.htm.ini deleted file mode 100644 index d3326d8c7b2..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-261.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-261.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-262.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-262.htm.ini deleted file mode 100644 index 4641dc473bc..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-262.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-262.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-263.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-263.htm.ini deleted file mode 100644 index 8fe975a5721..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-263.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-263.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-264.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-264.htm.ini deleted file mode 100644 index 1ecdd58dcbb..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-264.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-264.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-265.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-265.htm.ini deleted file mode 100644 index 79ef4a6f624..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-265.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-265.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-266.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-266.htm.ini deleted file mode 100644 index c3cf064ba57..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-266.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-266.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-267.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-267.htm.ini deleted file mode 100644 index 0b4254e0c53..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-267.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-267.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-268.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-268.htm.ini deleted file mode 100644 index 8f2bdda662e..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-268.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-268.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-269.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-269.htm.ini deleted file mode 100644 index 7fa45b7c791..00000000000 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-opclns-269.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[css3-text-line-break-opclns-269.htm] - type: reftest - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/word-break-normal-hi-000.htm.ini b/tests/wpt/metadata-css/css-text-3_dev/html/word-break-normal-hi-000.htm.ini index d7bb9064224..702ff39e1ae 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/word-break-normal-hi-000.htm.ini +++ b/tests/wpt/metadata-css/css-text-3_dev/html/word-break-normal-hi-000.htm.ini @@ -1,5 +1,4 @@ [word-break-normal-hi-000.htm] type: reftest expected: - if os == "linux": FAIL - PASS + FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-family-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-family-013.htm.ini deleted file mode 100644 index bfff1b53eed..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/font-family-013.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[font-family-013.htm] - type: reftest - disabled: https://github.com/servo/servo/issues/7625 diff --git a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/fonts-012.htm.ini index 5c7bcd22e08..3d803d5fca3 100644 --- a/tests/wpt/metadata-css/css-text-3_dev/html/css3-text-line-break-jazh-004.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/fonts-012.htm.ini @@ -1,4 +1,4 @@ -[css3-text-line-break-jazh-004.htm] +[fonts-012.htm] type: reftest expected: if os == "linux": FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/fonts-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/fonts-013.htm.ini deleted file mode 100644 index 73be3a5893a..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/fonts-013.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[fonts-013.htm] - type: reftest - disabled: https://github.com/servo/servo/issues/7625 diff --git a/tests/wpt/metadata/html/dom/reflection-forms.html.ini b/tests/wpt/metadata/html/dom/reflection-forms.html.ini index 84f4224e156..a41391a3f7f 100644 --- a/tests/wpt/metadata/html/dom/reflection-forms.html.ini +++ b/tests/wpt/metadata/html/dom/reflection-forms.html.ini @@ -4341,108 +4341,6 @@ [input.inputMode: IDL set to "URL" followed by IDL get] expected: FAIL - [input.src: setAttribute() to "" followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to " foo " followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to "//site.example/path???@#l" followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to undefined followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to 7 followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to 1.5 followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to true followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to false followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to object "[object Object\]" followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to NaN followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to Infinity followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to -Infinity followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to "\\0" followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to null followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to object "test-toString" followed by IDL get] - expected: FAIL - - [input.src: setAttribute() to object "test-valueOf" followed by IDL get] - expected: FAIL - - [input.src: IDL set to "" followed by IDL get] - expected: FAIL - - [input.src: IDL set to " foo " followed by IDL get] - expected: FAIL - - [input.src: IDL set to "//site.example/path???@#l" followed by IDL get] - expected: FAIL - - [input.src: IDL set to "\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f " followed by IDL get] - expected: FAIL - - [input.src: IDL set to undefined followed by IDL get] - expected: FAIL - - [input.src: IDL set to 7 followed by IDL get] - expected: FAIL - - [input.src: IDL set to 1.5 followed by IDL get] - expected: FAIL - - [input.src: IDL set to true followed by IDL get] - expected: FAIL - - [input.src: IDL set to false followed by IDL get] - expected: FAIL - - [input.src: IDL set to object "[object Object\]" followed by IDL get] - expected: FAIL - - [input.src: IDL set to NaN followed by IDL get] - expected: FAIL - - [input.src: IDL set to Infinity followed by IDL get] - expected: FAIL - - [input.src: IDL set to -Infinity followed by IDL get] - expected: FAIL - - [input.src: IDL set to "\\0" followed by IDL get] - expected: FAIL - - [input.src: IDL set to null followed by IDL get] - expected: FAIL - - [input.src: IDL set to object "test-toString" followed by IDL get] - expected: FAIL - - [input.src: IDL set to object "test-valueOf" followed by IDL get] - expected: FAIL - [input.align: typeof IDL attribute] expected: FAIL diff --git a/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html b/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html index dc0550ea191..a6f76868229 100644 --- a/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html +++ b/tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html @@ -9,12 +9,15 @@ body { font-size: 24px; line-height: 24px; } +span { + font-family: sans-serif; +} </style> </head> <body> -<section>x←</section> -<section>→x</section> -<section>→x←</section> +<section>x←<span> </span></section> +<section>→x<span> </span></section> +<section>→x←<span> </span></section> </body> </html> |