diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-15 18:04:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-15 18:04:59 -0500 |
commit | 5bd6b92494d6b9527c1639c358eea3c4822bed84 (patch) | |
tree | f5059ca69b9ac378b63d5ba03e8f70c73a9702c1 /components/layout/construct.rs | |
parent | a51da06dd9c680a7e3f49247181d49a48a787f47 (diff) | |
parent | cc67f37d4e02cf3f0303985300e952238b5d97a6 (diff) | |
download | servo-5bd6b92494d6b9527c1639c358eea3c4822bed84.tar.gz servo-5bd6b92494d6b9527c1639c358eea3c4822bed84.zip |
Auto merge of #16862 - CJKu:bug-1310885-part-6, r=heycam
stylo: Pass Cached ImageValue from stylo back to gecko
<!-- Please describe your changes on the following line: -->
This is part 6 ~ part 9 patch in bug 1310885
gecko bug link:
https://bugzilla.mozilla.org/show_bug.cgi?id=1310885
---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/16862)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/construct.rs')
-rw-r--r-- | components/layout/construct.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 2f24629b5e4..a3b062a5f4b 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -53,6 +53,7 @@ use style::computed_values::position; use style::context::SharedStyleContext; use style::logical_geometry::Direction; use style::properties::ServoComputedValues; +use style::properties::longhands::list_style_image; use style::selector_parser::{PseudoElement, RestyleDamage}; use style::servo::restyle_damage::{BUBBLE_ISIZES, RECONSTRUCT_FLOW}; use style::values::Either; @@ -1206,13 +1207,13 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> -> ConstructionResult { let flotation = FloatKind::from_property(flotation); let marker_fragments = match node.style(self.style_context()).get_list().list_style_image { - Either::First(ref url_value) => { + list_style_image::computed_value::T(Either::First(ref url_value)) => { let image_info = box ImageFragmentInfo::new(url_value.url().map(|u| u.clone()), node, &self.layout_context); vec![Fragment::new(node, SpecificFragmentInfo::Image(image_info), self.layout_context)] } - Either::Second(_none) => { + list_style_image::computed_value::T(Either::Second(_none)) => { match ListStyleTypeContent::from_list_style_type(node.style(self.style_context()) .get_list() .list_style_type) { |