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

Bump heapsize to 0.3

Browse source
This commit is contained in:
Anthony Ramine 2016-02-11 17:04:57 +01:00
parent 26a82a6338
commit 55dcee94be
21 changed files with 106 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/Cargo.toml
View file

@ -14,7 +14,7 @@ bitflags = "0.3"
euclid = {version = "0.6.2", features = ["plugins"]}
fnv = "1.0"
harfbuzz-sys = "0.1"
heapsize = "0.2.5"
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
lazy_static = "0.1"
libc = "0.2"

2
components/gfx/display_list/mod.rs
View file

@ -1257,7 +1257,7 @@ pub struct GradientDisplayItem {
impl HeapSizeOf for GradientDisplayItem {
fn heap_size_of_children(&self) -> usize {
use heapsize::heap_size_of;
use libc::c_void;
use std::os::raw::c_void;
// We can't measure `stops` via Vec's HeapSizeOf implementation because GradientStop isn't
// defined in this module, and we don't want to import GradientStop into util::mem where

19
components/gfx/platform/freetype/font_context.rs
View file

@ -28,7 +28,7 @@ const FT_ALIGNMENT: usize = 1;
extern fn ft_alloc(mem: FT_Memory, req_size: c_long) -> *mut c_void {
unsafe {
let ptr = heap::allocate(req_size as usize, FT_ALIGNMENT) as *mut c_void;
let actual_size = heap_size_of(ptr);
let actual_size = heap_size_of(ptr as *const _);
let user = (*mem).user as *mut User;
(*user).size += actual_size;
@ -39,7 +39,7 @@ extern fn ft_alloc(mem: FT_Memory, req_size: c_long) -> *mut c_void {
extern fn ft_free(mem: FT_Memory, ptr: *mut c_void) {
unsafe {
let actual_size = heap_size_of(ptr);
let actual_size = heap_size_of(ptr as *const _);
let user = (*mem).user as *mut User;
(*user).size -= actual_size;
@ -51,10 +51,10 @@ extern fn ft_free(mem: FT_Memory, ptr: *mut c_void) {
extern fn ft_realloc(mem: FT_Memory, _cur_size: c_long, new_req_size: c_long,
old_ptr: *mut c_void) -> *mut c_void {
unsafe {
let old_actual_size = heap_size_of(old_ptr);
let old_actual_size = heap_size_of(old_ptr as *const _);
let new_ptr = heap::reallocate(old_ptr as *mut u8, old_actual_size,
new_req_size as usize, FT_ALIGNMENT) as *mut c_void;
let new_actual_size = heap_size_of(new_ptr);
let new_actual_size = heap_size_of(new_ptr as *const _);
let user = (*mem).user as *mut User;
(*user).size += new_actual_size;
@ -90,11 +90,12 @@ impl Drop for FreeTypeLibraryHandle {
impl HeapSizeOf for FreeTypeLibraryHandle {
fn heap_size_of_children(&self) -> usize {
let ft_size = unsafe { (*self.user).size };
ft_size +
heap_size_of(self.ctx as *const c_void) +
heap_size_of(self.mem as *const c_void) +
heap_size_of(self.user as *const c_void)
unsafe {
(*self.user).size +
heap_size_of(self.ctx as *const _) +
heap_size_of(self.mem as *const _) +
heap_size_of(self.user as *const _)
}
}
}