Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 17:14:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use Box and boxed functions to manage cef_string_map_t memory.

Browse source
This commit is contained in:
Ms2ger 2015-06-20 14:00:31 +02:00
parent 577407fe68
commit 0f65c04fe9
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ports/cef/string_map.rs
View file

@ -4,8 +4,8 @@
use eutil::slice_to_str;
use libc::{c_int};
use std::boxed;
use std::collections::BTreeMap;
use std::mem;
use std::string::String;
use string::{cef_string_userfree_utf16_alloc, cef_string_userfree_utf16_free};
use string::{cef_string_utf16_set};
@ -19,10 +19,7 @@ fn string_map_to_treemap(sm: *mut cef_string_map_t) -> *mut BTreeMap<String, *mu
#[no_mangle]
pub extern "C" fn cef_string_map_alloc() -> *mut cef_string_map_t {
unsafe {
let sm: Box<BTreeMap<String, *mut cef_string_t>> = box BTreeMap::new();
mem::transmute(sm)
}
boxed::into_raw(box BTreeMap::new())
}
#[no_mangle]
@ -118,7 +115,7 @@ pub extern "C" fn cef_string_map_clear(sm: *mut cef_string_map_t) {
pub extern "C" fn cef_string_map_free(sm: *mut cef_string_map_t) {
unsafe {
if sm.is_null() { return; }
let _v: Box<BTreeMap<String, *mut cef_string_t>> = mem::transmute(sm);
cef_string_map_clear(sm);
drop(Box::from_raw(sm));
}
}

2
ports/cef/types.rs
View file

@ -15,7 +15,7 @@ pub use self::cef_rect as cef_rect_t;
use std::collections::BTreeMap;
pub enum cef_string_map_t {}
pub type cef_string_map_t = BTreeMap<String, *mut cef_string_t>;
pub type cef_string_multimap_t = BTreeMap<String, Vec<*mut cef_string_t>>;
pub type cef_string_list_t = Vec<String>;
pub enum cef_text_input_context_t {}