mirror of
https://github.com/servo/servo.git
synced 2025-08-10 16:05:43 +01:00
Auto merge of #16199 - Manishearth:stylo-td-content, r=bz
stylo: Include content rules from HTMLTableCellElement::WalkContentStyleRules This also removes the TABLE_ATTRS_DIRTY optimization. Constructing nsMappedAttributes isn't really expensive and we do it all the time anyway. r=bz https://bugzilla.mozilla.org/show_bug.cgi?id=1341648 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16199) <!-- Reviewable:end -->
This commit is contained in:
commit
6519503a5f
2 changed files with 12 additions and 0 deletions
|
@ -33,6 +33,7 @@ use gecko_bindings::bindings::Gecko_ClassOrClassList;
|
||||||
use gecko_bindings::bindings::Gecko_ElementHasAnimations;
|
use gecko_bindings::bindings::Gecko_ElementHasAnimations;
|
||||||
use gecko_bindings::bindings::Gecko_ElementHasCSSAnimations;
|
use gecko_bindings::bindings::Gecko_ElementHasCSSAnimations;
|
||||||
use gecko_bindings::bindings::Gecko_GetAnimationRule;
|
use gecko_bindings::bindings::Gecko_GetAnimationRule;
|
||||||
|
use gecko_bindings::bindings::Gecko_GetExtraContentStyleDeclarations;
|
||||||
use gecko_bindings::bindings::Gecko_GetHTMLPresentationAttrDeclarationBlock;
|
use gecko_bindings::bindings::Gecko_GetHTMLPresentationAttrDeclarationBlock;
|
||||||
use gecko_bindings::bindings::Gecko_GetStyleAttrDeclarationBlock;
|
use gecko_bindings::bindings::Gecko_GetStyleAttrDeclarationBlock;
|
||||||
use gecko_bindings::bindings::Gecko_GetStyleContext;
|
use gecko_bindings::bindings::Gecko_GetStyleContext;
|
||||||
|
@ -618,6 +619,13 @@ impl<'le> PresentationalHintsSynthetizer for GeckoElement<'le> {
|
||||||
ApplicableDeclarationBlock::from_declarations(Clone::clone(decl), ServoCascadeLevel::PresHints)
|
ApplicableDeclarationBlock::from_declarations(Clone::clone(decl), ServoCascadeLevel::PresHints)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
let declarations = unsafe { Gecko_GetExtraContentStyleDeclarations(self.0) };
|
||||||
|
let declarations = declarations.and_then(|s| s.as_arc_opt());
|
||||||
|
if let Some(decl) = declarations {
|
||||||
|
hints.push(
|
||||||
|
ApplicableDeclarationBlock::from_declarations(Clone::clone(decl), ServoCascadeLevel::PresHints)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -596,6 +596,10 @@ extern "C" {
|
||||||
RawGeckoElementBorrowed)
|
RawGeckoElementBorrowed)
|
||||||
-> RawServoDeclarationBlockStrongBorrowedOrNull;
|
-> RawServoDeclarationBlockStrongBorrowedOrNull;
|
||||||
}
|
}
|
||||||
|
extern "C" {
|
||||||
|
pub fn Gecko_GetExtraContentStyleDeclarations(element: RawGeckoElementBorrowed)
|
||||||
|
-> RawServoDeclarationBlockStrongBorrowedOrNull;
|
||||||
|
}
|
||||||
extern "C" {
|
extern "C" {
|
||||||
pub fn Gecko_GetAnimationRule(aElement: RawGeckoElementBorrowed,
|
pub fn Gecko_GetAnimationRule(aElement: RawGeckoElementBorrowed,
|
||||||
aPseudoTag: *mut nsIAtom,
|
aPseudoTag: *mut nsIAtom,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue