diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-27 10:26:23 -0500 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-27 10:26:23 -0500 |
commit | d160f8cb8037db0f4fa0b592d5f59162c1428494 (patch) | |
tree | e68a275d8ad7ac3b8c9e2e6ec8c9b421aa1e8ee7 /components/script/dom/node.rs | |
parent | 3ab5c075595f6bffe3062e26d91f4837fedbf19c (diff) | |
parent | e94f3d4fe056a12d561fbdee7e0af26ba738389c (diff) | |
download | servo-d160f8cb8037db0f4fa0b592d5f59162c1428494.tar.gz servo-d160f8cb8037db0f4fa0b592d5f59162c1428494.zip |
Auto merge of #11463 - Ms2ger:LayoutChan, r=nox
Remove the LayoutChan type.
<!-- 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 tests because refactoring
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
It is a pointless abstraction.
<!-- 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/11463)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r-- | components/script/dom/node.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 711e0ba740c..b7f78eb9aa0 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -54,7 +54,7 @@ use euclid::size::Size2D; use heapsize::{HeapSizeOf, heap_size_of}; use html5ever::tree_builder::QuirksMode; use js::jsapi::{JSContext, JSObject, JSRuntime}; -use layout_interface::{LayoutChan, Msg}; +use layout_interface::Msg; use libc::{self, c_void, uintptr_t}; use parse::html::parse_html_fragment; use ref_slice::ref_slice; @@ -195,9 +195,8 @@ impl OpaqueStyleAndLayoutData { pub fn dispose(self, node: &Node) { debug_assert!(thread_state::get().is_script()); let win = window_from_node(node); - let LayoutChan(ref chan) = *win.layout_chan(); node.style_and_layout_data.set(None); - chan.send(Msg::ReapStyleAndLayoutData(self)).unwrap(); + win.layout_chan().send(Msg::ReapStyleAndLayoutData(self)).unwrap(); } } |