aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2014-10-06 18:24:32 -0600
committerbors-servo <metajack+bors@gmail.com>2014-10-06 18:24:32 -0600
commit0549ed3c675d1cc7a8832128e90b7886e3c1710c (patch)
treea5e33be29ec8ea0a24b4a623c657ae1a1d48e894
parent1aa13bb31f0f1fbd8a7ac663634a222903681af9 (diff)
parent54f9bb0eead883a5b2616f5eeaf00eefe372ca21 (diff)
downloadservo-0549ed3c675d1cc7a8832128e90b7886e3c1710c.tar.gz
servo-0549ed3c675d1cc7a8832128e90b7886e3c1710c.zip
auto merge of #3593 : zwarich/servo/compositor-cleanup, r=mrobinson
-rw-r--r--components/compositing/compositor.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index b751ef1d2c6..954fc072d4b 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -314,13 +314,11 @@ impl IOCompositor {
chan.send(Some(azure_hl::current_graphics_metadata()));
}
- (Ok(CreateOrUpdateRootLayer(layer_properties)),
- NotShuttingDown) => {
+ (Ok(CreateOrUpdateRootLayer(layer_properties)), NotShuttingDown) => {
self.create_or_update_root_layer(layer_properties);
}
- (Ok(CreateOrUpdateDescendantLayer(layer_properties)),
- NotShuttingDown) => {
+ (Ok(CreateOrUpdateDescendantLayer(layer_properties)), NotShuttingDown) => {
self.create_or_update_descendant_layer(layer_properties);
}