diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-08-10 21:02:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-10 21:02:30 -0500 |
commit | 1b2450339c40dbcb65e94a346ea434d45f0edf90 (patch) | |
tree | 5678ca02c5ed91097d523ab523c623bf6fef3408 /components/script | |
parent | 3c7de6b82165d251e37f699d8f724fba0a0f4556 (diff) | |
parent | 9b8eac000f86badbd0224d1cb5b183c091fe7c1b (diff) | |
download | servo-1b2450339c40dbcb65e94a346ea434d45f0edf90.tar.gz servo-1b2450339c40dbcb65e94a346ea434d45f0edf90.zip |
Auto merge of #12757 - emilio:stylo, r=bholley,pcwalton
stylo: Stop restyling display: none elements, remove the has_changed hack that made us use ReconstructFrame unconditionally.
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
r? @bholley
<!-- 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/12757)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/layout_wrapper.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index d4518b015e8..c13db423982 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -61,7 +61,7 @@ use style::dom::{PresentationalHintsSynthetizer, OpaqueNode, TDocument, TElement use style::element_state::*; use style::properties::{ComputedValues, PropertyDeclaration, PropertyDeclarationBlock}; use style::refcell::{Ref, RefCell, RefMut}; -use style::selector_impl::{ElementSnapshot, NonTSPseudoClass, ServoSelectorImpl}; +use style::selector_impl::{ElementSnapshot, NonTSPseudoClass, PseudoElement, ServoSelectorImpl}; use style::sink::Push; use style::str::is_whitespace; use url::Url; @@ -266,7 +266,8 @@ impl<'ln> TNode for ServoLayoutNode<'ln> { #[inline] fn existing_style_for_restyle_damage<'a>(&'a self, - current_cv: Option<&'a Arc<ComputedValues>>) + current_cv: Option<&'a Arc<ComputedValues>>, + _pseudo_element: Option<&PseudoElement>) -> Option<&'a Arc<ComputedValues>> { current_cv } |