mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
auto merge of #4757 : servo/servo/newnewnewcss, r=mbrubeck
(Still off by default. Enable with `RUST_LOG=style`.) r? @mbrubeck
This commit is contained in:
commit
172aed535b
49 changed files with 424 additions and 351 deletions
|
@ -40,7 +40,7 @@ use util::smallvec::{SmallVec, SmallVec8};
|
|||
use std::fmt;
|
||||
use std::slice::Iter;
|
||||
use std::sync::Arc;
|
||||
use style::ComputedValues;
|
||||
use style::properties::ComputedValues;
|
||||
use style::computed_values::{border_style, cursor, filter, mix_blend_mode, pointer_events};
|
||||
|
||||
// It seems cleaner to have layout code not mention Azure directly, so let's just reexport this for
|
||||
|
|
|
@ -11,7 +11,7 @@ use std::cell::RefCell;
|
|||
use util::cache::HashCache;
|
||||
use util::smallvec::{SmallVec, SmallVec8};
|
||||
use style::computed_values::{font_stretch, font_variant, font_weight};
|
||||
use style::style_structs::Font as FontStyle;
|
||||
use style::properties::style_structs::Font as FontStyle;
|
||||
use std::sync::Arc;
|
||||
|
||||
use std::hash::Hash;
|
||||
|
|
|
@ -18,7 +18,7 @@ use platform::font_template::FontTemplateData;
|
|||
use servo_net::resource_task::{ResourceTask, load_whole_resource};
|
||||
use util::task::spawn_named;
|
||||
use util::str::LowercaseString;
|
||||
use style::Source;
|
||||
use style::font_face::Source;
|
||||
|
||||
/// A list of font templates that make up a given font family.
|
||||
struct FontFamily {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue