mirror of
https://github.com/servo/servo.git
synced 2025-08-04 05:00:08 +01:00
Merge pull request #3131 from Manishearth/image
Load bare images within an HTML document (#3108); r=Ms2ger
This commit is contained in:
commit
64f05116fc
1 changed files with 17 additions and 12 deletions
|
@ -582,19 +582,24 @@ pub fn parse_html(page: &Page,
|
||||||
};
|
};
|
||||||
parser.set_tree_handler(&mut tree_handler);
|
parser.set_tree_handler(&mut tree_handler);
|
||||||
debug!("set tree handler");
|
debug!("set tree handler");
|
||||||
|
|
||||||
debug!("loaded page");
|
debug!("loaded page");
|
||||||
loop {
|
match load_response.metadata.content_type {
|
||||||
match load_response.progress_port.recv() {
|
Some((ref t, _)) if t.as_slice().eq_ignore_ascii_case("image") => {
|
||||||
Payload(data) => {
|
let page = format!("<html><body><img src='{:s}' /></body></html>", base_url.serialize());
|
||||||
debug!("received data");
|
parser.parse_chunk(page.into_bytes().as_slice());
|
||||||
parser.parse_chunk(data.as_slice());
|
},
|
||||||
}
|
_ => loop {
|
||||||
Done(Err(err)) => {
|
match load_response.progress_port.recv() {
|
||||||
fail!("Failed to load page URL {:s}, error: {:s}", url.serialize(), err);
|
Payload(data) => {
|
||||||
}
|
debug!("received data");
|
||||||
Done(..) => {
|
parser.parse_chunk(data.as_slice());
|
||||||
break;
|
}
|
||||||
|
Done(Err(err)) => {
|
||||||
|
fail!("Failed to load page URL {:s}, error: {:s}", url.serialize(), err);
|
||||||
|
}
|
||||||
|
Done(..) => {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue