Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 19:04:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Recycle use of a local variable and remove what seems to be 2 extraneous URL objects.

Browse source
This commit is contained in:
Adenilson Cavalcanti 2014-07-21 14:57:00 -07:00
parent b84065f574
commit ffbb87b8a1
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/script/html/hubbub_html_parser.rs
View file

@ -320,14 +320,12 @@ pub fn parse_html(page: &Page,
debug!("Fetched page; metadata is {:?}", load_response.metadata);
let base_url = load_response.metadata.final_url.clone();
let url2 = base_url.clone();
let url3 = url2.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((url2.clone(), true));
*page.mut_url() = Some((base_url.clone(), true));
}
let mut parser = hubbub::Parser("UTF-8", false);
@ -420,7 +418,7 @@ pub fn parse_html(page: &Page,
s.as_slice().eq_ignore_ascii_case("stylesheet")
}) => {
debug!("found CSS stylesheet: {:s}", *href);
match UrlParser::new().base_url(&url2).parse(href.as_slice()) {
match UrlParser::new().base_url(&base_url).parse(href.as_slice()) {
Ok(url) => css_chan2.send(CSSTaskNewFile(
UrlProvenance(url, resource_task.clone()))),
Err(e) => debug!("Parsing url {:s} failed: {:s}", *href, e)
@ -504,7 +502,7 @@ pub fn parse_html(page: &Page,
match script.get_attribute(Null, "src").root() {
Some(src) => {
debug!("found script: {:s}", src.deref().Value());
match UrlParser::new().base_url(&url3)
match UrlParser::new().base_url(&base_url)
.parse(src.deref().value().as_slice()) {
Ok(new_url) => js_chan2.send(JSTaskNewFile(new_url)),
Err(e) => debug!("Parsing url {:s} failed: {:s}", src.deref().Value(), e)
@ -521,7 +519,7 @@ pub fn parse_html(page: &Page,
}
debug!("script data = {:?}", data);
js_chan2.send(JSTaskNewInlineScript(data, url3.clone()));
js_chan2.send(JSTaskNewInlineScript(data, base_url.clone()));
}
}
}