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

Auto merge of #8696 - KiChjang:change-parser-state, r=KiChjang

Browse source 
Use set_plaintext_state instead of plaintext tag

I don't know whether there's an issue reported for for this one.

r? @SimonSapin

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8696)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-27 15:23:46 +05:30
commit 3720e4d5ef
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/servohtmlparser.rs
View file

@ -121,17 +121,11 @@ impl AsyncResponseListener for ParserContext {
parser.parse_sync(); parser.parse_sync();
}, },
Some(ContentType(Mime(TopLevel::Text, SubLevel::Plain, _))) => { Some(ContentType(Mime(TopLevel::Text, SubLevel::Plain, _))) => {
// FIXME: When servo/html5ever#109 is fixed remove <plaintext> usage and
// replace with fix from that issue.
// text/plain documents require setting the tokenizer into PLAINTEXT mode.
// This is done by using a <plaintext> element as the html5ever tokenizer
// provides no other way to change to that state.
// Spec for text/plain handling is:
// https://html.spec.whatwg.org/multipage/#read-text // https://html.spec.whatwg.org/multipage/#read-text
let page = format!("<pre>\u{000A}<plaintext>"); let page = format!("<pre>\n");
parser.pending_input.borrow_mut().push(page); parser.pending_input.borrow_mut().push(page);
parser.parse_sync(); parser.parse_sync();
parser.tokenizer().borrow_mut().set_plaintext_state();
}, },
Some(ContentType(Mime(TopLevel::Text, SubLevel::Html, _))) => {}, // Handle text/html Some(ContentType(Mime(TopLevel::Text, SubLevel::Html, _))) => {}, // Handle text/html
Some(ContentType(Mime(toplevel, sublevel, _))) => { Some(ContentType(Mime(toplevel, sublevel, _))) => {

5
tests/wpt/metadata/html/browsers/browsing-the-web/read-text/load-text-plain.html.ini
View file

@ -1,5 +0,0 @@
[load-text-plain.html]
type: testharness
[Checking contents for text file]
expected: FAIL