From 0396cdb1c5e721bc7ff9bc26e15770effcf9c61c Mon Sep 17 00:00:00 2001 From: Cameron Zwarich Date: Mon, 7 Jul 2014 16:16:42 -0700 Subject: [PATCH] Rename find_child_with_layer_and_pipeline_id Rename find_child_with_layer_and_pipeline_id to find_child_with_pipeline_and_layer_id so that it matches both the logical and actual parameter ordering. --- src/components/compositing/compositor_data.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/compositing/compositor_data.rs b/src/components/compositing/compositor_data.rs index 61b9298dc90..66f8cde0754 100644 --- a/src/components/compositing/compositor_data.rs +++ b/src/components/compositing/compositor_data.rs @@ -409,7 +409,7 @@ impl CompositorData { new_rect: Rect) -> bool { debug!("compositor_data: starting set_clipping_rect()"); - match CompositorData::find_child_with_layer_and_pipeline_id(layer.clone(), + match CompositorData::find_child_with_pipeline_and_layer_id(layer.clone(), pipeline_id, layer_id) { Some(child_node) => { @@ -561,7 +561,7 @@ impl CompositorData { - fn find_child_with_layer_and_pipeline_id(layer: Rc>, + fn find_child_with_pipeline_and_layer_id(layer: Rc>, pipeline_id: PipelineId, layer_id: LayerId) -> Option>> { @@ -604,7 +604,7 @@ impl CompositorData { -> bool { debug!("compositor_data: starting resize_helper()"); - let found = match CompositorData::find_child_with_layer_and_pipeline_id(layer.clone(), + let found = match CompositorData::find_child_with_pipeline_and_layer_id(layer.clone(), pipeline_id, layer_id) { Some(child) => {