mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
rustc: Move geom to gfx and stub gfx/surface and image/encode/tga
Conflicts: src/gfx/surface.rs src/layout/base.rs
This commit is contained in:
parent
7f2cae11f2
commit
57ae567777
4 changed files with 8 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
||||||
enum format {
|
enum format {
|
||||||
fo_rgba_8888
|
fo_rgba_8888
|
||||||
// TODO: RGB 565
|
// TODO: RGB 565, others?
|
||||||
}
|
}
|
||||||
|
|
||||||
type surface = {
|
type surface = {
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
import dom::rcu;
|
import dom::rcu;
|
||||||
import dom::rcu::methods;
|
import dom::rcu::methods;
|
||||||
import util::{tree, geom};
|
import gfx::geom;
|
||||||
import geom::{size, rect, point, au};
|
import gfx::geom::{size, rect, point, au};
|
||||||
|
import util::{tree};
|
||||||
|
|
||||||
enum box = @{
|
enum box = @{
|
||||||
tree: tree::fields<box>,
|
tree: tree::fields<box>,
|
||||||
|
@ -136,4 +137,5 @@ mod test {
|
||||||
geom::box(au(0), au(25), au(10), au(20)), // n2
|
geom::box(au(0), au(25), au(10), au(20)), // n2
|
||||||
geom::box(au(0), au(0), au(100), au(45))]; // n3
|
geom::box(au(0), au(0), au(100), au(45))]; // n3
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ mod dom {
|
||||||
}
|
}
|
||||||
|
|
||||||
mod gfx {
|
mod gfx {
|
||||||
|
mod geom;
|
||||||
mod surface;
|
mod surface;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,5 +34,4 @@ mod widget {
|
||||||
|
|
||||||
mod util {
|
mod util {
|
||||||
mod tree;
|
mod tree;
|
||||||
mod geom;
|
}
|
||||||
}
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue