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

Move util::linked_list to layout

Browse source
This commit is contained in:
Anthony Ramine 2016-06-29 17:23:04 +02:00
parent 7b2080c5b7
commit 3041084176
5 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/layout/construct.rs
View file

@ -30,6 +30,7 @@ use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo, UnscannedTextFragm
use gfx::display_list::OpaqueNode; use gfx::display_list::OpaqueNode;
use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFlow, InlineFragmentNodeFlags}; use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFlow, InlineFragmentNodeFlags};
use inline::{InlineFragmentNodeInfo, LAST_FRAGMENT_OF_ELEMENT}; use inline::{InlineFragmentNodeInfo, LAST_FRAGMENT_OF_ELEMENT};
use linked_list::prepend_from;
use list_item::{ListItemFlow, ListStyleTypeContent}; use list_item::{ListItemFlow, ListStyleTypeContent};
use multicol::{MulticolFlow, MulticolColumnFlow}; use multicol::{MulticolFlow, MulticolColumnFlow};
use parallel; use parallel;
@ -57,7 +58,6 @@ use table_wrapper::TableWrapperFlow;
use text::TextRunScanner; use text::TextRunScanner;
use traversal::PostorderNodeMutTraversal; use traversal::PostorderNodeMutTraversal;
use url::Url; use url::Url;
use util::linked_list;
use util::opts; use util::opts;
use wrapper::{TextContent, ThreadSafeLayoutNodeHelpers}; use wrapper::{TextContent, ThreadSafeLayoutNodeHelpers};
@ -1805,8 +1805,7 @@ pub fn strip_ignorable_whitespace_from_start(this: &mut LinkedList<Fragment>) {
} }
} }
} }
linked_list::prepend_from(this, prepend_from(this, &mut leading_fragments_consisting_of_solely_bidi_control_characters);
&mut leading_fragments_consisting_of_solely_bidi_control_characters);
} }
/// Strips ignorable whitespace from the end of a list of fragments. /// Strips ignorable whitespace from the end of a list of fragments.

1
components/layout/lib.rs
View file

@ -75,6 +75,7 @@ mod fragment;
mod generated_content; mod generated_content;
pub mod incremental; pub mod incremental;
mod inline; mod inline;
mod linked_list;
mod list_item; mod list_item;
mod model; mod model;
mod multicol; mod multicol;

0
components/util/linked_list.rs → components/layout/linked_list.rs
View file

2
components/layout/text.rs
View file

@ -16,6 +16,7 @@ use gfx::text::glyph::ByteIndex;
use gfx::text::text_run::TextRun; use gfx::text::text_run::TextRun;
use gfx::text::util::{self, CompressionMode}; use gfx::text::util::{self, CompressionMode};
use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFragments, LAST_FRAGMENT_OF_ELEMENT}; use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFragments, LAST_FRAGMENT_OF_ELEMENT};
use linked_list::split_off_head;
use range::Range; use range::Range;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::collections::LinkedList; use std::collections::LinkedList;
@ -28,7 +29,6 @@ use style::properties::style_structs::ServoFont;
use style::properties::{ComputedValues, ServoComputedValues}; use style::properties::{ComputedValues, ServoComputedValues};
use unicode_bidi::{is_rtl, process_text}; use unicode_bidi::{is_rtl, process_text};
use unicode_script::{get_script, Script}; use unicode_script::{get_script, Script};
use util::linked_list::split_off_head;
/// Returns the concatenated text of a list of unscanned text fragments. /// Returns the concatenated text of a list of unscanned text fragments.
fn text(fragments: &LinkedList<Fragment>) -> String { fn text(fragments: &LinkedList<Fragment>) -> String {

1
components/util/lib.rs
View file

@ -39,7 +39,6 @@ pub mod cache;
#[allow(unsafe_code)] pub mod debug_utils; #[allow(unsafe_code)] pub mod debug_utils;
pub mod geometry; pub mod geometry;
#[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod ipc; #[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod ipc;
#[cfg(feature = "servo")] pub mod linked_list;
#[allow(unsafe_code)] pub mod opts; #[allow(unsafe_code)] pub mod opts;
#[cfg(feature = "servo")] pub mod panicking; #[cfg(feature = "servo")] pub mod panicking;
pub mod prefs; pub mod prefs;