servo: Merge #19647 - replace DocumentSource::NotFromParser with DocumentSource::FromParser (from tigercosmos:x3); r=jdm

<!-- Please describe your changes on the following line: -->
per https://github.com/servo/servo/pull/4297/files#r158729975

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: d41f720ee422f53a7c49d0877d105d8750ea404f

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 301ea2abc9fa41a80af1bc2590c108a2ffec8ccf
This commit is contained in:
tigercosmos 2018-01-08 11:23:21 -06:00
Родитель 0203cc4abd
Коммит cdac28a303
1 изменённых файлов: 2 добавлений и 2 удалений

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

@ -77,7 +77,6 @@ impl DOMParserMethods for DOMParser {
Ok(document)
}
Text_xml | Application_xml | Application_xhtml_xml => {
// FIXME: this should probably be FromParser when we actually parse the string (#3756).
let document = Document::new(&self.window,
HasBrowsingContext::No,
Some(url.clone()),
@ -86,12 +85,13 @@ impl DOMParserMethods for DOMParser {
Some(content_type),
None,
DocumentActivity::Inactive,
DocumentSource::NotFromParser,
DocumentSource::FromParser,
loader,
None,
None,
Default::default());
ServoParser::parse_xml_document(&document, s, url);
document.set_ready_state(DocumentReadyState::Complete);
Ok(document)
}
}