aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/script_task.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2014-02-01 17:51:15 +0100
committerSimon Sapin <simon.sapin@exyr.org>2014-02-01 17:51:15 +0100
commit33f8ef618b5b6bd9014ba458c2caf24ffd28a794 (patch)
treedba4dd505697c5e2288a56615aa05822a7b021f0 /src/components/script/script_task.rs
parent39e781bcc7bc1f6ba641f5e70cbba7ea4a7d6954 (diff)
downloadservo-33f8ef618b5b6bd9014ba458c2caf24ffd28a794.tar.gz
servo-33f8ef618b5b6bd9014ba458c2caf24ffd28a794.zip
Rename make_url/current_url to parse_url/base_url, to align with spec terminology.
Diffstat (limited to 'src/components/script/script_task.rs')
-rw-r--r--src/components/script/script_task.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index 639f0cc15d9..4783682c7fe 100644
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -44,7 +44,7 @@ use servo_msg::constellation_msg;
use servo_net::image_cache_task::ImageCacheTask;
use servo_net::resource_task::ResourceTask;
use servo_util::geometry::to_frac_px;
-use servo_util::url::make_url;
+use servo_util::url::parse_url;
use servo_util::task::spawn_named;
use servo_util::namespace::Null;
use std::comm::{Port, SharedChan};
@@ -891,11 +891,11 @@ impl ScriptTask {
for href in attr.iter() {
debug!("ScriptTask: clicked on link to {:s}", href.Value());
let click_frag = href.value_ref().starts_with("#");
- let current_url = page.url.as_ref().map(|&(ref url, _)| {
+ let base_url = page.url.as_ref().map(|&(ref url, _)| {
url.clone()
});
- debug!("ScriptTask: current url is {:?}", current_url);
- let url = make_url(href.Value(), current_url);
+ debug!("ScriptTask: current url is {:?}", base_url);
+ let url = parse_url(href.Value(), base_url);
if click_frag {
match self.find_fragment_node(page, url.fragment.unwrap()) {