aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/query.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-05-19 12:38:26 -0700
committerbors-servo <lbergstrom+bors@mozilla.com>2016-05-19 12:38:26 -0700
commit27c25e859a45c3d79c85e96b85ec5226a3231e10 (patch)
treeb791aaf1184a1223f27c36bacb10ea35f6dcf494 /components/layout/query.rs
parent5bf28491605096e85c6170a7c419e3f8077715bc (diff)
parentcc2b2b50a74515700b6cae88c66e734312d1fdbb (diff)
downloadservo-27c25e859a45c3d79c85e96b85ec5226a3231e10.tar.gz
servo-27c25e859a45c3d79c85e96b85ec5226a3231e10.zip
Auto merge of #11270 - servo:ConstellationChan, r=asajeffrey
Remove ConstellationChan. 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 --faster` 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 _____ Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. It's a pointless abstraction that propagates the obsolete chan terminology, swaps the order in which the sender and receiver are returned, and hides a source of panics. <!-- 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/11270) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout/query.rs')
-rw-r--r--components/layout/query.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/components/layout/query.rs b/components/layout/query.rs
index 6e49b397e8d..162a7642724 100644
--- a/components/layout/query.rs
+++ b/components/layout/query.rs
@@ -15,7 +15,6 @@ use fragment::{Fragment, FragmentBorderBoxIterator, SpecificFragmentInfo};
use gfx::display_list::OpaqueNode;
use gfx_traits::{LayerId};
use layout_thread::LayoutThreadData;
-use msg::constellation_msg::ConstellationChan;
use opaque_node::OpaqueNodeMethods;
use script::layout_interface::{ContentBoxResponse, NodeOverflowResponse, ContentBoxesResponse, NodeGeometryResponse};
use script::layout_interface::{HitTestResponse, LayoutRPC, OffsetParentResponse, NodeLayerIdResponse};
@@ -79,8 +78,7 @@ impl LayoutRPC for LayoutRPCImpl {
None => Cursor::DefaultCursor,
Some(dim) => dim.pointing.unwrap(),
};
- let ConstellationChan(ref constellation_chan) = rw_data.constellation_chan;
- constellation_chan.send(ConstellationMsg::SetCursor(cursor)).unwrap();
+ rw_data.constellation_chan.send(ConstellationMsg::SetCursor(cursor)).unwrap();
}
HitTestResponse {
node_address: result.map(|dim| dim.node.to_untrusted_node_address()),