Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-08 06:55:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pull UrlExtraData up to values.rs.

Browse source
This commit is contained in:
Cameron McCormack 2016-07-29 11:12:28 +08:00
parent 89e129bf9f
commit 00677e27fd
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/properties/longhand/box.mako.rs
View file

@ -914,17 +914,10 @@ ${helpers.single_keyword("-moz-appearance",
use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI}; use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI};
use std::fmt::{self, Write}; use std::fmt::{self, Write};
use url::Url; use url::Url;
use values::specified::UrlExtraData;
use values::computed::ComputedValueAsSpecified; use values::computed::ComputedValueAsSpecified;
use values::NoViewportPercentage; use values::NoViewportPercentage;
#[derive(PartialEq, Clone, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub struct UrlExtraData {
pub base: GeckoArcURI,
pub referrer: GeckoArcURI,
pub principal: GeckoArcPrincipal,
}
#[derive(PartialEq, Clone, Debug)] #[derive(PartialEq, Clone, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum SpecifiedValue { pub enum SpecifiedValue {

13
components/style/values.rs
View file

@ -98,6 +98,8 @@ pub mod specified {
use app_units::Au; use app_units::Au;
use cssparser::{self, Parser, ToCss, Token}; use cssparser::{self, Parser, ToCss, Token};
use euclid::size::Size2D; use euclid::size::Size2D;
#[cfg(feature = "gecko")]
use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI};
use parser::ParserContext; use parser::ParserContext;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::cmp; use std::cmp;
@ -1317,6 +1319,17 @@ pub mod specified {
} }
} }
#[derive(PartialEq, Clone, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub struct UrlExtraData {
#[cfg(feature = "gecko")]
pub base: GeckoArcURI,
#[cfg(feature = "gecko")]
pub referrer: GeckoArcURI,
#[cfg(feature = "gecko")]
pub principal: GeckoArcPrincipal,
}
/// Specified values for an image according to CSS-IMAGES. /// Specified values for an image according to CSS-IMAGES.
#[derive(Clone, PartialEq, Debug)] #[derive(Clone, PartialEq, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]