Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-05 22:43:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19312 - aethanyc:use-computedurl, r=heycam

Browse source 
style: Use ComputedUrl instead of SpecifiedUrl in conversion.rs

In stylo, ComputedUrl and SpecifiedUrl happen to be the same. However, using
ComputedUrl can make code clearer that conversion.rs is for converting
computed values between gecko and servo types.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19312)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-21 01:39:44 -06:00 • committed by GitHub
commit b74e71fdd1
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/style/gecko/conversions.rs
View file

@ -17,13 +17,12 @@ use gecko_bindings::structs::{nsStyleImage, nsresult, SheetType};
use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordData, CoordDataMut}; use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordData, CoordDataMut};
use std::f32::consts::PI; use std::f32::consts::PI;
use stylesheets::{Origin, RulesMutateError}; use stylesheets::{Origin, RulesMutateError};
use values::computed::{Angle, CalcLengthOrPercentage, Gradient, Image}; use values::computed::{Angle, CalcLengthOrPercentage, ComputedUrl, Gradient, Image};
use values::computed::{Integer, LengthOrPercentage, LengthOrPercentageOrAuto, Percentage}; use values::computed::{Integer, LengthOrPercentage, LengthOrPercentageOrAuto, Percentage};
use values::generics::box_::VerticalAlign; use values::generics::box_::VerticalAlign;
use values::generics::grid::{TrackListValue, TrackSize}; use values::generics::grid::{TrackListValue, TrackSize};
use values::generics::image::{CompatMode, Image as GenericImage, GradientItem}; use values::generics::image::{CompatMode, Image as GenericImage, GradientItem};
use values::generics::rect::Rect; use values::generics::rect::Rect;
use values::specified::url::SpecifiedUrl;
impl From<CalcLengthOrPercentage> for nsStyleCoord_CalcValue { impl From<CalcLengthOrPercentage> for nsStyleCoord_CalcValue {
fn from(other: CalcLengthOrPercentage) -> nsStyleCoord_CalcValue { fn from(other: CalcLengthOrPercentage) -> nsStyleCoord_CalcValue {
@ -420,11 +419,11 @@ impl nsStyleImage {
} }
} }
unsafe fn get_image_url(self: &nsStyleImage) -> SpecifiedUrl { unsafe fn get_image_url(self: &nsStyleImage) -> ComputedUrl {
use gecko_bindings::bindings::Gecko_GetURLValue; use gecko_bindings::bindings::Gecko_GetURLValue;
let url_value = Gecko_GetURLValue(self); let url_value = Gecko_GetURLValue(self);
let mut url = SpecifiedUrl::from_url_value_data(url_value.as_ref().unwrap()) let mut url = ComputedUrl::from_url_value_data(url_value.as_ref().unwrap())
.expect("Could not convert to SpecifiedUrl"); .expect("Could not convert to ComputedUrl");
url.build_image_value(); url.build_image_value();
url url
} }
@ -596,6 +595,7 @@ pub mod basic_shape {
use gecko_bindings::structs::{nsStyleCoord, nsStyleCorners}; use gecko_bindings::structs::{nsStyleCoord, nsStyleCorners};
use gecko_bindings::sugar::ns_style_coord::{CoordDataMut, CoordDataValue}; use gecko_bindings::sugar::ns_style_coord::{CoordDataMut, CoordDataValue};
use std::borrow::Borrow; use std::borrow::Borrow;
use values::computed::ComputedUrl;
use values::computed::basic_shape::{BasicShape, ShapeRadius}; use values::computed::basic_shape::{BasicShape, ShapeRadius};
use values::computed::border::{BorderCornerRadius, BorderRadius}; use values::computed::border::{BorderCornerRadius, BorderRadius};
use values::computed::length::LengthOrPercentage; use values::computed::length::LengthOrPercentage;
@ -605,9 +605,8 @@ pub mod basic_shape {
use values::generics::basic_shape::{GeometryBox, ShapeBox, ShapeSource}; use values::generics::basic_shape::{GeometryBox, ShapeBox, ShapeSource};
use values::generics::border::BorderRadius as GenericBorderRadius; use values::generics::border::BorderRadius as GenericBorderRadius;
use values::generics::rect::Rect; use values::generics::rect::Rect;
use values::specified::url::SpecifiedUrl;
impl<'a, ReferenceBox> From<&'a StyleShapeSource> for ShapeSource<BasicShape, ReferenceBox, SpecifiedUrl> impl<'a, ReferenceBox> From<&'a StyleShapeSource> for ShapeSource<BasicShape, ReferenceBox, ComputedUrl>
where where
ReferenceBox: From<StyleGeometryBox>, ReferenceBox: From<StyleGeometryBox>,
{ {
@ -619,7 +618,7 @@ pub mod basic_shape {
unsafe { unsafe {
let shape_image = &*other.mShapeImage.mPtr; let shape_image = &*other.mShapeImage.mPtr;
let other_url = &(**shape_image.__bindgen_anon_1.mURLValue.as_ref()); let other_url = &(**shape_image.__bindgen_anon_1.mURLValue.as_ref());
let url = SpecifiedUrl::from_url_value_data(&other_url._base).unwrap(); let url = ComputedUrl::from_url_value_data(&other_url._base).unwrap();
ShapeSource::Url(url) ShapeSource::Url(url)
} }
}, },

4
components/style/values/computed/basic_shape.rs
View file

@ -15,10 +15,10 @@ use values::generics::basic_shape::{Circle as GenericCircle, ClippingShape as Ge
use values::generics::basic_shape::{Ellipse as GenericEllipse, FloatAreaShape as GenericFloatAreaShape}; use values::generics::basic_shape::{Ellipse as GenericEllipse, FloatAreaShape as GenericFloatAreaShape};
use values::generics::basic_shape::{InsetRect as GenericInsetRect, ShapeRadius as GenericShapeRadius}; use values::generics::basic_shape::{InsetRect as GenericInsetRect, ShapeRadius as GenericShapeRadius};
/// A specified clipping shape. /// A computed clipping shape.
pub type ClippingShape = GenericClippingShape<BasicShape, ComputedUrl>; pub type ClippingShape = GenericClippingShape<BasicShape, ComputedUrl>;
/// A specified float area shape. /// A computed float area shape.
pub type FloatAreaShape = GenericFloatAreaShape<BasicShape, ComputedUrl>; pub type FloatAreaShape = GenericFloatAreaShape<BasicShape, ComputedUrl>;
/// A computed basic shape. /// A computed basic shape.