Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite escape() in htmlserializer to push onto a StrBuf.

Browse source
This commit is contained in:
Ms2ger 2014-05-24 21:48:01 +02:00
parent d1ca380482
commit ce45afac0c
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/script/dom/htmlserializer.rs
View file

@ -81,10 +81,10 @@ fn serialize_text(text: &JSRef<Text>, html: &mut StrBuf) {
"noembed" | "noframes" | "plaintext" | "noembed" | "noframes" | "plaintext" |
"noscript" if elem.deref().namespace == namespace::HTML "noscript" if elem.deref().namespace == namespace::HTML
=> html.push_str(text.deref().characterdata.data), => html.push_str(text.deref().characterdata.data),
_ => html.push_str(escape(text.deref().characterdata.data, false)) _ => escape(text.deref().characterdata.data, false, html)
} }
} }
_ => html.push_str(escape(text.deref().characterdata.data, false)) _ => escape(text.deref().characterdata.data, false, html)
} }
} }
@ -151,18 +151,19 @@ fn serialize_attr(attr: &JSRef<Attr>, html: &mut StrBuf) {
html.push_str(attr.deref().name); html.push_str(attr.deref().name);
}; };
html.push_str("=\""); html.push_str("=\"");
html.push_str(escape(attr.deref().value, true)); escape(attr.deref().value, true, html);
html.push_char('"'); html.push_char('"');
} }
fn escape(string: &str, attr_mode: bool) -> ~str { fn escape(string: &str, attr_mode: bool, html: &mut StrBuf) {
let replaced = string.replace("&", "&amp;").replace("\xA0", "&nbsp;"); for c in string.chars() {
match attr_mode { match c {
true => { '&' => html.push_str("&amp;"),
replaced.replace("\"", "&quot;") '\xA0' => html.push_str("&nbsp;"),
}, '"' if attr_mode => html.push_str("&quot;"),
false => { '<' if !attr_mode => html.push_str("&lt;"),
replaced.replace("<", "&lt;").replace(">", "&gt;") '>' if !attr_mode => html.push_str("&gt;"),
c => html.push_char(c),
} }
} }
} }