mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 07:15:46 +00:00
servo: Merge #16133 - Add support for -moz-image-rect (from canaltinova:image-rect); r=Manishearth
Add support for -moz-image-rect r=Manishearth --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #15948 and [Bug 1341763](https://bugzilla.mozilla.org/show_bug.cgi?id=1341763) <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: c2d9f663afd6c804c30a7a077392b836e1fa29b5 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 89cf026c56b5e318143703cd3c857732e8e81991
This commit is contained in:
parent
c318cb8f31
commit
805b91c142
@ -46,7 +46,7 @@ use std::mem;
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use style::computed_values::{background_attachment, background_clip, background_origin};
|
use style::computed_values::{background_attachment, background_clip, background_origin};
|
||||||
use style::computed_values::{background_repeat, background_size, border_style};
|
use style::computed_values::{background_repeat, background_size, border_style};
|
||||||
use style::computed_values::{cursor, image_rendering, overflow_x, border_image_slice};
|
use style::computed_values::{cursor, image_rendering, overflow_x};
|
||||||
use style::computed_values::{pointer_events, position, transform_style, visibility};
|
use style::computed_values::{pointer_events, position, transform_style, visibility};
|
||||||
use style::computed_values::_servo_overflow_clip_box as overflow_clip_box;
|
use style::computed_values::_servo_overflow_clip_box as overflow_clip_box;
|
||||||
use style::computed_values::filter::Filter;
|
use style::computed_values::filter::Filter;
|
||||||
@ -58,6 +58,7 @@ use style::properties::style_structs;
|
|||||||
use style::servo::restyle_damage::REPAINT;
|
use style::servo::restyle_damage::REPAINT;
|
||||||
use style::values::{RGBA, computed};
|
use style::values::{RGBA, computed};
|
||||||
use style::values::computed::{AngleOrCorner, Gradient, GradientKind, LengthOrPercentage, LengthOrPercentageOrAuto};
|
use style::values::computed::{AngleOrCorner, Gradient, GradientKind, LengthOrPercentage, LengthOrPercentageOrAuto};
|
||||||
|
use style::values::computed::NumberOrPercentage;
|
||||||
use style::values::specified::{HorizontalDirection, VerticalDirection};
|
use style::values::specified::{HorizontalDirection, VerticalDirection};
|
||||||
use style_traits::CSSPixel;
|
use style_traits::CSSPixel;
|
||||||
use style_traits::cursor::Cursor;
|
use style_traits::cursor::Cursor;
|
||||||
@ -68,13 +69,13 @@ trait ResolvePercentage {
|
|||||||
fn resolve(&self, length: u32) -> u32;
|
fn resolve(&self, length: u32) -> u32;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ResolvePercentage for border_image_slice::PercentageOrNumber {
|
impl ResolvePercentage for NumberOrPercentage {
|
||||||
fn resolve(&self, length: u32) -> u32 {
|
fn resolve(&self, length: u32) -> u32 {
|
||||||
match *self {
|
match *self {
|
||||||
border_image_slice::PercentageOrNumber::Percentage(p) => {
|
NumberOrPercentage::Percentage(p) => {
|
||||||
(p.0 * length as f32).round() as u32
|
(p.0 * length as f32).round() as u32
|
||||||
}
|
}
|
||||||
border_image_slice::PercentageOrNumber::Number(n) => {
|
NumberOrPercentage::Number(n) => {
|
||||||
n.round() as u32
|
n.round() as u32
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -610,6 +611,9 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||||||
i);
|
i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Some(computed::Image::ImageRect(_)) => {
|
||||||
|
// TODO: Implement `-moz-image-rect`
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1075,6 +1079,9 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||||||
Some(computed::Image::Gradient(..)) => {
|
Some(computed::Image::Gradient(..)) => {
|
||||||
// TODO(gw): Handle border-image with gradient.
|
// TODO(gw): Handle border-image with gradient.
|
||||||
}
|
}
|
||||||
|
Some(computed::Image::ImageRect(..)) => {
|
||||||
|
// TODO: Handle border-image with `-moz-image-rect`.
|
||||||
|
}
|
||||||
Some(computed::Image::Url(ref image_url)) => {
|
Some(computed::Image::Url(ref image_url)) => {
|
||||||
if let Some(url) = image_url.url() {
|
if let Some(url) = image_url.url() {
|
||||||
let webrender_image = state.layout_context
|
let webrender_image = state.layout_context
|
||||||
|
@ -9,8 +9,9 @@
|
|||||||
#![allow(unsafe_code)]
|
#![allow(unsafe_code)]
|
||||||
|
|
||||||
use app_units::Au;
|
use app_units::Au;
|
||||||
use gecko::values::convert_rgba_to_nscolor;
|
use gecko::values::{convert_rgba_to_nscolor, GeckoStyleCoordConvertible};
|
||||||
use gecko_bindings::bindings::{Gecko_CreateGradient, Gecko_SetGradientImageValue, Gecko_SetUrlImageValue};
|
use gecko_bindings::bindings::{Gecko_CreateGradient, Gecko_SetGradientImageValue, Gecko_SetUrlImageValue};
|
||||||
|
use gecko_bindings::bindings::Gecko_InitializeImageCropRect;
|
||||||
use gecko_bindings::structs::{nsStyleCoord_CalcValue, nsStyleImage};
|
use gecko_bindings::structs::{nsStyleCoord_CalcValue, nsStyleImage};
|
||||||
use gecko_bindings::structs::nsresult;
|
use gecko_bindings::structs::nsresult;
|
||||||
use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordDataMut};
|
use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordDataMut};
|
||||||
@ -118,6 +119,28 @@ impl nsStyleImage {
|
|||||||
*cacheable = false;
|
*cacheable = false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
Image::ImageRect(ref image_rect) if with_url => {
|
||||||
|
unsafe {
|
||||||
|
Gecko_SetUrlImageValue(self, image_rect.url.for_ffi());
|
||||||
|
Gecko_InitializeImageCropRect(self);
|
||||||
|
|
||||||
|
// We unfortunately must make any url() value uncacheable, since
|
||||||
|
// the applicable declarations cache is not per document, but
|
||||||
|
// global, and the imgRequestProxy objects we store in the style
|
||||||
|
// structs don't like to be tracked by more than one document.
|
||||||
|
//
|
||||||
|
// FIXME(emilio): With the scoped TLS thing this is no longer
|
||||||
|
// true, remove this line in a follow-up!
|
||||||
|
*cacheable = false;
|
||||||
|
|
||||||
|
// Set CropRect
|
||||||
|
let ref mut rect = *self.mCropRect.mPtr;
|
||||||
|
image_rect.top.to_gecko_style_coord(&mut rect.data_at_mut(0));
|
||||||
|
image_rect.right.to_gecko_style_coord(&mut rect.data_at_mut(1));
|
||||||
|
image_rect.bottom.to_gecko_style_coord(&mut rect.data_at_mut(2));
|
||||||
|
image_rect.left.to_gecko_style_coord(&mut rect.data_at_mut(3));
|
||||||
|
}
|
||||||
|
}
|
||||||
_ => (),
|
_ => (),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,10 +12,11 @@ use gecko_bindings::structs::{nsStyleCoord, StyleGridTrackBreadth, StyleShapeRad
|
|||||||
use gecko_bindings::sugar::ns_style_coord::{CoordData, CoordDataMut, CoordDataValue};
|
use gecko_bindings::sugar::ns_style_coord::{CoordData, CoordDataMut, CoordDataValue};
|
||||||
use std::cmp::max;
|
use std::cmp::max;
|
||||||
use values::{Auto, Either, ExtremumLength, None_, Normal};
|
use values::{Auto, Either, ExtremumLength, None_, Normal};
|
||||||
use values::computed::{Angle, LengthOrPercentageOrNone, Number};
|
use values::computed::{Angle, LengthOrPercentage, LengthOrPercentageOrAuto};
|
||||||
use values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto};
|
use values::computed::{LengthOrPercentageOrNone, Number, NumberOrPercentage};
|
||||||
use values::computed::{MaxLength, MinLength};
|
use values::computed::{MaxLength, MinLength};
|
||||||
use values::computed::basic_shape::ShapeRadius;
|
use values::computed::basic_shape::ShapeRadius;
|
||||||
|
use values::specified::Percentage;
|
||||||
use values::specified::grid::{TrackBreadth, TrackKeyword};
|
use values::specified::grid::{TrackBreadth, TrackKeyword};
|
||||||
|
|
||||||
/// A trait that defines an interface to convert from and to `nsStyleCoord`s.
|
/// A trait that defines an interface to convert from and to `nsStyleCoord`s.
|
||||||
@ -62,6 +63,38 @@ impl GeckoStyleCoordConvertible for Number {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl GeckoStyleCoordConvertible for Percentage {
|
||||||
|
fn to_gecko_style_coord<T: CoordDataMut>(&self, coord: &mut T) {
|
||||||
|
coord.set_value(CoordDataValue::Percent(self.0));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn from_gecko_style_coord<T: CoordData>(coord: &T) -> Option<Self> {
|
||||||
|
match coord.as_value() {
|
||||||
|
CoordDataValue::Percent(p) => Some(Percentage(p)),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl GeckoStyleCoordConvertible for NumberOrPercentage {
|
||||||
|
fn to_gecko_style_coord<T: CoordDataMut>(&self, coord: &mut T) {
|
||||||
|
match *self {
|
||||||
|
NumberOrPercentage::Number(ref n) => n.to_gecko_style_coord(coord),
|
||||||
|
NumberOrPercentage::Percentage(ref p) => p.to_gecko_style_coord(coord),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn from_gecko_style_coord<T: CoordData>(coord: &T) -> Option<Self> {
|
||||||
|
match coord.as_value() {
|
||||||
|
CoordDataValue::Factor(f) => Some(NumberOrPercentage::Number(f)),
|
||||||
|
CoordDataValue::Percent(p) => {
|
||||||
|
Some(NumberOrPercentage::Percentage(Percentage(p)))
|
||||||
|
},
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl GeckoStyleCoordConvertible for LengthOrPercentage {
|
impl GeckoStyleCoordConvertible for LengthOrPercentage {
|
||||||
fn to_gecko_style_coord<T: CoordDataMut>(&self, coord: &mut T) {
|
fn to_gecko_style_coord<T: CoordDataMut>(&self, coord: &mut T) {
|
||||||
let value = match *self {
|
let value = match *self {
|
||||||
|
@ -678,6 +678,9 @@ extern "C" {
|
|||||||
pub fn Gecko_CopyImageValueFrom(image: *mut nsStyleImage,
|
pub fn Gecko_CopyImageValueFrom(image: *mut nsStyleImage,
|
||||||
other: *const nsStyleImage);
|
other: *const nsStyleImage);
|
||||||
}
|
}
|
||||||
|
extern "C" {
|
||||||
|
pub fn Gecko_InitializeImageCropRect(image: *mut nsStyleImage);
|
||||||
|
}
|
||||||
extern "C" {
|
extern "C" {
|
||||||
pub fn Gecko_CreateGradient(shape: u8, size: u8, repeating: bool,
|
pub fn Gecko_CreateGradient(shape: u8, size: u8, repeating: bool,
|
||||||
legacy_syntax: bool, stops: u32)
|
legacy_syntax: bool, stops: u32)
|
||||||
|
@ -898,17 +898,9 @@ fn static_assert() {
|
|||||||
|
|
||||||
pub fn set_border_image_slice(&mut self, v: longhands::border_image_slice::computed_value::T) {
|
pub fn set_border_image_slice(&mut self, v: longhands::border_image_slice::computed_value::T) {
|
||||||
use gecko_bindings::structs::{NS_STYLE_BORDER_IMAGE_SLICE_NOFILL, NS_STYLE_BORDER_IMAGE_SLICE_FILL};
|
use gecko_bindings::structs::{NS_STYLE_BORDER_IMAGE_SLICE_NOFILL, NS_STYLE_BORDER_IMAGE_SLICE_FILL};
|
||||||
use properties::longhands::border_image_slice::computed_value::PercentageOrNumber;
|
|
||||||
|
|
||||||
for (i, corner) in v.corners.iter().enumerate() {
|
for (i, corner) in v.corners.iter().enumerate() {
|
||||||
match *corner {
|
corner.to_gecko_style_coord(&mut self.gecko.mBorderImageSlice.data_at_mut(i));
|
||||||
PercentageOrNumber::Percentage(p) => {
|
|
||||||
self.gecko.mBorderImageSlice.data_at_mut(i).set_value(CoordDataValue::Percent(p.0))
|
|
||||||
},
|
|
||||||
PercentageOrNumber::Number(n) => {
|
|
||||||
self.gecko.mBorderImageSlice.data_at_mut(i).set_value(CoordDataValue::Factor(n))
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let fill = if v.fill {
|
let fill = if v.fill {
|
||||||
|
@ -562,32 +562,25 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
|
|||||||
use std::fmt;
|
use std::fmt;
|
||||||
use style_traits::ToCss;
|
use style_traits::ToCss;
|
||||||
use values::HasViewportPercentage;
|
use values::HasViewportPercentage;
|
||||||
use values::specified::{Number, Percentage};
|
use values::computed::NumberOrPercentage as ComputedNumberOrPercentage;
|
||||||
|
use values::specified::{NumberOrPercentage, Percentage};
|
||||||
|
|
||||||
no_viewport_percentage!(SpecifiedValue);
|
no_viewport_percentage!(SpecifiedValue);
|
||||||
|
|
||||||
pub mod computed_value {
|
pub mod computed_value {
|
||||||
use values::computed::Number;
|
use values::computed::NumberOrPercentage;
|
||||||
use values::specified::Percentage;
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||||
pub struct T {
|
pub struct T {
|
||||||
pub corners: Vec<PercentageOrNumber>,
|
pub corners: Vec<NumberOrPercentage>,
|
||||||
pub fill: bool,
|
pub fill: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
|
||||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
|
||||||
pub enum PercentageOrNumber {
|
|
||||||
Percentage(Percentage),
|
|
||||||
Number(Number),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||||
pub struct SpecifiedValue {
|
pub struct SpecifiedValue {
|
||||||
pub corners: Vec<PercentageOrNumber>,
|
pub corners: Vec<NumberOrPercentage>,
|
||||||
pub fill: bool,
|
pub fill: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -622,60 +615,13 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
|
||||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
|
||||||
pub enum PercentageOrNumber {
|
|
||||||
Percentage(Percentage),
|
|
||||||
Number(Number),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ToCss for computed_value::PercentageOrNumber {
|
|
||||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
|
||||||
match *self {
|
|
||||||
computed_value::PercentageOrNumber::Percentage(percentage) => percentage.to_css(dest),
|
|
||||||
computed_value::PercentageOrNumber::Number(number) => number.to_css(dest),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl ToCss for PercentageOrNumber {
|
|
||||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
|
||||||
match *self {
|
|
||||||
PercentageOrNumber::Percentage(percentage) => percentage.to_css(dest),
|
|
||||||
PercentageOrNumber::Number(number) => number.to_css(dest),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ToComputedValue for PercentageOrNumber {
|
|
||||||
type ComputedValue = computed_value::PercentageOrNumber;
|
|
||||||
|
|
||||||
#[inline]
|
|
||||||
fn to_computed_value(&self, context: &Context) -> computed_value::PercentageOrNumber {
|
|
||||||
match *self {
|
|
||||||
PercentageOrNumber::Percentage(percentage) =>
|
|
||||||
computed_value::PercentageOrNumber::Percentage(percentage),
|
|
||||||
PercentageOrNumber::Number(number) =>
|
|
||||||
computed_value::PercentageOrNumber::Number(number.to_computed_value(context)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[inline]
|
|
||||||
fn from_computed_value(computed: &computed_value::PercentageOrNumber) -> Self {
|
|
||||||
match *computed {
|
|
||||||
computed_value::PercentageOrNumber::Percentage(percentage) =>
|
|
||||||
PercentageOrNumber::Percentage(percentage),
|
|
||||||
computed_value::PercentageOrNumber::Number(number) =>
|
|
||||||
PercentageOrNumber::Number(ToComputedValue::from_computed_value(&number)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn get_initial_value() -> computed_value::T {
|
pub fn get_initial_value() -> computed_value::T {
|
||||||
computed_value::T {
|
computed_value::T {
|
||||||
corners: vec![computed_value::PercentageOrNumber::Percentage(Percentage(1.0)),
|
corners: vec![ComputedNumberOrPercentage::Percentage(Percentage(1.0)),
|
||||||
computed_value::PercentageOrNumber::Percentage(Percentage(1.0)),
|
ComputedNumberOrPercentage::Percentage(Percentage(1.0)),
|
||||||
computed_value::PercentageOrNumber::Percentage(Percentage(1.0)),
|
ComputedNumberOrPercentage::Percentage(Percentage(1.0)),
|
||||||
computed_value::PercentageOrNumber::Percentage(Percentage(1.0))],
|
ComputedNumberOrPercentage::Percentage(Percentage(1.0))],
|
||||||
fill: false,
|
fill: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -683,7 +629,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
|
|||||||
#[inline]
|
#[inline]
|
||||||
pub fn get_initial_specified_value() -> SpecifiedValue {
|
pub fn get_initial_specified_value() -> SpecifiedValue {
|
||||||
SpecifiedValue {
|
SpecifiedValue {
|
||||||
corners: vec![PercentageOrNumber::Percentage(Percentage(1.0))],
|
corners: vec![NumberOrPercentage::Percentage(Percentage(1.0))],
|
||||||
fill: false,
|
fill: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -730,23 +676,12 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Parse for PercentageOrNumber {
|
|
||||||
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
|
|
||||||
if let Ok(per) = input.try(|input| Percentage::parse(context, input)) {
|
|
||||||
return Ok(PercentageOrNumber::Percentage(per));
|
|
||||||
}
|
|
||||||
|
|
||||||
let num = try!(Number::parse_non_negative(input));
|
|
||||||
Ok(PercentageOrNumber::Number(num))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
|
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
|
||||||
let mut fill = input.try(|input| input.expect_ident_matching("fill")).is_ok();
|
let mut fill = input.try(|input| input.expect_ident_matching("fill")).is_ok();
|
||||||
|
|
||||||
let mut values = vec![];
|
let mut values = vec![];
|
||||||
for _ in 0..4 {
|
for _ in 0..4 {
|
||||||
let value = input.try(|input| PercentageOrNumber::parse(context, input));
|
let value = input.try(|input| NumberOrPercentage::parse(context, input));
|
||||||
match value {
|
match value {
|
||||||
Ok(val) => values.push(val),
|
Ok(val) => values.push(val),
|
||||||
Err(_) => break,
|
Err(_) => break,
|
||||||
|
@ -11,7 +11,7 @@ use cssparser::Color as CSSColor;
|
|||||||
use std::f32::consts::PI;
|
use std::f32::consts::PI;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use style_traits::ToCss;
|
use style_traits::ToCss;
|
||||||
use values::computed::{Angle, Context, Length, LengthOrPercentage, ToComputedValue};
|
use values::computed::{Angle, Context, Length, LengthOrPercentage, NumberOrPercentage, ToComputedValue};
|
||||||
use values::computed::position::Position;
|
use values::computed::position::Position;
|
||||||
use values::specified::{self, HorizontalDirection, SizeKeyword, VerticalDirection};
|
use values::specified::{self, HorizontalDirection, SizeKeyword, VerticalDirection};
|
||||||
use values::specified::url::SpecifiedUrl;
|
use values::specified::url::SpecifiedUrl;
|
||||||
@ -28,6 +28,9 @@ impl ToComputedValue for specified::Image {
|
|||||||
},
|
},
|
||||||
specified::Image::Gradient(ref gradient) => {
|
specified::Image::Gradient(ref gradient) => {
|
||||||
Image::Gradient(gradient.to_computed_value(context))
|
Image::Gradient(gradient.to_computed_value(context))
|
||||||
|
},
|
||||||
|
specified::Image::ImageRect(ref image_rect) => {
|
||||||
|
Image::ImageRect(image_rect.to_computed_value(context))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -42,7 +45,12 @@ impl ToComputedValue for specified::Image {
|
|||||||
specified::Image::Gradient(
|
specified::Image::Gradient(
|
||||||
ToComputedValue::from_computed_value(linear_gradient)
|
ToComputedValue::from_computed_value(linear_gradient)
|
||||||
)
|
)
|
||||||
}
|
},
|
||||||
|
Image::ImageRect(ref image_rect) => {
|
||||||
|
specified::Image::ImageRect(
|
||||||
|
ToComputedValue::from_computed_value(image_rect)
|
||||||
|
)
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -55,6 +63,7 @@ impl ToComputedValue for specified::Image {
|
|||||||
pub enum Image {
|
pub enum Image {
|
||||||
Url(SpecifiedUrl),
|
Url(SpecifiedUrl),
|
||||||
Gradient(Gradient),
|
Gradient(Gradient),
|
||||||
|
ImageRect(ImageRect),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl fmt::Debug for Image {
|
impl fmt::Debug for Image {
|
||||||
@ -70,6 +79,7 @@ impl fmt::Debug for Image {
|
|||||||
GradientKind::Radial(_, _) => write!(f, "radial-gradient({:?})", grad),
|
GradientKind::Radial(_, _) => write!(f, "radial-gradient({:?})", grad),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
Image::ImageRect(ref image_rect) => write!(f, "{:?}", image_rect),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -78,7 +88,8 @@ impl ToCss for Image {
|
|||||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||||
match *self {
|
match *self {
|
||||||
Image::Url(ref url) => url.to_css(dest),
|
Image::Url(ref url) => url.to_css(dest),
|
||||||
Image::Gradient(ref gradient) => gradient.to_css(dest)
|
Image::Gradient(ref gradient) => gradient.to_css(dest),
|
||||||
|
Image::ImageRect(ref image_rect) => image_rect.to_css(dest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -336,6 +347,59 @@ impl ToComputedValue for specified::GradientEndingShape {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Computed values for ImageRect
|
||||||
|
#[derive(Clone, PartialEq, Debug)]
|
||||||
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||||
|
#[allow(missing_docs)]
|
||||||
|
pub struct ImageRect {
|
||||||
|
pub url: SpecifiedUrl,
|
||||||
|
pub top: NumberOrPercentage,
|
||||||
|
pub bottom: NumberOrPercentage,
|
||||||
|
pub right: NumberOrPercentage,
|
||||||
|
pub left: NumberOrPercentage,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToCss for ImageRect {
|
||||||
|
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||||
|
dest.write_str("-moz-image-rect(")?;
|
||||||
|
self.url.to_css(dest)?;
|
||||||
|
dest.write_str(", ")?;
|
||||||
|
self.top.to_css(dest)?;
|
||||||
|
dest.write_str(", ")?;
|
||||||
|
self.right.to_css(dest)?;
|
||||||
|
dest.write_str(", ")?;
|
||||||
|
self.bottom.to_css(dest)?;
|
||||||
|
dest.write_str(", ")?;
|
||||||
|
self.left.to_css(dest)?;
|
||||||
|
dest.write_str(")")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToComputedValue for specified::ImageRect {
|
||||||
|
type ComputedValue = ImageRect;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
fn to_computed_value(&self, context: &Context) -> ImageRect {
|
||||||
|
ImageRect {
|
||||||
|
url: self.url.to_computed_value(context),
|
||||||
|
top: self.top.to_computed_value(context),
|
||||||
|
right: self.right.to_computed_value(context),
|
||||||
|
bottom: self.bottom.to_computed_value(context),
|
||||||
|
left: self.left.to_computed_value(context),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[inline]
|
||||||
|
fn from_computed_value(computed: &ImageRect) -> Self {
|
||||||
|
specified::ImageRect {
|
||||||
|
url: ToComputedValue::from_computed_value(&computed.url),
|
||||||
|
top: ToComputedValue::from_computed_value(&computed.top),
|
||||||
|
right: ToComputedValue::from_computed_value(&computed.right),
|
||||||
|
bottom: ToComputedValue::from_computed_value(&computed.bottom),
|
||||||
|
left: ToComputedValue::from_computed_value(&computed.left),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// https://drafts.csswg.org/css-images/#valdef-radial-gradient-size
|
/// https://drafts.csswg.org/css-images/#valdef-radial-gradient-size
|
||||||
#[derive(Clone, PartialEq)]
|
#[derive(Clone, PartialEq)]
|
||||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||||
|
@ -15,12 +15,12 @@ use super::{CSSFloat, CSSInteger, RGBA, specified};
|
|||||||
use super::specified::grid::{TrackBreadth as GenericTrackBreadth, TrackSize as GenericTrackSize};
|
use super::specified::grid::{TrackBreadth as GenericTrackBreadth, TrackSize as GenericTrackSize};
|
||||||
|
|
||||||
pub use cssparser::Color as CSSColor;
|
pub use cssparser::Color as CSSColor;
|
||||||
pub use self::image::{AngleOrCorner, EndingShape as GradientShape, Gradient, GradientKind, Image};
|
pub use self::image::{AngleOrCorner, EndingShape as GradientShape, Gradient, GradientKind, Image, ImageRect};
|
||||||
pub use self::image::{LengthOrKeyword, LengthOrPercentageOrKeyword};
|
pub use self::image::{LengthOrKeyword, LengthOrPercentageOrKeyword};
|
||||||
pub use super::{Auto, Either, None_};
|
pub use super::{Auto, Either, None_};
|
||||||
#[cfg(feature = "gecko")]
|
#[cfg(feature = "gecko")]
|
||||||
pub use super::specified::{AlignItems, AlignJustifyContent, AlignJustifySelf, JustifyItems};
|
pub use super::specified::{AlignItems, AlignJustifyContent, AlignJustifySelf, JustifyItems};
|
||||||
pub use super::specified::{Angle, BorderStyle, GridLine, Time, UrlOrNone};
|
pub use super::specified::{Angle, BorderStyle, GridLine, Percentage, Time, UrlOrNone};
|
||||||
pub use super::specified::url::SpecifiedUrl;
|
pub use super::specified::url::SpecifiedUrl;
|
||||||
pub use self::length::{CalcLengthOrPercentage, Length, LengthOrNumber, LengthOrPercentage, LengthOrPercentageOrAuto};
|
pub use self::length::{CalcLengthOrPercentage, Length, LengthOrNumber, LengthOrPercentage, LengthOrPercentageOrAuto};
|
||||||
pub use self::length::{LengthOrPercentageOrAutoOrContent, LengthOrPercentageOrNone, LengthOrNone};
|
pub use self::length::{LengthOrPercentageOrAutoOrContent, LengthOrPercentageOrNone, LengthOrNone};
|
||||||
@ -264,6 +264,46 @@ pub struct Shadow {
|
|||||||
/// A `<number>` value.
|
/// A `<number>` value.
|
||||||
pub type Number = CSSFloat;
|
pub type Number = CSSFloat;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||||
|
#[allow(missing_docs)]
|
||||||
|
pub enum NumberOrPercentage {
|
||||||
|
Percentage(Percentage),
|
||||||
|
Number(Number),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToComputedValue for specified::NumberOrPercentage {
|
||||||
|
type ComputedValue = NumberOrPercentage;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
fn to_computed_value(&self, context: &Context) -> NumberOrPercentage {
|
||||||
|
match *self {
|
||||||
|
specified::NumberOrPercentage::Percentage(percentage) =>
|
||||||
|
NumberOrPercentage::Percentage(percentage.to_computed_value(context)),
|
||||||
|
specified::NumberOrPercentage::Number(number) =>
|
||||||
|
NumberOrPercentage::Number(number.to_computed_value(context)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[inline]
|
||||||
|
fn from_computed_value(computed: &NumberOrPercentage) -> Self {
|
||||||
|
match *computed {
|
||||||
|
NumberOrPercentage::Percentage(percentage) =>
|
||||||
|
specified::NumberOrPercentage::Percentage(ToComputedValue::from_computed_value(&percentage)),
|
||||||
|
NumberOrPercentage::Number(number) =>
|
||||||
|
specified::NumberOrPercentage::Number(ToComputedValue::from_computed_value(&number)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToCss for NumberOrPercentage {
|
||||||
|
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||||
|
match *self {
|
||||||
|
NumberOrPercentage::Percentage(percentage) => percentage.to_css(dest),
|
||||||
|
NumberOrPercentage::Number(number) => number.to_css(dest),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// A type used for opacity.
|
/// A type used for opacity.
|
||||||
pub type Opacity = CSSFloat;
|
pub type Opacity = CSSFloat;
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ use parser::{Parse, ParserContext};
|
|||||||
use servo_url::ServoUrl;
|
use servo_url::ServoUrl;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use style_traits::ToCss;
|
use style_traits::ToCss;
|
||||||
use values::specified::{Angle, CSSColor, Length, LengthOrPercentage};
|
use values::specified::{Angle, CSSColor, Length, LengthOrPercentage, NumberOrPercentage};
|
||||||
use values::specified::position::Position;
|
use values::specified::position::Position;
|
||||||
use values::specified::url::SpecifiedUrl;
|
use values::specified::url::SpecifiedUrl;
|
||||||
|
|
||||||
@ -26,6 +26,8 @@ pub enum Image {
|
|||||||
Url(SpecifiedUrl),
|
Url(SpecifiedUrl),
|
||||||
/// A `<gradient>` image.
|
/// A `<gradient>` image.
|
||||||
Gradient(Gradient),
|
Gradient(Gradient),
|
||||||
|
/// A `-moz-image-rect` image
|
||||||
|
ImageRect(ImageRect),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ToCss for Image {
|
impl ToCss for Image {
|
||||||
@ -33,6 +35,7 @@ impl ToCss for Image {
|
|||||||
match *self {
|
match *self {
|
||||||
Image::Url(ref url_value) => url_value.to_css(dest),
|
Image::Url(ref url_value) => url_value.to_css(dest),
|
||||||
Image::Gradient(ref gradient) => gradient.to_css(dest),
|
Image::Gradient(ref gradient) => gradient.to_css(dest),
|
||||||
|
Image::ImageRect(ref image_rect) => image_rect.to_css(dest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -43,8 +46,11 @@ impl Image {
|
|||||||
if let Ok(url) = input.try(|input| SpecifiedUrl::parse(context, input)) {
|
if let Ok(url) = input.try(|input| SpecifiedUrl::parse(context, input)) {
|
||||||
return Ok(Image::Url(url));
|
return Ok(Image::Url(url));
|
||||||
}
|
}
|
||||||
|
if let Ok(gradient) = input.try(|input| Gradient::parse_function(context, input)) {
|
||||||
|
return Ok(Image::Gradient(gradient));
|
||||||
|
}
|
||||||
|
|
||||||
Ok(Image::Gradient(try!(Gradient::parse_function(context, input))))
|
Ok(Image::ImageRect(ImageRect::parse(context, input)?))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Creates an already specified image value from an already resolved URL
|
/// Creates an already specified image value from an already resolved URL
|
||||||
@ -236,6 +242,64 @@ impl GradientKind {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Specified values for `moz-image-rect`
|
||||||
|
/// -moz-image-rect(<uri>, top, right, bottom, left);
|
||||||
|
#[derive(Clone, PartialEq, Debug)]
|
||||||
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||||
|
#[allow(missing_docs)]
|
||||||
|
pub struct ImageRect {
|
||||||
|
pub url: SpecifiedUrl,
|
||||||
|
pub top: NumberOrPercentage,
|
||||||
|
pub bottom: NumberOrPercentage,
|
||||||
|
pub right: NumberOrPercentage,
|
||||||
|
pub left: NumberOrPercentage,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToCss for ImageRect {
|
||||||
|
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||||
|
dest.write_str("-moz-image-rect(")?;
|
||||||
|
self.url.to_css(dest)?;
|
||||||
|
dest.write_str(", ")?;
|
||||||
|
self.top.to_css(dest)?;
|
||||||
|
dest.write_str(", ")?;
|
||||||
|
self.right.to_css(dest)?;
|
||||||
|
dest.write_str(", ")?;
|
||||||
|
self.bottom.to_css(dest)?;
|
||||||
|
dest.write_str(", ")?;
|
||||||
|
self.left.to_css(dest)?;
|
||||||
|
dest.write_str(")")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Parse for ImageRect {
|
||||||
|
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
|
||||||
|
match_ignore_ascii_case! { &try!(input.expect_function()),
|
||||||
|
"-moz-image-rect" => {
|
||||||
|
input.parse_nested_block(|input| {
|
||||||
|
let url = SpecifiedUrl::parse(context, input)?;
|
||||||
|
input.expect_comma()?;
|
||||||
|
let top = NumberOrPercentage::parse(context, input)?;
|
||||||
|
input.expect_comma()?;
|
||||||
|
let right = NumberOrPercentage::parse(context, input)?;
|
||||||
|
input.expect_comma()?;
|
||||||
|
let bottom = NumberOrPercentage::parse(context, input)?;
|
||||||
|
input.expect_comma()?;
|
||||||
|
let left = NumberOrPercentage::parse(context, input)?;
|
||||||
|
|
||||||
|
Ok(ImageRect {
|
||||||
|
url: url,
|
||||||
|
top: top,
|
||||||
|
right: right,
|
||||||
|
bottom: bottom,
|
||||||
|
left: left,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
_ => Err(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn parse_two_length(context: &ParserContext, input: &mut Parser)
|
fn parse_two_length(context: &ParserContext, input: &mut Parser)
|
||||||
-> Result<(LengthOrPercentage, LengthOrPercentage), ()> {
|
-> Result<(LengthOrPercentage, LengthOrPercentage), ()> {
|
||||||
let first = try!(LengthOrPercentage::parse(context, input));
|
let first = try!(LengthOrPercentage::parse(context, input));
|
||||||
|
@ -19,7 +19,7 @@ use style_traits::values::specified::AllowedNumericType;
|
|||||||
use super::{Angle, Number, SimplifiedValueNode, SimplifiedSumNode, Time};
|
use super::{Angle, Number, SimplifiedValueNode, SimplifiedSumNode, Time};
|
||||||
use values::{Auto, CSSFloat, Either, FONT_MEDIUM_PX, HasViewportPercentage, None_, Normal};
|
use values::{Auto, CSSFloat, Either, FONT_MEDIUM_PX, HasViewportPercentage, None_, Normal};
|
||||||
use values::ExtremumLength;
|
use values::ExtremumLength;
|
||||||
use values::computed::Context;
|
use values::computed::{ComputedValueAsSpecified, Context};
|
||||||
|
|
||||||
pub use super::image::{AngleOrCorner, ColorStop, EndingShape as GradientEndingShape, Gradient};
|
pub use super::image::{AngleOrCorner, ColorStop, EndingShape as GradientEndingShape, Gradient};
|
||||||
pub use super::image::{GradientKind, HorizontalDirection, Image, LengthOrKeyword, LengthOrPercentageOrKeyword};
|
pub use super::image::{GradientKind, HorizontalDirection, Image, LengthOrKeyword, LengthOrPercentageOrKeyword};
|
||||||
@ -921,6 +921,8 @@ impl Parse for Percentage {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl ComputedValueAsSpecified for Percentage {}
|
||||||
|
|
||||||
/// A length or a percentage value.
|
/// A length or a percentage value.
|
||||||
///
|
///
|
||||||
/// TODO(emilio): Does this make any sense vs. CalcLengthOrPercentage?
|
/// TODO(emilio): Does this make any sense vs. CalcLengthOrPercentage?
|
||||||
|
@ -26,8 +26,8 @@ pub use self::align::{AlignItems, AlignJustifyContent, AlignJustifySelf, Justify
|
|||||||
pub use self::color::Color;
|
pub use self::color::Color;
|
||||||
pub use self::grid::{GridLine, TrackKeyword};
|
pub use self::grid::{GridLine, TrackKeyword};
|
||||||
pub use self::image::{AngleOrCorner, ColorStop, EndingShape as GradientEndingShape, Gradient};
|
pub use self::image::{AngleOrCorner, ColorStop, EndingShape as GradientEndingShape, Gradient};
|
||||||
pub use self::image::{GradientKind, HorizontalDirection, Image, LengthOrKeyword, LengthOrPercentageOrKeyword};
|
pub use self::image::{GradientKind, HorizontalDirection, Image, ImageRect, LengthOrKeyword};
|
||||||
pub use self::image::{SizeKeyword, VerticalDirection};
|
pub use self::image::{LengthOrPercentageOrKeyword, SizeKeyword, VerticalDirection};
|
||||||
pub use self::length::{FontRelativeLength, ViewportPercentageLength, CharacterWidth, Length, CalcLengthOrPercentage};
|
pub use self::length::{FontRelativeLength, ViewportPercentageLength, CharacterWidth, Length, CalcLengthOrPercentage};
|
||||||
pub use self::length::{Percentage, LengthOrNone, LengthOrNumber, LengthOrPercentage, LengthOrPercentageOrAuto};
|
pub use self::length::{Percentage, LengthOrNone, LengthOrNumber, LengthOrPercentage, LengthOrPercentageOrAuto};
|
||||||
pub use self::length::{LengthOrPercentageOrNone, LengthOrPercentageOrAutoOrContent, NoCalcLength, CalcUnit};
|
pub use self::length::{LengthOrPercentageOrNone, LengthOrPercentageOrAutoOrContent, NoCalcLength, CalcUnit};
|
||||||
@ -572,6 +572,38 @@ impl ToCss for Number {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <number-percentage>
|
||||||
|
/// Accepts only non-negative numbers.
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||||
|
#[allow(missing_docs)]
|
||||||
|
pub enum NumberOrPercentage {
|
||||||
|
Percentage(Percentage),
|
||||||
|
Number(Number),
|
||||||
|
}
|
||||||
|
|
||||||
|
no_viewport_percentage!(NumberOrPercentage);
|
||||||
|
|
||||||
|
impl Parse for NumberOrPercentage {
|
||||||
|
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
|
||||||
|
if let Ok(per) = input.try(|input| Percentage::parse(context, input)) {
|
||||||
|
return Ok(NumberOrPercentage::Percentage(per));
|
||||||
|
}
|
||||||
|
|
||||||
|
let num = try!(Number::parse_non_negative(input));
|
||||||
|
Ok(NumberOrPercentage::Number(num))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToCss for NumberOrPercentage {
|
||||||
|
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||||
|
match *self {
|
||||||
|
NumberOrPercentage::Percentage(percentage) => percentage.to_css(dest),
|
||||||
|
NumberOrPercentage::Number(number) => number.to_css(dest),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, PartialOrd)]
|
#[derive(Clone, Copy, Debug, PartialEq, PartialOrd)]
|
||||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||||
#[allow(missing_docs)]
|
#[allow(missing_docs)]
|
||||||
|
Loading…
Reference in New Issue
Block a user