Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove some use of FFI in gecko_string_cache

Browse source 
Now that nsIAtom’s mLength and mString can both be accessed
directly on the struct, fewer operations need to call into C++ code.
This commit is contained in:
Simon Sapin 2016-08-17 15:43:12 +02:00
parent f4f212fd18
commit e6b8eda8f3
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ports/geckolib/string_cache/lib.rs
View file

@ -10,15 +10,14 @@ extern crate selectors;
extern crate serde; extern crate serde;
use gecko_bindings::bindings::Gecko_AddRefAtom; use gecko_bindings::bindings::Gecko_AddRefAtom;
use gecko_bindings::bindings::Gecko_AtomEqualsUTF8IgnoreCase;
use gecko_bindings::bindings::Gecko_Atomize; use gecko_bindings::bindings::Gecko_Atomize;
use gecko_bindings::bindings::Gecko_GetAtomAsUTF16;
use gecko_bindings::bindings::Gecko_ReleaseAtom; use gecko_bindings::bindings::Gecko_ReleaseAtom;
use gecko_bindings::structs::nsIAtom; use gecko_bindings::structs::nsIAtom;
use heapsize::HeapSizeOf; use heapsize::HeapSizeOf;
use selectors::bloom::BloomHash; use selectors::bloom::BloomHash;
use selectors::parser::FromCowStr; use selectors::parser::FromCowStr;
use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::{Deserialize, Deserializer, Serialize, Serializer};
use std::ascii::AsciiExt;
use std::borrow::{Cow, Borrow}; use std::borrow::{Cow, Borrow};
use std::char::{self, DecodeUtf16}; use std::char::{self, DecodeUtf16};
use std::fmt; use std::fmt;
@ -96,9 +95,7 @@ impl WeakAtom {
pub fn as_slice(&self) -> &[u16] { pub fn as_slice(&self) -> &[u16] {
unsafe { unsafe {
let mut len = 0; slice::from_raw_parts((*self.as_ptr()).mString, self.len() as usize)
let ptr = Gecko_GetAtomAsUTF16(self.as_ptr(), &mut len);
slice::from_raw_parts(ptr, len as usize)
} }
} }
@ -118,9 +115,10 @@ impl WeakAtom {
#[inline] #[inline]
pub fn eq_str_ignore_ascii_case(&self, s: &str) -> bool { pub fn eq_str_ignore_ascii_case(&self, s: &str) -> bool {
unsafe { self.chars().map(|r| match r {
Gecko_AtomEqualsUTF8IgnoreCase(self.as_ptr(), s.as_ptr() as *const _, s.len() as u32) Ok(c) => c.to_ascii_lowercase() as u32,
} Err(e) => e.unpaired_surrogate() as u32,
}).eq(s.chars().map(|c| c.to_ascii_lowercase() as u32))
} }
#[inline] #[inline]