From 8838f2460e03c26df54707978970c1e198bf2a84 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Tue, 9 Dec 2014 15:05:50 +0100
Subject: [PATCH] Rename base_url to final_url in ScriptTask::load.

This seems like a clearer name, as it's used for more than just as a base url.
---
 components/script/script_task.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 01473c34681..6a213c14b54 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -744,7 +744,7 @@ impl ScriptTask {
             });
         }
 
-        let (parser_input, base_url) = if !is_javascript {
+        let (parser_input, final_url) = if !is_javascript {
             // Wait for the LoadResponse so that the parser knows the final URL.
             let (input_chan, input_port) = channel();
             self.resource_task.send(Load(NetLoadData {
@@ -764,16 +764,16 @@ impl ScriptTask {
                 });
             });
 
-            let base_url = load_response.metadata.final_url.clone();
+            let final_url = load_response.metadata.final_url.clone();
 
             {
                 // Store the final URL before we start parsing, so that DOM routines
                 // (e.g. HTMLImageElement::update_image) can resolve relative URLs
                 // correctly.
-                *page.mut_url() = Some((base_url.clone(), true));
+                *page.mut_url() = Some((final_url.clone(), true));
             }
 
-            (InputUrl(load_response), base_url)
+            (InputUrl(load_response), final_url)
         } else {
             let evalstr = load_data.url.non_relative_scheme_data().unwrap();
             let jsval = window.evaluate_js_with_result(evalstr);
@@ -781,7 +781,7 @@ impl ScriptTask {
             (InputString(strval.unwrap_or("".to_string())), doc_url)
         };
 
-        parse_html(*document, parser_input, base_url);
+        parse_html(*document, parser_input, final_url);
         url = page.get_url().clone();
 
         document.set_ready_state(DocumentReadyStateValues::Interactive);