mirror of
https://github.com/servo/servo.git
synced 2025-08-08 06:55:31 +01:00
Auto merge of #6423 - ecoal95:euclid, r=glennw
Use euclid from crates.io Sorry for not doing it yesterday, I couldn't. cc @metajack @SimonSapin <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6423) <!-- Reviewable:end -->
This commit is contained in:
commit
4ebb95ccd8
104 changed files with 272 additions and 306 deletions
|
@ -14,9 +14,6 @@ path = "../../../components/style"
|
|||
[dependencies.util]
|
||||
path = "../../../components/util"
|
||||
|
||||
[dependencies.geom]
|
||||
git = "https://github.com/servo/rust-geom"
|
||||
|
||||
[dependencies.selectors]
|
||||
git = "https://github.com/servo/rust-selectors"
|
||||
|
||||
|
@ -25,3 +22,4 @@ url = "*"
|
|||
cssparser = "0.3.1"
|
||||
string_cache = "0.1"
|
||||
string_cache_plugin = "0.1"
|
||||
euclid = "0.1"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#![plugin(string_cache_plugin)]
|
||||
|
||||
extern crate cssparser;
|
||||
extern crate geom;
|
||||
extern crate euclid;
|
||||
extern crate selectors;
|
||||
extern crate string_cache;
|
||||
extern crate style;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* 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/. */
|
||||
|
||||
use geom::size::Size2D;
|
||||
use euclid::size::Size2D;
|
||||
use style::stylesheets::{Stylesheet, CSSRuleIteratorExt};
|
||||
use style::stylesheets::Origin;
|
||||
use style::media_queries::*;
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use cssparser::Parser;
|
||||
use geom::size::Size2D;
|
||||
use geom::scale_factor::ScaleFactor;
|
||||
use euclid::size::Size2D;
|
||||
use euclid::scale_factor::ScaleFactor;
|
||||
use style::media_queries::{Device, MediaType};
|
||||
use style::parser::ParserContext;
|
||||
use style::stylesheets::{Origin, Stylesheet, CSSRuleIteratorExt};
|
||||
|
|
|
@ -15,9 +15,7 @@ path = "../../../components/util"
|
|||
[dependencies.plugins]
|
||||
path = "../../../components/plugins"
|
||||
|
||||
[dependencies.geom]
|
||||
git = "https://github.com/servo/rust-geom"
|
||||
|
||||
[dependencies]
|
||||
libc = "*"
|
||||
euclid = "0.1"
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#![plugin(plugins)]
|
||||
extern crate util;
|
||||
extern crate libc;
|
||||
extern crate geom;
|
||||
extern crate euclid;
|
||||
|
||||
#[cfg(test)] mod cache;
|
||||
#[cfg(test)] mod logical_geometry;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* 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/. */
|
||||
|
||||
use geom::{Size2D, Point2D, SideOffsets2D, Rect};
|
||||
use euclid::{Size2D, Point2D, SideOffsets2D, Rect};
|
||||
use util::logical_geometry::{WritingMode, LogicalSize, LogicalPoint, LogicalMargin, LogicalRect,
|
||||
FLAG_RTL, FLAG_VERTICAL, FLAG_VERTICAL_LR, FLAG_SIDEWAYS_LEFT};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue