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

Auto merge of #6393 - Ms2ger:cef-string-multimap, r=jdm

Browse source 
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6393)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-15 12:25:11 -06:00
commit bb39e835f1
2 changed files with 18 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

47
ports/cef/string_multimap.rs
View file

@ -4,34 +4,25 @@
use eutil::slice_to_str; use eutil::slice_to_str;
use libc::c_int; use libc::c_int;
use std::boxed;
use std::collections::BTreeMap; 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_userfree_utf16_alloc, cef_string_userfree_utf16_free};
use string::{cef_string_utf16_set}; use string::{cef_string_utf16_set};
use types::{cef_string_multimap_t,cef_string_t}; use types::{cef_string_multimap_t,cef_string_t};
fn string_multimap_to_treemap(smm: *mut cef_string_multimap_t) -> *mut BTreeMap<String, Vec<*mut cef_string_t>> {
smm as *mut BTreeMap<String, Vec<*mut cef_string_t>>
}
//cef_string_multimap //cef_string_multimap
#[no_mangle] #[no_mangle]
pub extern "C" fn cef_string_multimap_alloc() -> *mut cef_string_multimap_t { pub extern "C" fn cef_string_multimap_alloc() -> *mut cef_string_multimap_t {
unsafe { boxed::into_raw(box BTreeMap::new())
let smm: Box<BTreeMap<String, Vec<*mut cef_string_t>>> = box BTreeMap::new();
mem::transmute(smm)
}
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn cef_string_multimap_size(smm: *mut cef_string_multimap_t) -> c_int { pub extern "C" fn cef_string_multimap_size(smm: *mut cef_string_multimap_t) -> c_int {
unsafe { unsafe {
if smm.is_null() { return 0; } if smm.is_null() { return 0; }
let v = string_multimap_to_treemap(smm);
// t1 : collections::btree::map::Values<'_, collections::string::String, collections::vec::Vec<*mut types::cef_string_utf16>>` // t1 : collections::btree::map::Values<'_, collections::string::String, collections::vec::Vec<*mut types::cef_string_utf16>>`
let t1 = (*v).values(); let t1 = (*smm).values();
// t2 : collections::btree::map::BTreeMap<collections::string::String, collections::vec::Vec<*mut types::cef_string_utf16>> // t2 : collections::btree::map::BTreeMap<collections::string::String, collections::vec::Vec<*mut types::cef_string_utf16>>
let t2 : usize = t1.map(|val| (*val).len()).sum(); let t2 : usize = t1.map(|val| (*val).len()).sum();
t2 as c_int t2 as c_int
@ -42,9 +33,8 @@ pub extern "C" fn cef_string_multimap_size(smm: *mut cef_string_multimap_t) -> c
pub extern "C" fn cef_string_multimap_find_count(smm: *mut cef_string_multimap_t, key: *const cef_string_t) -> c_int { pub extern "C" fn cef_string_multimap_find_count(smm: *mut cef_string_multimap_t, key: *const cef_string_t) -> c_int {
unsafe { unsafe {
if smm.is_null() { return 0; } if smm.is_null() { return 0; }
let v = string_multimap_to_treemap(smm);
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| { slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
match (*v).get(result) { match (*smm).get(result) {
Some(s) => s.len() as c_int, Some(s) => s.len() as c_int,
None => 0 None => 0
} }
@ -56,13 +46,12 @@ pub extern "C" fn cef_string_multimap_find_count(smm: *mut cef_string_multimap_t
pub extern "C" fn cef_string_multimap_append(smm: *mut cef_string_multimap_t, key: *const cef_string_t, value: *const cef_string_t) -> c_int { pub extern "C" fn cef_string_multimap_append(smm: *mut cef_string_multimap_t, key: *const cef_string_t, value: *const cef_string_t) -> c_int {
unsafe { unsafe {
if smm.is_null() { return 0; } if smm.is_null() { return 0; }
let v = string_multimap_to_treemap(smm);
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| { slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
let csv = cef_string_userfree_utf16_alloc(); let csv = cef_string_userfree_utf16_alloc();
cef_string_utf16_set((*value).str as *const u16, (*value).length, csv, 1); cef_string_utf16_set((*value).str as *const u16, (*value).length, csv, 1);
match (*v).get_mut(result) { match (*smm).get_mut(result) {
Some(vc) => (*vc).push(csv), Some(vc) => (*vc).push(csv),
None => { (*v).insert(result.to_owned(), vec!(csv)); } None => { (*smm).insert(result.to_owned(), vec!(csv)); }
} }
1 1
}) })
@ -73,9 +62,8 @@ pub extern "C" fn cef_string_multimap_append(smm: *mut cef_string_multimap_t, ke
pub extern "C" fn cef_string_multimap_enumerate(smm: *mut cef_string_multimap_t, key: *const cef_string_t, index: c_int, value: *mut cef_string_t) -> c_int { pub extern "C" fn cef_string_multimap_enumerate(smm: *mut cef_string_multimap_t, key: *const cef_string_t, index: c_int, value: *mut cef_string_t) -> c_int {
unsafe { unsafe {
if smm.is_null() { return 0; } if smm.is_null() { return 0; }
let v = string_multimap_to_treemap(smm);
slice_to_str((*key).str as *const u8, (*key).length as usize, |result| { slice_to_str((*key).str as *const u8, (*key).length as usize, |result| {
match (*v).get(result) { match (*smm).get(result) {
Some(s) => { Some(s) => {
if (*s).len() <= index as usize { if (*s).len() <= index as usize {
return 0; return 0;
@ -93,10 +81,9 @@ pub extern "C" fn cef_string_multimap_enumerate(smm: *mut cef_string_multimap_t,
pub extern "C" fn cef_string_multimap_key(smm: *mut cef_string_multimap_t, index: c_int, value: *mut cef_string_t) -> c_int { pub extern "C" fn cef_string_multimap_key(smm: *mut cef_string_multimap_t, index: c_int, value: *mut cef_string_t) -> c_int {
unsafe { unsafe {
if index < 0 || smm.is_null() { return 0; } if index < 0 || smm.is_null() { return 0; }
let v = string_multimap_to_treemap(smm);
let mut rem = index as usize; let mut rem = index as usize;
for (key, val) in (*v).iter() { for (key, val) in (*smm).iter() {
if rem < (*val).len() { if rem < (*val).len() {
return cef_string_utf16_set((*key).as_bytes().as_ptr() as *const u16, return cef_string_utf16_set((*key).as_bytes().as_ptr() as *const u16,
(*key).len() as u64, (*key).len() as u64,
@ -114,10 +101,9 @@ pub extern "C" fn cef_string_multimap_key(smm: *mut cef_string_multimap_t, index
pub extern "C" fn cef_string_multimap_value(smm: *mut cef_string_multimap_t, index: c_int, value: *mut cef_string_t) -> c_int { pub extern "C" fn cef_string_multimap_value(smm: *mut cef_string_multimap_t, index: c_int, value: *mut cef_string_t) -> c_int {
unsafe { unsafe {
if index < 0 || smm.is_null() { return 0; } if index < 0 || smm.is_null() { return 0; }
let v = string_multimap_to_treemap(smm);
let mut rem = index as usize; let mut rem = index as usize;
for val in (*v).values() { for val in (*smm).values() {
if rem < (*val).len() { if rem < (*val).len() {
let cs = (*val)[rem as usize]; let cs = (*val)[rem as usize];
return cef_string_utf16_set((*cs).str as *const u16, (*cs).length, value, 1); return cef_string_utf16_set((*cs).str as *const u16, (*cs).length, value, 1);
@ -133,15 +119,13 @@ pub extern "C" fn cef_string_multimap_value(smm: *mut cef_string_multimap_t, ind
pub extern "C" fn cef_string_multimap_clear(smm: *mut cef_string_multimap_t) { pub extern "C" fn cef_string_multimap_clear(smm: *mut cef_string_multimap_t) {
unsafe { unsafe {
if smm.is_null() { return; } if smm.is_null() { return; }
let v = string_multimap_to_treemap(smm); if (*smm).len() == 0 { return; }
if (*v).len() == 0 { return; } for (_, val) in (*smm).iter_mut() {
for (_, val) in (*v).iter_mut() { while let Some(cs) = (*val).pop() {
while (*val).len() != 0 { cef_string_userfree_utf16_free(cs);
let cs = (*val).pop();
cef_string_userfree_utf16_free(cs.unwrap());
} }
} }
(*v).clear(); (*smm).clear();
} }
} }
@ -149,8 +133,7 @@ pub extern "C" fn cef_string_multimap_clear(smm: *mut cef_string_multimap_t) {
pub extern "C" fn cef_string_multimap_free(smm: *mut cef_string_multimap_t) { pub extern "C" fn cef_string_multimap_free(smm: *mut cef_string_multimap_t) {
unsafe { unsafe {
if smm.is_null() { return; } if smm.is_null() { return; }
let v: Box<BTreeMap<String, Vec<*mut cef_string_t>>> = mem::transmute(smm);
cef_string_multimap_clear(smm); cef_string_multimap_clear(smm);
drop(v); drop(Box::from_raw(smm));
} }
} }

4
ports/cef/types.rs
View file

@ -13,8 +13,10 @@ use net::net_error_list::NetError;
pub use self::cef_rect as cef_rect_t; pub use self::cef_rect as cef_rect_t;
use std::collections::BTreeMap;
pub enum cef_string_map_t {} pub enum cef_string_map_t {}
pub enum cef_string_multimap_t {} pub type cef_string_multimap_t = BTreeMap<String, Vec<*mut cef_string_t>>;
pub type cef_string_list_t = Vec<String>; pub type cef_string_list_t = Vec<String>;
pub enum cef_text_input_context_t {} pub enum cef_text_input_context_t {}
pub enum cef_event_handle_t {} pub enum cef_event_handle_t {}