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

Get rid of servo_util

Browse source
This commit is contained in:
Dan Fox 2015-03-05 17:42:05 +00:00
parent 19686acdec
commit 559ff68b31
25 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/block.rs
View file

@ -53,9 +53,9 @@ use gfx::display_list::{ClippingRegion, DisplayList};
use rustc_serialize::{Encoder, Encodable}; use rustc_serialize::{Encoder, Encodable};
use msg::compositor_msg::LayerId; use msg::compositor_msg::LayerId;
use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::ConstellationChan;
use servo_util::geometry::{Au, MAX_AU}; use util::geometry::{Au, MAX_AU};
use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize}; use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize};
use servo_util::opts; use util::opts;
use std::cmp::{max, min}; use std::cmp::{max, min};
use std::fmt; use std::fmt;
use style::computed_values::{overflow_x, overflow_y, position, box_sizing, display, float}; use style::computed_values::{overflow_x, overflow_y, position, box_sizing, display, float};

2
components/layout/construct.rs
View file

@ -50,7 +50,7 @@ use script::dom::element::ElementTypeId;
use script::dom::htmlelement::HTMLElementTypeId; use script::dom::htmlelement::HTMLElementTypeId;
use script::dom::htmlobjectelement::is_image_data; use script::dom::htmlobjectelement::is_image_data;
use script::dom::node::NodeTypeId; use script::dom::node::NodeTypeId;
use servo_util::opts; use util::opts;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::collections::DList; use std::collections::DList;
use std::mem; use std::mem;

2
components/layout/context.rs
View file

@ -16,7 +16,7 @@ use script::layout_interface::LayoutChan;
use script_traits::UntrustedNodeAddress; use script_traits::UntrustedNodeAddress;
use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::ConstellationChan;
use net::local_image_cache::LocalImageCache; use net::local_image_cache::LocalImageCache;
use servo_util::geometry::Au; use util::geometry::Au;
use std::boxed; use std::boxed;
use std::cell::Cell; use std::cell::Cell;
use std::ptr; use std::ptr;

6
components/layout/css/matching.rs
View file

@ -13,9 +13,9 @@ use wrapper::{LayoutElement, LayoutNode, TLayoutNode};
use script::dom::node::NodeTypeId; use script::dom::node::NodeTypeId;
use selectors::bloom::BloomFilter; use selectors::bloom::BloomFilter;
use servo_util::cache::{LRUCache, SimpleHashCache}; use util::cache::{LRUCache, SimpleHashCache};
use servo_util::smallvec::{SmallVec, SmallVec16}; use util::smallvec::{SmallVec, SmallVec16};
use servo_util::arc_ptr_eq; use util::arc_ptr_eq;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::mem; use std::mem;
use std::hash::{Hash, Hasher, Writer}; use std::hash::{Hash, Hasher, Writer};

8
components/layout/display_list_builder.rs
View file

@ -37,10 +37,10 @@ use msg::compositor_msg::ScrollPolicy;
use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::Msg as ConstellationMsg;
use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::ConstellationChan;
use net::image::holder::ImageHolder; use net::image::holder::ImageHolder;
use servo_util::cursor::Cursor; use util::cursor::Cursor;
use servo_util::geometry::{self, Au, ZERO_POINT, to_px, to_frac_px}; use util::geometry::{self, Au, ZERO_POINT, to_px, to_frac_px};
use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize}; use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize};
use servo_util::opts; use util::opts;
use std::cmp; use std::cmp;
use std::default::Default; use std::default::Default;
use std::iter::repeat; use std::iter::repeat;

8
components/layout/floats.rs
View file

@ -2,10 +2,10 @@
* 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/. */
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::WritingMode; use util::logical_geometry::WritingMode;
use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize}; use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize};
use servo_util::persistent_list::PersistentList; use util::persistent_list::PersistentList;
use std::cmp::{max, min}; use std::cmp::{max, min};
use std::i32; use std::i32;
use std::fmt; use std::fmt;

4
components/layout/flow.rs
View file

