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

Parse ServoBindings.h as C++.

Browse source 
This allows us to remove the bool-as-int contortions we were doing before.
This commit is contained in:
Bobby Holley 2016-03-02 20:34:23 -08:00
parent 23ace489b9
commit dbbbebd664
4 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ports/geckolib/bindings.rs
View file

@ -28,15 +28,18 @@ pub type intptr_t = int64_t;
pub type uintptr_t = uint64_t; pub type uintptr_t = uint64_t;
pub type intmax_t = ::libc::c_long; pub type intmax_t = ::libc::c_long;
pub type uintmax_t = ::libc::c_ulong; pub type uintmax_t = ::libc::c_ulong;
pub enum RawGeckoNode { } pub enum nsINode { }
pub enum RawGeckoElement { } pub type RawGeckoNode = nsINode;
pub enum RawGeckoDocument { } pub enum Element { }
pub type RawGeckoElement = Element;
pub enum nsIDocument { }
pub type RawGeckoDocument = nsIDocument;
pub enum ServoNodeData { } pub enum ServoNodeData { }
pub enum RawServoStyleSheet { } pub enum RawServoStyleSheet { }
pub enum RawServoStyleSet { } pub enum RawServoStyleSet { }
extern "C" { extern "C" {
pub fn Gecko_ChildrenCount(node: *mut RawGeckoNode) -> uint32_t; pub fn Gecko_ChildrenCount(node: *mut RawGeckoNode) -> uint32_t;
pub fn Gecko_NodeIsElement(node: *mut RawGeckoNode) -> i32; pub fn Gecko_NodeIsElement(node: *mut RawGeckoNode) -> bool;
pub fn Gecko_GetParentNode(node: *mut RawGeckoNode) -> *mut RawGeckoNode; pub fn Gecko_GetParentNode(node: *mut RawGeckoNode) -> *mut RawGeckoNode;
pub fn Gecko_GetFirstChild(node: *mut RawGeckoNode) -> *mut RawGeckoNode; pub fn Gecko_GetFirstChild(node: *mut RawGeckoNode) -> *mut RawGeckoNode;
pub fn Gecko_GetLastChild(node: *mut RawGeckoNode) -> *mut RawGeckoNode; pub fn Gecko_GetLastChild(node: *mut RawGeckoNode) -> *mut RawGeckoNode;
@ -56,12 +59,12 @@ extern "C" {
-> *mut RawGeckoElement; -> *mut RawGeckoElement;
pub fn Gecko_ElementState(element: *mut RawGeckoElement) -> uint8_t; pub fn Gecko_ElementState(element: *mut RawGeckoElement) -> uint8_t;
pub fn Gecko_IsHTMLElementInHTMLDocument(element: *mut RawGeckoElement) pub fn Gecko_IsHTMLElementInHTMLDocument(element: *mut RawGeckoElement)
-> i32; -> bool;
pub fn Gecko_IsLink(element: *mut RawGeckoElement) -> i32; pub fn Gecko_IsLink(element: *mut RawGeckoElement) -> bool;
pub fn Gecko_IsTextNode(node: *mut RawGeckoNode) -> i32; pub fn Gecko_IsTextNode(node: *mut RawGeckoNode) -> bool;
pub fn Gecko_IsVisitedLink(element: *mut RawGeckoElement) -> i32; pub fn Gecko_IsVisitedLink(element: *mut RawGeckoElement) -> bool;
pub fn Gecko_IsUnvisitedLink(element: *mut RawGeckoElement) -> i32; pub fn Gecko_IsUnvisitedLink(element: *mut RawGeckoElement) -> bool;
pub fn Gecko_IsRootElement(element: *mut RawGeckoElement) -> i32; pub fn Gecko_IsRootElement(element: *mut RawGeckoElement) -> bool;
pub fn Gecko_GetNodeData(node: *mut RawGeckoNode) -> *mut ServoNodeData; pub fn Gecko_GetNodeData(node: *mut RawGeckoNode) -> *mut ServoNodeData;
pub fn Gecko_SetNodeData(node: *mut RawGeckoNode, pub fn Gecko_SetNodeData(node: *mut RawGeckoNode,
data: *mut ServoNodeData); data: *mut ServoNodeData);
@ -76,7 +79,7 @@ extern "C" {
set: *mut RawServoStyleSet); set: *mut RawServoStyleSet);
pub fn Servo_RemoveStyleSheet(sheet: *mut RawServoStyleSheet, pub fn Servo_RemoveStyleSheet(sheet: *mut RawServoStyleSheet,
set: *mut RawServoStyleSet); set: *mut RawServoStyleSet);
pub fn Servo_StyleSheetHasRules(sheet: *mut RawServoStyleSheet) -> i32; pub fn Servo_StyleSheetHasRules(sheet: *mut RawServoStyleSheet) -> bool;
pub fn Servo_InitStyleSet() -> *mut RawServoStyleSet; pub fn Servo_InitStyleSet() -> *mut RawServoStyleSet;
pub fn Servo_DropStyleSet(set: *mut RawServoStyleSet); pub fn Servo_DropStyleSet(set: *mut RawServoStyleSet);
pub fn Gecko_GetAttrAsUTF8(element: *mut RawGeckoElement, pub fn Gecko_GetAttrAsUTF8(element: *mut RawGeckoElement,

4
ports/geckolib/glue.rs
View file

@ -127,8 +127,8 @@ pub extern "C" fn Servo_RemoveStyleSheet(raw_sheet: *mut RawServoStyleSheet,
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_StyleSheetHasRules(raw_sheet: *mut RawServoStyleSheet) -> ::libc::c_int { pub extern "C" fn Servo_StyleSheetHasRules(raw_sheet: *mut RawServoStyleSheet) -> bool {
with_arc_stylesheet(raw_sheet, |sheet| if sheet.rules.is_empty() { 0 } else { 1 }) with_arc_stylesheet(raw_sheet, |sheet| !sheet.rules.is_empty())
} }

2
ports/geckolib/tools/regen_bindings.sh
View file

@ -30,4 +30,4 @@ fi
# library in DYLD_LIBRARY_PATH. # library in DYLD_LIBRARY_PATH.
# #
# /Applications/Xcode.app/Contents/Developer/usr/bin/lldb -- # /Applications/Xcode.app/Contents/Developer/usr/bin/lldb --
./rust-bindgen/target/debug/bindgen -I$DIST_INCLUDE -o ../bindings.rs $DIST_INCLUDE/mozilla/ServoBindings.h ./rust-bindgen/target/debug/bindgen -x c++ -std=gnu++0x -I$DIST_INCLUDE -o ../bindings.rs $DIST_INCLUDE/mozilla/ServoBindings.h

14
ports/geckolib/wrapper.rs
View file

@ -103,13 +103,13 @@ impl<'ln> TNode<'ln> for GeckoNode<'ln> {
fn is_text_node(&self) -> bool { fn is_text_node(&self) -> bool {
unsafe { unsafe {
Gecko_IsTextNode(self.node) != 0 Gecko_IsTextNode(self.node)
} }
} }
fn is_element(&self) -> bool { fn is_element(&self) -> bool {
unsafe { unsafe {
Gecko_NodeIsElement(self.node) != 0 Gecko_NodeIsElement(self.node)
} }
} }
@ -392,7 +392,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
fn is_root(&self) -> bool { fn is_root(&self) -> bool {
unsafe { unsafe {
Gecko_IsRootElement(self.element) != 0 Gecko_IsRootElement(self.element)
} }
} }
@ -425,9 +425,9 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
fn match_non_ts_pseudo_class(&self, pseudo_class: NonTSPseudoClass) -> bool { fn match_non_ts_pseudo_class(&self, pseudo_class: NonTSPseudoClass) -> bool {
match pseudo_class { match pseudo_class {
// https://github.com/servo/servo/issues/8718 // https://github.com/servo/servo/issues/8718
NonTSPseudoClass::AnyLink => unsafe { Gecko_IsLink(self.element) != 0 }, NonTSPseudoClass::AnyLink => unsafe { Gecko_IsLink(self.element) },
NonTSPseudoClass::Link => unsafe { Gecko_IsUnvisitedLink(self.element) != 0 }, NonTSPseudoClass::Link => unsafe { Gecko_IsUnvisitedLink(self.element) },
NonTSPseudoClass::Visited => unsafe { Gecko_IsVisitedLink(self.element) != 0 }, NonTSPseudoClass::Visited => unsafe { Gecko_IsVisitedLink(self.element) },
NonTSPseudoClass::Active | NonTSPseudoClass::Active |
NonTSPseudoClass::Focus | NonTSPseudoClass::Focus |
NonTSPseudoClass::Hover | NonTSPseudoClass::Hover |
@ -480,7 +480,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
fn is_html_element_in_html_document(&self) -> bool { fn is_html_element_in_html_document(&self) -> bool {
unsafe { unsafe {
Gecko_IsHTMLElementInHTMLDocument(self.element) != 0 Gecko_IsHTMLElementInHTMLDocument(self.element)
} }
} }
} }