diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-08-31 16:30:56 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-31 16:30:56 -0500 |
commit | bbfe38e35f3f6a51009c0411647c89c8b5616357 (patch) | |
tree | 476902937c71de85c89dd63a879a7e2609616b83 /components/script/layout_wrapper.rs | |
parent | 23adba02426852184167a1a603293707f3517ddd (diff) | |
parent | 95033e1c0d672cc52c85092fcd0f4398ee896f30 (diff) | |
download | servo-bbfe38e35f3f6a51009c0411647c89c8b5616357.tar.gz servo-bbfe38e35f3f6a51009c0411647c89c8b5616357.zip |
Auto merge of #13134 - servo:archery, r=emilio
Add lots of Arc’s in style, and prepare for using DOMRefCell
<!-- Please describe your changes on the following line: -->
`DOMRefCell` usage is not there year because of thread-safety questions, but I have this much already that I’d like to land before it bitrots.
r? @emilio
---
<!-- 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
- [x] These changes do not require new tests because refactor
<!-- 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/13134)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/layout_wrapper.rs')
-rw-r--r-- | components/script/layout_wrapper.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index 4edd821ad0b..a7f0a5019f3 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -459,9 +459,9 @@ impl<'le> TElement for ServoLayoutElement<'le> { ServoLayoutNode::from_layout_js(self.element.upcast()) } - fn style_attribute(&self) -> &Option<PropertyDeclarationBlock> { + fn style_attribute(&self) -> Option<&Arc<PropertyDeclarationBlock>> { unsafe { - &*self.element.style_attribute() + (*self.element.style_attribute()).as_ref() } } |