From 5d0934d8ec7d3596d388549cc48daeffc7af73c3 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 6 Dec 2014 11:39:45 +0100
Subject: [PATCH] Pass the load data to parse_html directly, rather than in an
 Option.

---
 components/script/parse/html.rs  | 10 ++++------
 components/script/script_task.rs |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
index 70ffc76e6d9..b83743a450a 100644
--- a/components/script/parse/html.rs
+++ b/components/script/parse/html.rs
@@ -212,17 +212,15 @@ pub fn parse_html(page: &Page,
                   document: JSRef<Document>,
                   input: HTMLInput,
                   resource_task: ResourceTask,
-                  msg_load_data: Option<MsgLoadData>) {
+                  msg_load_data: MsgLoadData) {
     let (base_url, load_response) = match input {
         InputUrl(ref url) => {
             // Wait for the LoadResponse so that the parser knows the final URL.
             let (input_chan, input_port) = channel();
             let mut load_data = LoadData::new(url.clone(), input_chan);
-            msg_load_data.map(|m| {
-                load_data.headers = m.headers;
-                load_data.method = m.method;
-                load_data.data = m.data;
-            });
+            load_data.headers = msg_load_data.headers;
+            load_data.method = msg_load_data.method;
+            load_data.data = msg_load_data.data;
             resource_task.send(Load(load_data));
 
             let load_response = input_port.recv();
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 5a8caadb3e6..7da46d628ce 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -748,7 +748,7 @@ impl ScriptTask {
             InputString(strval.unwrap_or("".to_string()))
         };
 
-        parse_html(&*page, *document, parser_input, self.resource_task.clone(), Some(load_data));
+        parse_html(&*page, *document, parser_input, self.resource_task.clone(), load_data);
         url = page.get_url().clone();
 
         document.set_ready_state(DocumentReadyStateValues::Interactive);