mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
fix rebase conflicts
This commit is contained in:
parent
d2496a45c3
commit
d347aeda38
2 changed files with 15 additions and 10 deletions
|
@ -12,7 +12,7 @@ use std::sync::Arc;
|
|||
|
||||
use azure::azure_hl::Color;
|
||||
use cursor::Cursor;
|
||||
use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D};
|
||||
use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D, Matrix4};
|
||||
use geometry::Au;
|
||||
use range::Range;
|
||||
|
||||
|
@ -193,7 +193,7 @@ known_heap_size!(0, u8, u16, u32, u64, usize);
|
|||
known_heap_size!(0, i8, i16, i32, i64, isize);
|
||||
known_heap_size!(0, bool, f32, f64);
|
||||
|
||||
known_heap_size!(0, Rect<T>, Point2D<T>, Size2D<T>, Matrix2D<T>, SideOffsets2D<T>);
|
||||
known_heap_size!(0, Rect<T>, Point2D<T>, Size2D<T>, Matrix2D<T>, SideOffsets2D<T>, Matrix4<T>);
|
||||
|
||||
known_heap_size!(0, Au, Color, Cursor);
|
||||
known_heap_size!(0, Range<T>);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue