Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-13 10:23:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove rust-encoding usage from cef

Browse source
This commit is contained in:
Mike Blumenkrantz 2014-10-12 23:35:47 -04:00
parent f657e76e13
commit cb5d7b98bf
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ports/cef/lib.rs
View file

@ -37,8 +37,6 @@ extern crate native;
extern crate libc;
extern crate "url" as std_url;
extern crate encoding;
#[cfg(target_os="macos")]
extern crate core_graphics;
#[cfg(target_os="macos")]

10
ports/cef/string.rs
View file

@ -3,8 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use encoding::{Encoding, EncodeStrict};
use encoding::all::{UTF_16LE};
use eutil::fptr_is_null;
use libc::{size_t, c_int, c_ushort,c_void};
use libc::types::os::arch::c95::wchar_t;
@ -13,6 +11,7 @@ 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};
@ -97,9 +96,10 @@ 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 {
let result = UTF_16LE.encode(string::raw::from_buf_len(src, src_len as uint).as_slice(), EncodeStrict);
if result.is_err() { return 0; }
cef_string_utf16_set(mem::transmute(result.unwrap().as_slice().as_ptr()), (src_len * 2) as size_t, output, 1);
slice::raw::buf_as_slice(src, src_len as uint, |result| {
let enc = str::from_utf8(result).unwrap().utf16_units().collect::<Vec<u16>>();
cef_string_utf16_set(enc.as_ptr(), (src_len * 2) as size_t, output, 1);
});
}
1
}