From 2fa203bc72be76639184928a62be39f4c744926a Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Fri, 10 Aug 2012 16:37:30 -0700
Subject: [PATCH] Restructure ImageCache.get_image

---
 src/servo/resource/image_cache_task.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/servo/resource/image_cache_task.rs b/src/servo/resource/image_cache_task.rs
index bab5b56308a..29627a57c23 100644
--- a/src/servo/resource/image_cache_task.rs
+++ b/src/servo/resource/image_cache_task.rs
@@ -84,6 +84,14 @@ impl ImageCache {
     }
 
     /*priv*/ fn get_image(url: url, response: chan<ImageResponseMsg>) {
+        match self.image_map.find(url) {
+          some(image) => {
+            response.send(ImageReady(clone_arc(image)));
+            return
+          }
+          none => ()
+        }
+
         match self.prefetch_map.find(url) {
           some(prefetch_data) => {
 
@@ -118,13 +126,7 @@ impl ImageCache {
                 response.send(ImageNotReady);
             }
           }
-          none => {
-            // FIXME: Probably faster to hit this map before the prefetch map
-            match self.image_map.find(url) {
-              some(image) => response.send(ImageReady(clone_arc(image))),
-              none => fail ~"got a request for image data without prefetch"
-            }
-          }
+          none => fail ~"got a request for image data without prefetch"
         }
     }
 }