diff options
| -rw-r--r-- | ports/cef/string.rs | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/ports/cef/string.rs b/ports/cef/string.rs index b878defb8b5..855fa1226ec 100644 --- a/ports/cef/string.rs +++ b/ports/cef/string.rs @@ -9,6 +9,9 @@ use libc::types::os::arch::c95::wchar_t; use mem::{new0,newarray0,delete,deletearray}; use std::mem; use std::ptr; +use std::slice; +use std::string; +use std::str; use types::{cef_string_utf16_t, cef_string_utf8_t, cef_string_wide_t}; use types::{cef_string_userfree_utf16_t, cef_string_userfree_utf8_t, cef_string_userfree_wide_t}; @@ -91,6 +94,37 @@ pub extern "C" fn cef_string_utf8_set(src: *const u8, src_len: size_t, output: * } #[no_mangle] +pub extern "C" fn cef_string_utf8_to_utf16(src: *const u8, src_len: size_t, output: *mut cef_string_utf16_t) -> c_int { + unsafe { + slice::raw::buf_as_slice(src, src_len as uint, |result| { + match str::from_utf8(result) { + Some(enc) => { + let conv = enc.utf16_units().collect::<Vec<u16>>(); + cef_string_utf16_set(conv.as_ptr(), conv.len() as size_t, output, 1); + 1 + }, + None => 0 + } + }) + } +} + +#[no_mangle] +pub extern "C" fn cef_string_utf16_to_utf8(src: *const u16, src_len: size_t, output: *mut cef_string_utf8_t) -> c_int { + unsafe { + slice::raw::buf_as_slice(src, src_len as uint, |ustr| { + match string::String::from_utf16(ustr) { + Some(str) => { + cef_string_utf8_set(str.as_bytes().as_ptr(), str.len() as size_t, output, 1); + 1 as c_int + }, + None => 0 as c_int + } + }) + } +} + +#[no_mangle] pub extern "C" fn cef_string_utf16_clear(cs: *mut cef_string_utf16_t) { unsafe { if !fptr_is_null(mem::transmute((*cs).dtor)) { |