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

Fix MallocSizeOf for TypedSize2D.

Browse source 
TypedSize2D's MallocSizeOf impl has two problems.

- It measures `width` twice, and `height` not at all.

- It erroneously asserts that `width` and `height` are scalars. This
  seems reasonable at first blush, but Stylo uses
  `BorderRadius<LengthAndPercentage>` which contains a
  `TypedSize2D<LengthAndPercentage, UnknownUnit>`, and
  `LengthAndPercentage` is non-scalar.

This patch fixes both of these problems, and also removes a low-value
`use` statement.
This commit is contained in:
Nicholas Nethercote 2017-09-21 09:06:20 +10:00
parent 6a791cd7f2
commit eeed0b17eb
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/malloc_size_of/lib.rs
View file

@ -64,7 +64,6 @@ extern crate servo_arc;
extern crate smallbitvec; extern crate smallbitvec;
extern crate smallvec; extern crate smallvec;
use euclid::TypedSize2D;
use servo_arc::Arc; use servo_arc::Arc;
use smallvec::{Array, SmallVec}; use smallvec::{Array, SmallVec};
use std::hash::{BuildHasher, Hash}; use std::hash::{BuildHasher, Hash};
@ -391,11 +390,9 @@ impl MallocSizeOf for smallbitvec::SmallBitVec {
} }
} }
impl<T: MallocSizeOf, U> MallocSizeOf for TypedSize2D<T, U> { impl<T: MallocSizeOf, U> MallocSizeOf for euclid::TypedSize2D<T, U> {
fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
let n = self.width.size_of(ops) + self.width.size_of(ops); self.width.size_of(ops) + self.height.size_of(ops)
assert!(n == 0); // It would be very strange to have a non-zero value here...
n
} }
} }