whitespace changes to clean up mach test-tidy

components/gfx/display_list/mod.rs

@@ -553,8 +553,8 @@ impl DisplayItem {
                         bounds.origin.x = bounds.origin.x + x_offset;
                         bounds.origin.y = bounds.origin.y + y_offset;
                         bounds.size = image_item.stretch_size;
-			//ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-			println!("Bounds is {} and image_item.image.clone() is {} ", bounds, image_item.stretch_size);//, source_format);
+            //ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+            println!("Bounds is {} and image_item.image.clone() is {} ", bounds, image_item.stretch_size);//, source_format);
                         render_context.draw_image(bounds, image_item.image.clone());
 
                         x_offset = x_offset + image_item.stretch_size.width;

components/gfx/render_context.rs

@@ -112,34 +112,34 @@ impl<'a> RenderContext<'a>  {
     }
 
     pub fn draw_image(&self, bounds: Rect<Au>, image: Arc<Box<DynamicImage>>) {
-	let (image_width, image_height) = image.dimensions();
-	//ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-	println!("Height is {} and width is {}", image_height, image_width);
+    let (image_width, image_height) = image.dimensions();
+    //ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+    println!("Height is {} and width is {}", image_height, image_width);
         let size = Size2D(image_width as i32, image_height as i32);
-	//ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-	println!("Size is {}", size);
-	let raw_pixels = image.raw_pixels();
-	//let option_img_pixels = image.as_rgb8();
-	//let img_pixels = match option_img_pixels {
-        //	Some(pixels) => pixels,
-        //	None => {return;}
-	//};
-	//ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-	println!("Color is {}", image.color().to_string());
+    //ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+    println!("Size is {}", size);
+    let raw_pixels = image.raw_pixels();
+    //let option_img_pixels = image.as_rgb8();
+    //let img_pixels = match option_img_pixels {
+        //    Some(pixels) => pixels,
+        //    None => {return;}
+    //};
+    //ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+    println!("Color is {}", image.color().to_string());
         let (pixel_width, pixels, source_format) = match image.color() {
             RGBA(_) => (4, raw_pixels.as_slice(), B8G8R8A8),
             Grey(_) => (1, raw_pixels.as_slice(), A8),
             RGB(_) => (3, raw_pixels.as_slice(), B8G8R8X8),
             GreyA(_) => (2, raw_pixels.as_slice(), A8),
-	    Palette(_) => panic!("Palette color type not supported"),
+        Palette(_) => panic!("Palette color type not supported"),
         };
         let stride = image_width * pixel_width;
-	//ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ	
-	println!("pixel_width is {}", pixel_width);
-	println!("Stride is {} and first 200 pixels are:", stride);
-	for e in range(0i as uint, 200i as uint) {
-	    print!("{} ", pixels[e]);         
-	}
+    //ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+    println!("pixel_width is {}", pixel_width);
+    println!("Stride is {} and first 200 pixels are:", stride);
+    for e in range(0i as uint, 200i as uint) {
+        print!("{} ", pixels[e]);
+    }
         self.draw_target.make_current();
         let draw_target_ref = &self.draw_target;
         let azure_surface = draw_target_ref.create_source_surface_from_data(pixels,

components/layout/display_list_builder.rs

@@ -219,7 +219,7 @@ impl FragmentDisplayListBuilding for Fragment {
         };
         debug!("(building display list) building background image");
 
-	let (img_width, img_height) = image.dimensions();
+    let (img_width, img_height) = image.dimensions();
 
         let image_width = Au::from_px(img_width as int);
         let image_height = Au::from_px(img_height as int);

components/net/image/base.rs

@@ -45,39 +45,34 @@ fn byte_swap_and_premultiply(data: &mut [u8]) {
 pub fn load_from_memory(buffer: &[u8],ext: &str) -> Option<DynamicImage> {
     if buffer.len() == 0 {
         return None;
-    }
-   else {
-	//let new_image_type: servo_image::ImageFormat = servo_image::ImageFormat::PNG;
-
+    } else {
+        //let new_image_type: servo_image::ImageFormat = servo_image::ImageFormat::PNG;
+
         let image_type: Option< servo_image::ImageFormat > = get_format(ext);
-	if image_type == None
-	{
-	panic!("Image format not supported!");
-	}
-	else{
-        let new_image_type: servo_image::ImageFormat = image_type.unwrap();
-
-
-	let result = servo_image::load_from_memory(buffer,new_image_type);
-	if (result.is_ok()) {
-  	    let v = result.unwrap();
-  	    return Some(v);
-	}
-	else  {	
-	    return None;
-	}		
-   }
-   }
-   }
+        if image_type == None {
+            panic!("Image format not supported!");
+        } else{
+            let new_image_type: servo_image::ImageFormat = image_type.unwrap();
+
+            let result = servo_image::load_from_memory(buffer,new_image_type);
+            if result.is_ok() {
+                let v = result.unwrap();
+                return Some(v);
+            } else  {
+                return None;
+            }
+        }
+    }
+}
 fn get_format(ext: &str) -> Option<servo_image::ImageFormat> {
-		match ext.to_ascii().to_uppercase().as_str_ascii() {
+        match ext.to_ascii().to_uppercase().as_str_ascii() {
     "PNG" => {(return Some(servo_image::ImageFormat::PNG));},
     "JPEG" => {(return Some(servo_image::ImageFormat::JPEG));},
     "JPG" => {(return Some(servo_image::ImageFormat::JPEG));},
     "GIF"=> {(return Some(servo_image::ImageFormat::GIF));},
     "WEBP" => {(return Some(servo_image::ImageFormat::WEBP));},
     "PPM" => {(return Some(servo_image::ImageFormat::PPM));},
     _ => {return None ;},
-		}
-	}
+        }
+    }
 

components/net/image/holder.rs

@@ -68,7 +68,7 @@ impl<NodeAddress: Send> ImageHolder<NodeAddress> {
         debug!("get_size() {}", self.url.serialize());
 
         self.get_image(node_address).map(|img| {
-	let (img_width,img_height) = img.dimensions();
+    let (img_width,img_height) = img.dimensions();
             self.cached_size = Size2D(img_width as int,
                                       img_height as int);
             self.cached_size.clone()

components/net/image_cache_task.rs

@@ -323,7 +323,7 @@ impl ImageCache {
                     let mut ext="";
                     for x in s.as_slice().split('.') { ext=x; }
                     println!("{}",ext);
-	
+
                     let image = profile(time::ImageDecodingCategory, None, time_profiler_chan_clone, || {
                         load_from_memory(data.as_slice(),ext)
                         });
@@ -994,7 +994,7 @@ mod tests {
     #[test]
     fn sync_cache_should_wait_for_images() {
         let mock_resource_task = mock_resource_task(box SendTestImage);
-       
+
         let image_cache_task = ImageCacheTask::new_sync(mock_resource_task.clone(), TaskPool::new(4));
         let url = Url::parse("file:///").unwrap();