From 68ae97fd0ebb5ff58396ceb9a06ff8437e66c7b6 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Tue, 20 Sep 2016 11:51:51 +0200 Subject: [PATCH] Add support for background-repeat: space and round This adds support for more background-repeat modes using the legacy rendering backend. --- components/gfx/display_list/mod.rs | 5 ++ components/gfx/paint_context.rs | 12 ++-- components/layout/display_list_builder.rs | 69 ++++++++++++++----- components/layout/fragment.rs | 69 +++++++++++++++++-- components/layout/webrender_helpers.rs | 4 +- components/servo/Cargo.lock | 52 +++++++------- components/style/properties/gecko.mako.rs | 10 ++- .../properties/longhand/background.mako.rs | 2 +- .../style/properties/longhand/svg.mako.rs | 2 +- ports/cef/Cargo.lock | 52 +++++++------- ports/geckolib/Cargo.lock | 12 ++-- .../html4/background-repeat-round.htm.ini | 3 - .../html4/background-repeat-space.htm.ini | 3 - .../html4/background-size-025.htm.ini | 3 - 14 files changed, 193 insertions(+), 105 deletions(-) delete mode 100644 tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-round.htm.ini delete mode 100644 tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-space.htm.ini delete mode 100644 tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-025.htm.ini diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 0c2cd16b001..27ed5d6ace5 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -1148,6 +1148,10 @@ pub struct ImageDisplayItem { /// direction to tile the entire bounds. pub stretch_size: Size2D, + /// The amount of space to add to the right and bottom part of each tile, when the image + /// is tiled. + pub tile_spacing: Size2D, + /// The algorithm we should use to stretch the image. See `image_rendering` in CSS-IMAGES-3 ยง /// 5.3. pub image_rendering: image_rendering::T, @@ -1360,6 +1364,7 @@ impl DisplayItem { paint_context.draw_image( &image_item.base.bounds, &image_item.stretch_size, + &image_item.tile_spacing, &image_item.webrender_image, &image_item.image_data .as_ref() diff --git a/components/gfx/paint_context.rs b/components/gfx/paint_context.rs index 54a85c00376..e671a12344e 100644 --- a/components/gfx/paint_context.rs +++ b/components/gfx/paint_context.rs @@ -189,6 +189,7 @@ impl<'a> PaintContext<'a> { pub fn draw_image(&self, bounds: &Rect, stretch_size: &Size2D, + tile_spacing: &Size2D, image_info: &WebRenderImageInfo, image_data: &[u8], image_rendering: image_rendering::T) { @@ -229,7 +230,7 @@ impl<'a> PaintContext<'a> { let draw_options = DrawOptions::new(1.0, CompositionOp::Over, AntialiasMode::None); // Fast path: No need to create a pattern. - if bounds.size == *stretch_size { + if bounds.size == *stretch_size && *tile_spacing == Size2D::zero() { draw_target_ref.draw_surface(azure_surface, dest_rect, source_rect, @@ -243,8 +244,8 @@ impl<'a> PaintContext<'a> { // Annoyingly, surface patterns in Azure/Skia are relative to the top left of the *canvas*, // not the rectangle we're drawing to. So we need to translate it explicitly. let matrix = Matrix2D::identity().pre_translated(dest_rect.origin.x, dest_rect.origin.y); - let stretch_size = stretch_size.to_nearest_azure_size(scale); - if source_rect.size == stretch_size { + let azure_stretch_size = stretch_size.to_nearest_azure_size(scale); + if source_rect.size == azure_stretch_size && *tile_spacing == Size2D::zero() { let pattern = SurfacePattern::new(azure_surface.azure_source_surface, true, true, @@ -258,10 +259,11 @@ impl<'a> PaintContext<'a> { // Slow path: Both stretch and a pattern are needed. let draw_surface_options = DrawSurfaceOptions::new(draw_surface_filter, true); let draw_options = DrawOptions::new(1.0, CompositionOp::Over, AntialiasMode::None); + let temporary_target_size = (*stretch_size + *tile_spacing).to_nearest_azure_size(scale); let temporary_draw_target = - self.draw_target.create_similar_draw_target(&stretch_size.to_azure_int_size(), + self.draw_target.create_similar_draw_target(&temporary_target_size.to_azure_int_size(), self.draw_target.get_format()); - let temporary_dest_rect = Rect::new(Point2D::new(0.0, 0.0), stretch_size); + let temporary_dest_rect = Rect::new(Point2D::new(0.0, 0.0), azure_stretch_size); temporary_draw_target.draw_surface(azure_surface, temporary_dest_rect, source_rect, diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index 5c500b1fd48..97d2c7c4b43 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -547,46 +547,74 @@ impl FragmentDisplayListBuilding for Fragment { let position = *get_cyclic(&background.background_position.0, index); // Use `background-position` to get the offset. let horizontal_position = model::specified(position.horizontal, - bounds.size.width - image_size.width); + bounds.size.width - image_size.width); let vertical_position = model::specified(position.vertical, - bounds.size.height - image_size.height); + bounds.size.height - image_size.height); - let abs_x = border.left + virtual_origin_x + horizontal_position + origin_x; - let abs_y = border.top + virtual_origin_y + vertical_position + origin_y; + // The anchor position for this background, based on both the background-attachment + // and background-position properties. + let anchor_origin_x = border.left + virtual_origin_x + origin_x + horizontal_position; + let anchor_origin_y = border.top + virtual_origin_y + origin_y + vertical_position; + + let mut tile_spacing = Size2D::zero(); + let mut stretch_size = image_size; // Adjust origin and size based on background-repeat match *get_cyclic(&background.background_repeat.0, index) { background_repeat::single_value::T::no_repeat => { - bounds.origin.x = abs_x; - bounds.origin.y = abs_y; + bounds.origin.x = anchor_origin_x; + bounds.origin.y = anchor_origin_y; bounds.size.width = image_size.width; bounds.size.height = image_size.height; } background_repeat::single_value::T::repeat_x => { - bounds.origin.y = abs_y; + bounds.origin.y = anchor_origin_y; bounds.size.height = image_size.height; ImageFragmentInfo::tile_image(&mut bounds.origin.x, &mut bounds.size.width, - abs_x, - image_size.width.to_nearest_px() as u32); + anchor_origin_x, + image_size.width); } background_repeat::single_value::T::repeat_y => { - bounds.origin.x = abs_x; + bounds.origin.x = anchor_origin_x; bounds.size.width = image_size.width; ImageFragmentInfo::tile_image(&mut bounds.origin.y, &mut bounds.size.height, - abs_y, - image_size.height.to_nearest_px() as u32); + anchor_origin_y, + image_size.height); } background_repeat::single_value::T::repeat => { ImageFragmentInfo::tile_image(&mut bounds.origin.x, - &mut bounds.size.width, - abs_x, - image_size.width.to_nearest_px() as u32); + &mut bounds.size.width, + anchor_origin_x, + image_size.width); ImageFragmentInfo::tile_image(&mut bounds.origin.y, - &mut bounds.size.height, - abs_y, - image_size.height.to_nearest_px() as u32); + &mut bounds.size.height, + anchor_origin_y, + image_size.height); + } + background_repeat::single_value::T::space => { + ImageFragmentInfo::tile_image_spaced(&mut bounds.origin.x, + &mut bounds.size.width, + &mut tile_spacing.width, + anchor_origin_x, + image_size.width); + ImageFragmentInfo::tile_image_spaced(&mut bounds.origin.y, + &mut bounds.size.height, + &mut tile_spacing.height, + anchor_origin_y, + image_size.height); + + } + background_repeat::single_value::T::round => { + ImageFragmentInfo::tile_image_round(&mut bounds.origin.x, + &mut bounds.size.width, + anchor_origin_x, + &mut stretch_size.width); + ImageFragmentInfo::tile_image_round(&mut bounds.origin.y, + &mut bounds.size.height, + anchor_origin_y, + &mut stretch_size.height); } }; @@ -600,7 +628,8 @@ impl FragmentDisplayListBuilding for Fragment { base: base, webrender_image: webrender_image, image_data: image_data.map(Arc::new), - stretch_size: Size2D::new(image_size.width, image_size.height), + stretch_size: stretch_size, + tile_spacing: tile_spacing, image_rendering: style.get_inheritedbox().image_rendering.clone(), })); @@ -1257,6 +1286,7 @@ impl FragmentDisplayListBuilding for Fragment { webrender_image: WebRenderImageInfo::from_image(image), image_data: Some(Arc::new(image.bytes.clone())), stretch_size: stacking_relative_content_box.size, + tile_spacing: Size2D::zero(), image_rendering: self.style.get_inheritedbox().image_rendering.clone(), })); } @@ -1300,6 +1330,7 @@ impl FragmentDisplayListBuilding for Fragment { key: canvas_data.image_key, }, stretch_size: stacking_relative_content_box.size, + tile_spacing: Size2D::zero(), image_rendering: image_rendering::T::Auto, }) } diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 0dcdd2930d7..5245e821711 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -425,18 +425,73 @@ impl ImageFragmentInfo { } } + pub fn tile_image_round(position: &mut Au, + size: &mut Au, + absolute_anchor_origin: Au, + image_size: &mut Au) { + if *size == Au(0) || *image_size == Au(0) { + *position = Au(0); + *size =Au(0); + return; + } + + let number_of_tiles = (size.to_f32_px() / image_size.to_f32_px()).round().max(1.0); + *image_size = *size / (number_of_tiles as i32); + ImageFragmentInfo::tile_image(position, size, absolute_anchor_origin, *image_size); + } + + pub fn tile_image_spaced(position: &mut Au, + size: &mut Au, + tile_spacing: &mut Au, + absolute_anchor_origin: Au, + image_size: Au) { + if *size == Au(0) || image_size == Au(0) { + *position = Au(0); + *size = Au(0); + *tile_spacing = Au(0); + return; + } + + // Per the spec, if the space available is not enough for two images, just tile as + // normal but only display a single tile. + if image_size * 2 >= *size { + ImageFragmentInfo::tile_image(position, + size, + absolute_anchor_origin, + image_size); + *tile_spacing = Au(0); + *size = image_size;; + return; + } + + // Take the box size, remove room for two tiles on the edges, and then calculate how many + // other tiles fit in between them. + let size_remaining = *size - (image_size * 2); + let num_middle_tiles = (size_remaining.to_f32_px() / image_size.to_f32_px()).floor() as i32; + + // Allocate the remaining space as padding between tiles. background-position is ignored + // as per the spec, so the position is just the box origin. We are also ignoring + // background-attachment here, which seems unspecced when combined with + // background-repeat: space. + let space_for_middle_tiles = image_size * num_middle_tiles; + *tile_spacing = (size_remaining - space_for_middle_tiles) / (num_middle_tiles + 1); + } + /// Tile an image - pub fn tile_image(position: &mut Au, size: &mut Au, virtual_position: Au, image_size: u32) { + pub fn tile_image(position: &mut Au, + size: &mut Au, + absolute_anchor_origin: Au, + image_size: Au) { // Avoid division by zero below! - let image_size = image_size as i32; - if image_size == 0 { + if image_size == Au(0) { return } - let delta_pixels = (virtual_position - *position).to_px(); - let tile_count = (delta_pixels + image_size - 1) / image_size; - let offset = Au::from_px(image_size * tile_count); - let new_position = virtual_position - offset; + let delta_pixels = absolute_anchor_origin - *position; + let image_size_px = image_size.to_f32_px(); + let tile_count = ((delta_pixels.to_f32_px() + image_size_px - 1.0) / image_size_px).floor(); + let offset = image_size * (tile_count as i32); + let new_position = absolute_anchor_origin - offset; *size = *position - new_position + *size; *position = new_position; } diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs index dacc8278306..e18eeeb5fb9 100644 --- a/components/layout/webrender_helpers.rs +++ b/components/layout/webrender_helpers.rs @@ -427,12 +427,10 @@ impl WebRenderDisplayItemConverter for DisplayItem { if let Some(id) = item.webrender_image.key { if item.stretch_size.width > Au(0) && item.stretch_size.height > Au(0) { - // TODO(gw): Pass through the tile spacing once the other - // changes related to this land (parsing etc). builder.push_image(item.base.bounds.to_rectf(), item.base.clip.to_clip_region(frame_builder), item.stretch_size.to_sizef(), - Size2D::zero(), + item.tile_spacing.to_sizef(), item.image_rendering.to_image_rendering(), id); } diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index e3b03e9f8bb..cf91b80065b 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -14,7 +14,7 @@ dependencies = [ "devtools 0.0.1", "devtools_traits 0.0.1", "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_tests 0.0.1", @@ -121,7 +121,7 @@ dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -229,7 +229,7 @@ version = "0.0.1" dependencies = [ "azure 0.8.0 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -247,7 +247,7 @@ version = "0.0.1" dependencies = [ "azure 0.8.0 (git+https://github.com/servo/rust-azure)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -328,7 +328,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.8.0 (git+https://github.com/servo/rust-azure)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -359,7 +359,7 @@ dependencies = [ "canvas_traits 0.0.1", "compositing 0.0.1", "devtools_traits 0.0.1", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -682,7 +682,7 @@ dependencies = [ [[package]] name = "euclid" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -792,7 +792,7 @@ dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "fontsan 0.3.2 (git+https://github.com/servo/fontsan)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", @@ -844,7 +844,7 @@ name = "gfx_traits" version = "0.0.1" dependencies = [ "azure 0.8.0 (git+https://github.com/servo/rust-azure)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.5.3 (git+https://github.com/servo/rust-layers)", @@ -895,7 +895,7 @@ version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.5.3 (git+https://github.com/servo/rust-layers)", @@ -1149,7 +1149,7 @@ source = "git+https://github.com/servo/rust-layers#b064de859b2cf3f4e07b29ee11a34 dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1171,7 +1171,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -1215,7 +1215,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.8.0 (git+https://github.com/servo/rust-azure)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -1622,7 +1622,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1953,7 +1953,7 @@ dependencies = [ "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2007,7 +2007,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2045,7 +2045,7 @@ dependencies = [ "canvas_traits 0.0.1", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2198,7 +2198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2275,7 +2275,7 @@ dependencies = [ "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2309,7 +2309,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2325,7 +2325,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2509,7 +2509,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2624,7 +2624,7 @@ name = "webdriver_server" version = "0.0.1" dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2651,7 +2651,7 @@ dependencies = [ "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2673,7 +2673,7 @@ dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2828,7 +2828,7 @@ dependencies = [ "checksum energymon-sys 0.2.0 (git+https://github.com/energymon/energymon-sys.git)" = "" "checksum enum_primitive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79eff5be92a4d7d5bddf7daa7d650717ea71628634efe6ca7bcda85b2183c23" "checksum env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "82dcb9ceed3868a03b335657b85a159736c961900f7e7747d3b0b97b9ccb5ccb" -"checksum euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cce91503add3d0a1787b9bc8a9a59ee66ea5de1c3aaa6faf67b62997843160d3" +"checksum euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "44ef2a3e4a621518e488db36820a12b49a9d5004764b8daf1458bbe5d7c9b626" "checksum expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cef36cd1a8a02d28b91d97347c63247b9e4cb8a8e36df36f8201dc87a1c0859c" "checksum flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "3eeb481e957304178d2e782f2da1257f1434dfecbae883bafb61ada2a9fea3bb" "checksum fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8e8af7b5408ab0c4910cad114c8f9eb454bf75df7afe8964307eeafb68a13a5e" diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index 1f75fdb5737..5b5c59fbe16 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -1011,14 +1011,20 @@ fn static_assert() { use gecko_bindings::structs::nsStyleImageLayers_Repeat; use gecko_bindings::structs::NS_STYLE_IMAGELAYER_REPEAT_REPEAT; use gecko_bindings::structs::NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT; + use gecko_bindings::structs::NS_STYLE_IMAGELAYER_REPEAT_SPACE; + use gecko_bindings::structs::NS_STYLE_IMAGELAYER_REPEAT_ROUND; let (repeat_x, repeat_y) = match servo { T::repeat_x => (NS_STYLE_IMAGELAYER_REPEAT_REPEAT, NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT), T::repeat_y => (NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT, NS_STYLE_IMAGELAYER_REPEAT_REPEAT), - T::repeat => (NS_STYLE_IMAGELAYER_REPEAT_REPEAT, - NS_STYLE_IMAGELAYER_REPEAT_REPEAT), + T::repeat => (NS_STYLE_IMAGELAYER_REPEAT_REPEAT, + NS_STYLE_IMAGELAYER_REPEAT_REPEAT), + T::space => (NS_STYLE_IMAGELAYER_REPEAT_SPACE, + NS_STYLE_IMAGELAYER_REPEAT_SPACE), + T::round => (NS_STYLE_IMAGELAYER_REPEAT_ROUND, + NS_STYLE_IMAGELAYER_REPEAT_ROUND), T::no_repeat => (NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT, NS_STYLE_IMAGELAYER_REPEAT_NO_REPEAT), }; diff --git a/components/style/properties/longhand/background.mako.rs b/components/style/properties/longhand/background.mako.rs index c2c6212a60f..cc01ef1d3dc 100644 --- a/components/style/properties/longhand/background.mako.rs +++ b/components/style/properties/longhand/background.mako.rs @@ -119,7 +119,7 @@ ${helpers.predefined_type("background-color", "CSSColor", ${helpers.single_keyword("background-repeat", - "repeat repeat-x repeat-y no-repeat", + "repeat repeat-x repeat-y space round no-repeat", vector=True, animatable=False)} diff --git a/components/style/properties/longhand/svg.mako.rs b/components/style/properties/longhand/svg.mako.rs index b7f78cd0ebd..d3477658d61 100644 --- a/components/style/properties/longhand/svg.mako.rs +++ b/components/style/properties/longhand/svg.mako.rs @@ -87,7 +87,7 @@ ${helpers.single_keyword("mask-mode", // TODO implement all of repeat-style for background and mask // https://drafts.csswg.org/css-backgrounds-3/#repeat-style ${helpers.single_keyword("mask-repeat", - "repeat repeat-x repeat-y no-repeat", + "repeat repeat-x repeat-y space round no-repeat", vector=True, products="gecko", animatable=False)} diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 6c5f8cd1394..ba40614c76d 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -5,7 +5,7 @@ dependencies = [ "cocoa 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", "devtools 0.0.1", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", "layers 0.5.3 (git+https://github.com/servo/rust-layers)", @@ -94,7 +94,7 @@ dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -202,7 +202,7 @@ version = "0.0.1" dependencies = [ "azure 0.8.0 (git+https://github.com/servo/rust-azure)", "canvas_traits 0.0.1", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -220,7 +220,7 @@ version = "0.0.1" dependencies = [ "azure 0.8.0 (git+https://github.com/servo/rust-azure)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -285,7 +285,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.8.0 (git+https://github.com/servo/rust-azure)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -316,7 +316,7 @@ dependencies = [ "canvas_traits 0.0.1", "compositing 0.0.1", "devtools_traits 0.0.1", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -598,7 +598,7 @@ dependencies = [ [[package]] name = "euclid" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -708,7 +708,7 @@ dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "fontsan 0.3.2 (git+https://github.com/servo/fontsan)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", @@ -751,7 +751,7 @@ name = "gfx_traits" version = "0.0.1" dependencies = [ "azure 0.8.0 (git+https://github.com/servo/rust-azure)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.5.3 (git+https://github.com/servo/rust-layers)", @@ -802,7 +802,7 @@ version = "0.0.1" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "compositing 0.0.1", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.5.3 (git+https://github.com/servo/rust-layers)", @@ -1056,7 +1056,7 @@ source = "git+https://github.com/servo/rust-layers#b064de859b2cf3f4e07b29ee11a34 dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1078,7 +1078,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -1115,7 +1115,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "azure 0.8.0 (git+https://github.com/servo/rust-azure)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", @@ -1493,7 +1493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1804,7 +1804,7 @@ dependencies = [ "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1858,7 +1858,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1886,7 +1886,7 @@ dependencies = [ "canvas_traits 0.0.1", "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1982,7 +1982,7 @@ dependencies = [ "devtools 0.0.1", "devtools_traits 0.0.1", "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2081,7 +2081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "glx 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2158,7 +2158,7 @@ dependencies = [ "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2192,7 +2192,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2376,7 +2376,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2484,7 +2484,7 @@ name = "webdriver_server" version = "0.0.1" dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2511,7 +2511,7 @@ dependencies = [ "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2533,7 +2533,7 @@ dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2682,7 +2682,7 @@ dependencies = [ "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" "checksum enum_primitive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79eff5be92a4d7d5bddf7daa7d650717ea71628634efe6ca7bcda85b2183c23" "checksum env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "82dcb9ceed3868a03b335657b85a159736c961900f7e7747d3b0b97b9ccb5ccb" -"checksum euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cce91503add3d0a1787b9bc8a9a59ee66ea5de1c3aaa6faf67b62997843160d3" +"checksum euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "44ef2a3e4a621518e488db36820a12b49a9d5004764b8daf1458bbe5d7c9b626" "checksum expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cef36cd1a8a02d28b91d97347c63247b9e4cb8a8e36df36f8201dc87a1c0859c" "checksum flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "3eeb481e957304178d2e782f2da1257f1434dfecbae883bafb61ada2a9fea3bb" "checksum fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8e8af7b5408ab0c4910cad114c8f9eb454bf75df7afe8964307eeafb68a13a5e" diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index 8581961e329..985ffe2b4fa 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -4,7 +4,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "gecko_bindings 0.0.1", "gecko_string_cache 0.2.20", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -141,7 +141,7 @@ dependencies = [ [[package]] name = "euclid" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -361,7 +361,7 @@ dependencies = [ "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gecko_bindings 0.0.1", "gecko_string_cache 0.2.20", @@ -391,7 +391,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -474,7 +474,7 @@ version = "0.0.1" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -530,7 +530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" "checksum env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "82dcb9ceed3868a03b335657b85a159736c961900f7e7747d3b0b97b9ccb5ccb" -"checksum euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cce91503add3d0a1787b9bc8a9a59ee66ea5de1c3aaa6faf67b62997843160d3" +"checksum euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "44ef2a3e4a621518e488db36820a12b49a9d5004764b8daf1458bbe5d7c9b626" "checksum fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8e8af7b5408ab0c4910cad114c8f9eb454bf75df7afe8964307eeafb68a13a5e" "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685" "checksum heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "abb306abb8d398e053cfb1b3e7b72c2f580be048b85745c52652954f8ad1439c" diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-round.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-round.htm.ini deleted file mode 100644 index 21ec9e6a448..00000000000 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-round.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[background-repeat-round.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-space.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-space.htm.ini deleted file mode 100644 index e861ddaea9d..00000000000 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-repeat-space.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[background-repeat-space.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-025.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-025.htm.ini deleted file mode 100644 index 6fec403d3b0..00000000000 --- a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/background-size-025.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[background-size-025.htm] - type: reftest - expected: FAIL