mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #12256 - nox:die-util-die, r=Ms2ger
Move some stuff from util to style <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12256) <!-- Reviewable:end -->
This commit is contained in:
commit
bb916bb38b
27 changed files with 25 additions and 30 deletions
|
@ -124,11 +124,11 @@ use style::attr::AttrValue;
|
|||
use style::context::ReflowGoal;
|
||||
use style::restyle_hints::ElementSnapshot;
|
||||
use style::servo::Stylesheet;
|
||||
use style::str::{split_html_space_chars, str_join};
|
||||
use time;
|
||||
use url::Url;
|
||||
use url::percent_encoding::percent_decode;
|
||||
use util::prefs::PREFS;
|
||||
use util::str::{split_html_space_chars, str_join};
|
||||
|
||||
#[derive(JSTraceable, PartialEq, HeapSizeOf)]
|
||||
pub enum IsHTMLDocument {
|
||||
|
|
|
@ -13,7 +13,7 @@ use dom::bindings::str::DOMString;
|
|||
use dom::element::Element;
|
||||
use dom::node::window_from_node;
|
||||
use string_cache::Atom;
|
||||
use util::str::HTML_SPACE_CHARACTERS;
|
||||
use style::str::HTML_SPACE_CHARACTERS;
|
||||
|
||||
#[dom_struct]
|
||||
pub struct DOMTokenList {
|
||||
|
|
|
@ -17,7 +17,7 @@ use dom::window::Window;
|
|||
use std::ascii::AsciiExt;
|
||||
use std::cell::Cell;
|
||||
use string_cache::{Atom, Namespace, QualName};
|
||||
use util::str::split_html_space_chars;
|
||||
use style::str::split_html_space_chars;
|
||||
|
||||
pub trait CollectionFilter : JSTraceable {
|
||||
fn filter<'a>(&self, elem: &'a Element, root: &'a Node) -> bool;
|
||||
|
|
|
@ -15,8 +15,8 @@ use dom::node::Node;
|
|||
use dom::virtualmethods::VirtualMethods;
|
||||
use string_cache::Atom;
|
||||
use style::attr::AttrValue;
|
||||
use style::str::{HTML_SPACE_CHARACTERS, read_numbers};
|
||||
use style::values::specified;
|
||||
use util::str::{HTML_SPACE_CHARACTERS, read_numbers};
|
||||
|
||||
#[dom_struct]
|
||||
pub struct HTMLFontElement {
|
||||
|
|
|
@ -51,10 +51,10 @@ use std::cell::Cell;
|
|||
use std::sync::mpsc::Sender;
|
||||
use string_cache::Atom;
|
||||
use style::attr::AttrValue;
|
||||
use style::str::split_html_space_chars;
|
||||
use task_source::TaskSource;
|
||||
use task_source::dom_manipulation::DOMManipulationTask;
|
||||
use url::form_urlencoded;
|
||||
use util::str::split_html_space_chars;
|
||||
|
||||
#[derive(JSTraceable, PartialEq, Clone, Copy, HeapSizeOf)]
|
||||
pub struct GenerationId(u32);
|
||||
|
|
|
@ -42,10 +42,10 @@ use std::ops::Range;
|
|||
use string_cache::Atom;
|
||||
use style::attr::AttrValue;
|
||||
use style::element_state::*;
|
||||
use style::str::split_commas;
|
||||
use textinput::KeyReaction::{DispatchInput, Nothing, RedrawSelection, TriggerDefaultAction};
|
||||
use textinput::Lines::Single;
|
||||
use textinput::{TextInput, SelectionDirection};
|
||||
use util::str::split_commas;
|
||||
|
||||
const DEFAULT_SUBMIT_VALUE: &'static str = "Submit";
|
||||
const DEFAULT_RESET_VALUE: &'static str = "Reset";
|
||||
|
|
|
@ -40,9 +40,9 @@ use style::attr::AttrValue;
|
|||
use style::media_queries::{MediaQueryList, parse_media_query_list};
|
||||
use style::parser::ParserContextExtraData;
|
||||
use style::servo::Stylesheet;
|
||||
use style::str::HTML_SPACE_CHARACTERS;
|
||||
use style::stylesheets::Origin;
|
||||
use url::Url;
|
||||
use util::str::HTML_SPACE_CHARACTERS;
|
||||
|
||||
no_jsmanaged_fields!(Stylesheet);
|
||||
|
||||
|
|
|
@ -21,9 +21,9 @@ use std::sync::Arc;
|
|||
use string_cache::Atom;
|
||||
use style::attr::AttrValue;
|
||||
use style::servo::Stylesheet;
|
||||
use style::str::HTML_SPACE_CHARACTERS;
|
||||
use style::stylesheets::{CSSRule, Origin};
|
||||
use style::viewport::ViewportRule;
|
||||
use util::str::HTML_SPACE_CHARACTERS;
|
||||
|
||||
#[dom_struct]
|
||||
pub struct HTMLMetaElement {
|
||||
|
|
|
@ -22,7 +22,7 @@ use dom::virtualmethods::VirtualMethods;
|
|||
use std::cell::Cell;
|
||||
use string_cache::Atom;
|
||||
use style::element_state::*;
|
||||
use util::str::{split_html_space_chars, str_join};
|
||||
use style::str::{split_html_space_chars, str_join};
|
||||
|
||||
#[dom_struct]
|
||||
pub struct HTMLOptionElement {
|
||||
|
|
|
@ -38,8 +38,8 @@ use std::cell::Cell;
|
|||
use std::mem;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use string_cache::Atom;
|
||||
use style::str::{HTML_SPACE_CHARACTERS, StaticStringVec};
|
||||
use url::Url;
|
||||
use util::str::{HTML_SPACE_CHARACTERS, StaticStringVec};
|
||||
|
||||
#[dom_struct]
|
||||
pub struct HTMLScriptElement {
|
||||
|
|
|
@ -84,6 +84,7 @@ use style::context::ReflowGoal;
|
|||
use style::error_reporting::ParseErrorReporter;
|
||||
use style::properties::longhands::overflow_x;
|
||||
use style::selector_impl::PseudoElement;
|
||||
use style::str::HTML_SPACE_CHARACTERS;
|
||||
use task_source::dom_manipulation::DOMManipulationTaskSource;
|
||||
use task_source::file_reading::FileReadingTaskSource;
|
||||
use task_source::history_traversal::HistoryTraversalTaskSource;
|
||||
|
@ -96,7 +97,6 @@ use tinyfiledialogs::{self, MessageBoxIcon};
|
|||
use url::Url;
|
||||
use util::geometry::{self, MAX_RECT};
|
||||
use util::prefs::PREFS;
|
||||
use util::str::HTML_SPACE_CHARACTERS;
|
||||
use util::{breakpoint, opts};
|
||||
use webdriver_handlers::jsval_to_webdriver;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue