servo: Merge #2913 - Avoid an unnecessary clone of the base URL in parse_html(); r=jdm (from Ms2ger:url-clone)

Source-Repo: https://github.com/servo/servo
Source-Revision: 302480765bef1c227312f73dd9b99c9966ca3742
This commit is contained in:
Ms2ger 2014-07-24 21:26:52 +05:01
Родитель 3cd78c6b5e
Коммит cde33d1aab
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -319,7 +319,7 @@ pub fn parse_html(page: &Page,
debug!("Fetched page; metadata is {:?}", load_response.metadata);
let base_url = load_response.metadata.final_url.clone();
let base_url = &load_response.metadata.final_url;
{
// Store the final URL before we start parsing, so that DOM routines
@ -414,7 +414,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(&base_url).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)
@ -498,7 +498,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(&base_url)
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)