diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-05 18:55:36 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-05 18:55:36 -0700 |
commit | abdf2f28a0bd25a76a31b4fd2410c7a87448ed54 (patch) | |
tree | 762287ff3121993d51e3741e84a2a99ac93435ce /components/layout | |
parent | 3d557b6f25eb9dbd084cb53bbc9a9cf93bad825b (diff) | |
parent | 187a47d89d2a4187abca85690429f85293e618cd (diff) | |
download | servo-abdf2f28a0bd25a76a31b4fd2410c7a87448ed54.tar.gz servo-abdf2f28a0bd25a76a31b4fd2410c7a87448ed54.zip |
Auto merge of #11886 - bholley:attr_refactor, r=SimonSapin
Refactor attribute handling to avoid marshalling attributes from Gecko into Servo
This marshaling is slow, because Gecko stores attributes as UTF-16 and does not atomize them in all cases, and it turns out that the need for them in Servo is pretty minimal. With some refactoring across servo and rust-selectors we can fix this.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11886)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout')
-rw-r--r-- | components/layout/Cargo.toml | 2 | ||||
-rw-r--r-- | components/layout/traversal.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 188b39e9207..05f9fcda82c 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -31,7 +31,7 @@ range = {path = "../range"} rustc-serialize = "0.3" script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} -selectors = {version = "0.6", features = ["heap_size"]} +selectors = {version = "0.7", features = ["heap_size"]} serde_macros = "0.7.11" smallvec = "0.1" string_cache = {version = "0.2.20", features = ["heap_size"]} diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 5db766f68b5..581fee5e03d 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -28,7 +28,7 @@ pub struct RecalcStyleAndConstructFlows<'lc> { impl<'lc, N> DomTraversalContext<N> for RecalcStyleAndConstructFlows<'lc> where N: LayoutNode + TNode<ConcreteComputedValues=ServoComputedValues>, - N::ConcreteElement: ::selectors::Element<Impl=ServoSelectorImpl> + N::ConcreteElement: ::selectors::Element<Impl=ServoSelectorImpl, AttrString=String> { type SharedContext = SharedLayoutContext; |