Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

stylo: Fix MightHave{State,Attribute}Dependency for XBL.

Browse source 
Bug: 1375969
Reviewed-By: heycam
MozReview-Commit-ID: 8I29pMHq4uf
This commit is contained in:
Emilio Cobos Álvarez 2017-06-27 22:18:02 -07:00
parent f8346e598e
commit 9558d2d918
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 48 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/gecko/generated/bindings.rs
View file

@ -1936,12 +1936,15 @@ extern "C" {
extern "C" {
pub fn Servo_StyleSet_MightHaveAttributeDependency(set:
RawServoStyleSetBorrowed,
element:
RawGeckoElementBorrowed,
local_name:
*mut nsIAtom)
-> bool;
}
extern "C" {
pub fn Servo_StyleSet_HasStateDependency(set: RawServoStyleSetBorrowed,
element: RawGeckoElementBorrowed,
state: u64) -> bool;
}
extern "C" {

51
ports/geckolib/glue.rs
View file

@ -3171,17 +3171,56 @@ pub extern "C" fn Servo_StyleSet_ResolveForDeclarations(raw_data: RawServoStyleS
}
#[no_mangle]
pub extern "C" fn Servo_StyleSet_MightHaveAttributeDependency(raw_data: RawServoStyleSetBorrowed,
local_name: *mut nsIAtom) -> bool {
pub extern "C" fn Servo_StyleSet_MightHaveAttributeDependency(
raw_data: RawServoStyleSetBorrowed,
element: RawGeckoElementBorrowed,
local_name: *mut nsIAtom,
) -> bool {
let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
unsafe { Atom::with(local_name, |atom| data.stylist.might_have_attribute_dependency(atom)) }
let element = GeckoElement(element);
let mut has_dep = false;
unsafe {
Atom::with(local_name, |atom| {
has_dep = data.stylist.might_have_attribute_dependency(atom);
if !has_dep {
// TODO(emilio): Consider optimizing this storing attribute
// dependencies from UA sheets separately, so we could optimize
// the above lookup if cut_off_inheritance is true.
element.each_xbl_stylist(|stylist| {
has_dep =
has_dep || stylist.might_have_attribute_dependency(atom);
});
}
})
}
has_dep
}
#[no_mangle]
pub extern "C" fn Servo_StyleSet_HasStateDependency(raw_data: RawServoStyleSetBorrowed,
state: u64) -> bool {
pub extern "C" fn Servo_StyleSet_HasStateDependency(
raw_data: RawServoStyleSetBorrowed,
element: RawGeckoElementBorrowed,
state: u64,
) -> bool {
let element = GeckoElement(element);
let state = ElementState::from_bits_truncate(state);
let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
data.stylist.might_have_state_dependency(ElementState::from_bits_truncate(state))
let mut has_dep = data.stylist.might_have_state_dependency(state);
if !has_dep {
// TODO(emilio): Consider optimizing this storing attribute
// dependencies from UA sheets separately, so we could optimize
// the above lookup if cut_off_inheritance is true.
element.each_xbl_stylist(|stylist| {
has_dep = has_dep || stylist.might_have_state_dependency(state);
});
}
has_dep
}
#[no_mangle]