From af448374f9a177046d3c119333f757a60f3aa502 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Oct 2015 15:54:20 +0200 Subject: [PATCH] Remove pointless join_layout calls. Code on the script thread can only observe self.layout_join_port being Some() between the time it is set in force_reflow, and the join_layout call later in that function, and no significant code is called in that code. As join_layout does nothing when called if self.layout_join_port is None, these two calls are useless. --- components/script/dom/window.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 5906a28cb99..d6c1201106e 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -1009,7 +1009,6 @@ impl Window { self.reflow(ReflowGoal::ForScriptQuery, ReflowQueryType::ContentBoxQuery(content_box_request), ReflowReason::Query); - self.join_layout(); //FIXME: is this necessary, or is layout_rpc's mutex good enough? let ContentBoxResponse(rect) = self.layout_rpc.content_box(); rect } @@ -1018,7 +1017,6 @@ impl Window { self.reflow(ReflowGoal::ForScriptQuery, ReflowQueryType::ContentBoxesQuery(content_boxes_request), ReflowReason::Query); - self.join_layout(); //FIXME: is this necessary, or is layout_rpc's mutex good enough? let ContentBoxesResponse(rects) = self.layout_rpc.content_boxes(); rects }