@ -51,8 +51,8 @@ use gfx::display_list::ClippingRegion;
use rustc_serialize::{Encoder, Encodable}; use rustc_serialize::{Encoder, Encodable};
use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::ConstellationChan;
use msg::compositor_msg::LayerId; use msg::compositor_msg::LayerId;
use servo_util::geometry::{Au, ZERO_RECT}; use util::geometry::{Au, ZERO_RECT};
use servo_util::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; use util::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
use std::mem; use std::mem;
use std::fmt; use std::fmt;
use std::iter::Zip; use std::iter::Zip;

10
components/layout/fragment.rs
View file

@ -33,11 +33,11 @@ use rustc_serialize::{Encodable, Encoder};
use msg::constellation_msg::{ConstellationChan, Msg, PipelineId, SubpageId}; use msg::constellation_msg::{ConstellationChan, Msg, PipelineId, SubpageId};
use net::image::holder::ImageHolder; use net::image::holder::ImageHolder;
use net::local_image_cache::LocalImageCache; use net::local_image_cache::LocalImageCache;
use servo_util::geometry::{self, Au, ZERO_POINT}; use util::geometry::{self, Au, ZERO_POINT};
use servo_util::logical_geometry::{LogicalRect, LogicalSize, LogicalMargin}; use util::logical_geometry::{LogicalRect, LogicalSize, LogicalMargin};
use servo_util::range::*; use util::range::*;
use servo_util::smallvec::SmallVec; use util::smallvec::SmallVec;
use servo_util::str::is_whitespace; use util::str::is_whitespace;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::cmp::{max, min}; use std::cmp::{max, min};
use std::collections::DList; use std::collections::DList;

8
components/layout/inline.rs
View file

@ -24,10 +24,10 @@ use geom::{Point2D, Rect};
use gfx::font::FontMetrics; use gfx::font::FontMetrics;
use gfx::font_context::FontContext; use gfx::font_context::FontContext;
use gfx::text::glyph::CharIndex; use gfx::text::glyph::CharIndex;
use servo_util::arc_ptr_eq; use util::arc_ptr_eq;
use servo_util::geometry::{Au, ZERO_RECT}; use util::geometry::{Au, ZERO_RECT};
use servo_util::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; use util::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
use servo_util::range::{Range, RangeIndex}; use util::range::{Range, RangeIndex};
use std::cmp::max; use std::cmp::max;
use std::fmt; use std::fmt;
use std::mem; use std::mem;

20
components/layout/layout_task.rs
View file

@ -53,16 +53,16 @@ use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, Pipel
use net::image_cache_task::{ImageCacheTask, ImageResponseMsg}; use net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
use net::local_image_cache::{ImageResponder, LocalImageCache}; use net::local_image_cache::{ImageResponder, LocalImageCache};
use net::resource_task::{ResourceTask, load_bytes_iter}; use net::resource_task::{ResourceTask, load_bytes_iter};
use servo_util::cursor::Cursor; use util::cursor::Cursor;
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::LogicalPoint; use util::logical_geometry::LogicalPoint;
use servo_util::opts; use util::opts;
use servo_util::smallvec::{SmallVec, SmallVec1, VecLike}; use util::smallvec::{SmallVec, SmallVec1, VecLike};
use servo_util::task::spawn_named_with_send_on_failure; use util::task::spawn_named_with_send_on_failure;
use servo_util::task_state; use util::task_state;
use servo_util::time::{TimeProfilerCategory, ProfilerMetadata, TimeProfilerChan}; use util::time::{TimeProfilerCategory, ProfilerMetadata, TimeProfilerChan};
use servo_util::time::{TimerMetadataFrameType, TimerMetadataReflowType, profile}; use util::time::{TimerMetadataFrameType, TimerMetadataReflowType, profile};
use servo_util::workqueue::WorkQueue; use util::workqueue::WorkQueue;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::cell::Cell; use std::cell::Cell;
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};

2
components/layout/lib.rs
View file

@ -43,7 +43,7 @@ extern crate net;
extern crate msg; extern crate msg;
extern crate selectors; extern crate selectors;
#[macro_use] #[macro_use]
extern crate "util" as servo_util; extern crate util;
#[no_link] #[macro_use] #[plugin] #[no_link] #[macro_use] #[plugin]
extern crate string_cache_macros; extern crate string_cache_macros;

6
components/layout/list_item.rs
View file

