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

Move geckolib/values.rs to style/gecko_values.rs

Browse source
This commit is contained in:
Simon Sapin 2016-07-19 14:40:49 +02:00
parent e945d11fd7
commit 2c1f7c8a85
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ports/geckolib/values.rs → components/style/gecko_values.rs
View file

@ -2,12 +2,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![allow(unsafe_code)]
use app_units::Au; use app_units::Au;
use cssparser::RGBA; use cssparser::RGBA;
use gecko_bindings::structs::{nsStyleCoord, nsStyleUnion, nsStyleUnit}; use gecko_bindings::structs::{nsStyleCoord, nsStyleUnion, nsStyleUnit};
use std::cmp::max; use std::cmp::max;
use style::values::computed::Angle; use values::computed::Angle;
use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone}; use values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
pub trait StyleCoordHelpers { pub trait StyleCoordHelpers {
fn copy_from(&mut self, other: &Self); fn copy_from(&mut self, other: &Self);

4
components/style/lib.rs
View file

@ -81,8 +81,8 @@ pub mod dom;
pub mod element_state; pub mod element_state;
pub mod error_reporting; pub mod error_reporting;
pub mod font_face; pub mod font_face;
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")] pub mod gecko_conversions;
pub mod gecko_conversions; #[cfg(feature = "gecko")] pub mod gecko_values;
pub mod keyframes; pub mod keyframes;
pub mod logical_geometry; pub mod logical_geometry;
pub mod matching; pub mod matching;

3
ports/geckolib/lib.rs
View file

@ -28,7 +28,6 @@ mod data;
pub mod glue; pub mod glue;
mod selector_impl; mod selector_impl;
mod traversal; mod traversal;
mod values;
mod wrapper; mod wrapper;
// Generated from the properties.mako.rs template by build.rs // Generated from the properties.mako.rs template by build.rs
@ -38,6 +37,8 @@ pub mod properties {
include!(concat!(env!("OUT_DIR"), "/properties.rs")); include!(concat!(env!("OUT_DIR"), "/properties.rs"));
} }
pub use style::gecko_values as values;
// FIXME(bholley): This should probably go away once we harmonize the allocators. // FIXME(bholley): This should probably go away once we harmonize the allocators.
#[no_mangle] #[no_mangle]
pub extern "C" fn je_malloc_usable_size(_: *const ::libc::c_void) -> ::libc::size_t { 0 } pub extern "C" fn je_malloc_usable_size(_: *const ::libc::c_void) -> ::libc::size_t { 0 }