Skip to content

Commit

Permalink
Auto merge of #16199 - Manishearth:stylo-td-content, r=bz
Browse files Browse the repository at this point in the history
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 -->
  • Loading branch information
bors-servo committed Mar 31, 2017
2 parents 04d12fa + bfc2cc4 commit 6519503
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
8 changes: 8 additions & 0 deletions components/style/gecko/wrapper.rs
Expand Up @@ -33,6 +33,7 @@ use gecko_bindings::bindings::Gecko_ClassOrClassList;
use gecko_bindings::bindings::Gecko_ElementHasAnimations;
use gecko_bindings::bindings::Gecko_ElementHasCSSAnimations;
use gecko_bindings::bindings::Gecko_GetAnimationRule;
use gecko_bindings::bindings::Gecko_GetExtraContentStyleDeclarations;
use gecko_bindings::bindings::Gecko_GetHTMLPresentationAttrDeclarationBlock;
use gecko_bindings::bindings::Gecko_GetStyleAttrDeclarationBlock;
use gecko_bindings::bindings::Gecko_GetStyleContext;
Expand Down Expand Up @@ -618,6 +619,13 @@ impl<'le> PresentationalHintsSynthetizer for GeckoElement<'le> {
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)
);
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions components/style/gecko_bindings/bindings.rs
Expand Up @@ -596,6 +596,10 @@ extern "C" {
RawGeckoElementBorrowed)
-> RawServoDeclarationBlockStrongBorrowedOrNull;
}
extern "C" {
pub fn Gecko_GetExtraContentStyleDeclarations(element: RawGeckoElementBorrowed)
-> RawServoDeclarationBlockStrongBorrowedOrNull;
}
extern "C" {
pub fn Gecko_GetAnimationRule(aElement: RawGeckoElementBorrowed,
aPseudoTag: *mut nsIAtom,
Expand Down

0 comments on commit 6519503

Please sign in to comment.