@ -18,9 +18,9 @@ use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect}; use geom::{Point2D, Rect};
use gfx::display_list::DisplayList; use gfx::display_list::DisplayList;
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::LogicalRect; use util::logical_geometry::LogicalRect;
use servo_util::opts; use util::opts;
use style::properties::ComputedValues; use style::properties::ComputedValues;
use style::computed_values::list_style_type; use style::computed_values::list_style_type;
use std::sync::Arc; use std::sync::Arc;

4
components/layout/model.rs
View file

@ -11,8 +11,8 @@ use fragment::Fragment;
use geom::SideOffsets2D; use geom::SideOffsets2D;
use style::values::computed::{LengthOrPercentageOrAuto, LengthOrPercentageOrNone, LengthOrPercentage}; use style::values::computed::{LengthOrPercentageOrAuto, LengthOrPercentageOrNone, LengthOrPercentage};
use style::properties::ComputedValues; use style::properties::ComputedValues;
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::LogicalMargin; use util::logical_geometry::LogicalMargin;
use std::cmp::{max, min}; use std::cmp::{max, min};
use std::fmt; use std::fmt;

6
components/layout/parallel.rs
View file

@ -20,9 +20,9 @@ use wrapper::{layout_node_to_unsafe_layout_node, layout_node_from_unsafe_layout_
use wrapper::{PostorderNodeMutTraversal, UnsafeLayoutNode}; use wrapper::{PostorderNodeMutTraversal, UnsafeLayoutNode};
use wrapper::{PreorderDomTraversal, PostorderDomTraversal}; use wrapper::{PreorderDomTraversal, PostorderDomTraversal};
use servo_util::opts; use util::opts;
use servo_util::time::{TimeProfilerCategory, ProfilerMetadata, TimeProfilerChan, profile}; use util::time::{TimeProfilerCategory, ProfilerMetadata, TimeProfilerChan, profile};
use servo_util::workqueue::{WorkQueue, WorkUnit, WorkerProxy}; use util::workqueue::{WorkQueue, WorkUnit, WorkerProxy};
use std::mem; use std::mem;
use std::ptr; use std::ptr;
use std::sync::atomic::{AtomicInt, Ordering}; use std::sync::atomic::{AtomicInt, Ordering};

4
components/layout/sequential.rs
View file

@ -17,8 +17,8 @@ use wrapper::{PostorderNodeMutTraversal};
use wrapper::{PreorderDomTraversal, PostorderDomTraversal}; use wrapper::{PreorderDomTraversal, PostorderDomTraversal};
use geom::point::Point2D; use geom::point::Point2D;
use servo_util::geometry::{Au, ZERO_POINT}; use util::geometry::{Au, ZERO_POINT};
use servo_util::opts; use util::opts;
pub fn traverse_dom_preorder(root: LayoutNode, pub fn traverse_dom_preorder(root: LayoutNode,
shared_layout_context: &SharedLayoutContext) { shared_layout_context: &SharedLayoutContext) {

4
components/layout/table.rs
View file

@ -21,8 +21,8 @@ use table_wrapper::TableLayout;
use wrapper::ThreadSafeLayoutNode; use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect}; use geom::{Point2D, Rect};
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::LogicalRect; use util::logical_geometry::LogicalRect;
use std::cmp::max; use std::cmp::max;
use std::fmt; use std::fmt;
use style::properties::ComputedValues; use style::properties::ComputedValues;

4
components/layout/table_caption.rs
View file

@ -14,8 +14,8 @@ use fragment::FragmentBorderBoxIterator;
use wrapper::ThreadSafeLayoutNode; use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect}; use geom::{Point2D, Rect};
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::LogicalRect; use util::logical_geometry::LogicalRect;
use std::fmt; use std::fmt;
use style::properties::ComputedValues; use style::properties::ComputedValues;
use std::sync::Arc; use std::sync::Arc;

4
components/layout/table_cell.rs
View file

@ -16,8 +16,8 @@ use table::InternalTable;
use wrapper::ThreadSafeLayoutNode; use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect}; use geom::{Point2D, Rect};
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::LogicalRect; use util::logical_geometry::LogicalRect;
use std::fmt; use std::fmt;
use style::properties::ComputedValues; use style::properties::ComputedValues;
use style::legacy::UnsignedIntegerAttribute; use style::legacy::UnsignedIntegerAttribute;

2
components/layout/table_colgroup.rs
View file

@ -14,7 +14,7 @@ use layout_debug;
use wrapper::ThreadSafeLayoutNode; use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect}; use geom::{Point2D, Rect};
use servo_util::geometry::{Au, ZERO_RECT}; use util::geometry::{Au, ZERO_RECT};
use std::cmp::max; use std::cmp::max;
use std::fmt; use std::fmt;
use style::values::computed::LengthOrPercentageOrAuto; use style::values::computed::LengthOrPercentageOrAuto;

4
components/layout/table_row.rs
View file

@ -19,8 +19,8 @@ use model::MaybeAuto;
use wrapper::ThreadSafeLayoutNode; use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect}; use geom::{Point2D, Rect};
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::LogicalRect; use util::logical_geometry::LogicalRect;
use std::cmp::max; use std::cmp::max;
use std::fmt; use std::fmt;
use style::properties::ComputedValues; use style::properties::ComputedValues;

4
components/layout/table_rowgroup.rs
View file

@ -16,8 +16,8 @@ use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable};
use wrapper::ThreadSafeLayoutNode; use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect}; use geom::{Point2D, Rect};
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::LogicalRect; use util::logical_geometry::LogicalRect;
use std::fmt; use std::fmt;
use style::properties::ComputedValues; use style::properties::ComputedValues;
use std::sync::Arc; use std::sync::Arc;

2
components/layout/table_wrapper.rs
View file

@ -24,7 +24,7 @@ use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize};
use wrapper::ThreadSafeLayoutNode; use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect}; use geom::{Point2D, Rect};
use servo_util::geometry::Au; use util::geometry::Au;
use std::cmp::{max, min}; use std::cmp::{max, min};
use std::fmt; use std::fmt;
use std::ops::Add; use std::ops::Add;

10
components/layout/text.rs
View file

@ -15,11 +15,11 @@ use gfx::font_context::FontContext;
use gfx::text::glyph::CharIndex; use gfx::text::glyph::CharIndex;
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 servo_util::dlist; use util::dlist;
use servo_util::geometry::Au; use util::geometry::Au;
use servo_util::logical_geometry::{LogicalSize, WritingMode}; use util::logical_geometry::{LogicalSize, WritingMode};
use servo_util::range::Range; use util::range::Range;
use servo_util::smallvec::{SmallVec, SmallVec1}; use util::smallvec::{SmallVec, SmallVec1};
use std::collections::DList; use std::collections::DList;
use std::mem; use std::mem;
use style::computed_values::{line_height, text_orientation, text_rendering, text_transform}; use style::computed_values::{line_height, text_orientation, text_rendering, text_transform};

4
components/layout/traversal.rs
View file

@ -19,8 +19,8 @@ use wrapper::{PostorderNodeMutTraversal, ThreadSafeLayoutNode, UnsafeLayoutNode}
use wrapper::{PreorderDomTraversal, PostorderDomTraversal}; use wrapper::{PreorderDomTraversal, PostorderDomTraversal};
use selectors::bloom::BloomFilter; use selectors::bloom::BloomFilter;
use servo_util::opts; use util::opts;
use servo_util::tid::tid; use util::tid::tid;
use style::node::TNode; use style::node::TNode;
use std::cell::RefCell; use std::cell::RefCell;

2
components/layout/wrapper.rs
View file

@ -60,7 +60,7 @@ use script::dom::node::{HAS_CHANGED, IS_DIRTY, HAS_DIRTY_SIBLINGS, HAS_DIRTY_DES
use script::dom::text::Text; use script::dom::text::Text;
use script::layout_interface::LayoutChan; use script::layout_interface::LayoutChan;
use msg::constellation_msg::{PipelineId, SubpageId}; use msg::constellation_msg::{PipelineId, SubpageId};
use servo_util::str::{LengthOrPercentageOrAuto, is_whitespace}; use util::str::{LengthOrPercentageOrAuto, is_whitespace};
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::cell::{Ref, RefMut}; use std::cell::{Ref, RefMut};
use std::marker::ContravariantLifetime; use std::marker::ContravariantLifetime;