Refactor resource loader protocol to send metadata first

1 files changed, 6 insertions, 14 deletions

diff --git a/src/components/script/html/cssparse.rs b/src/components/script/html/cssparse.rs
index 9111f517c12..3123a2d24e8 100644
--- a/src/components/script/html/cssparse.rs
+++ b/src/components/script/html/cssparse.rs
@@ -10,7 +10,7 @@ use std::comm::Port;
 use std::task;
 use newcss::stylesheet::Stylesheet;
 use newcss::util::DataStream;
-use servo_net::resource_task::{ResourceTask, ProgressMsg, Load, Payload, Done, UrlChange};
+use servo_net::resource_task::{Load, LoadResponse, Payload, Done, ResourceTask};
 use extra::url::Url;
 
 /// Where a style sheet comes from.
@@ -55,21 +55,13 @@ fn data_stream(provenance: StylesheetProvenance, resource_task: ResourceTask) ->
     }
 }
 
-fn resource_port_to_data_stream(input_port: Port<ProgressMsg>) -> DataStream {
+fn resource_port_to_data_stream(input_port: Port<LoadResponse>) -> DataStream {
+    let progress_port = input_port.recv().progress_port;
     return || {
-        // Can't just 'return' the value since we're inside a lambda
-        let mut result = None;
-        loop {
-            match input_port.recv() {
-                UrlChange(*) => (),  // don't care that URL changed
-                Payload(data) => {
-                    result = Some(data);
-                    break;
-                }
-                Done(*) => break
-            }
+        match progress_port.recv() {
+            Payload(data) => Some(data),
+            Done(*) => None
         }
-        result
     }
 }