Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use updated html5ever TraversalScope type #17896

Closed
wants to merge 2 commits into from
Closed

use updated html5ever TraversalScope type #17896

wants to merge 2 commits into from

Conversation

@moonlightdrive
Copy link
Contributor

moonlightdrive commented Jul 27, 2017 •
edited by larsbergstrom

This PR depends on servo/html5ever#277

cc @jdm

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #14975 (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable
@highfive
Copy link

highfive commented Jul 27, 2017

Heads up! This PR modifies the following files:

  • @fitzgen: components/script/dom/element.rs, components/script/dom/servoparser/html.rs
  • @KiChjang: components/script/dom/element.rs, components/script/dom/servoparser/html.rs
@moonlightdrive moonlightdrive force-pushed the moonlightdrive:serializing-childrenonly branch from 4560cf3 to c9c33f3 Jul 27, 2017
@jdm
jdm requested changes Aug 10, 2017
View changes
Copy link
Member

jdm left a comment

Looks good! We'll need to update to html5ever before this can merge, though.
components/script/dom/element.rs Outdated
@@ -1999,7 +1999,9 @@ impl ElementMethods for Element {
/// https://w3c.github.io/DOM-Parsing/#widl-Element-innerHTML
fn GetInnerHTML(&self) -> Fallible<DOMString> {
// XXX TODO: XML case
self.serialize(ChildrenOnly)
let qname = QualName::new(None, self.namespace().clone(),

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Aug 10, 2017

Member

Pass self.prefix().clone() as the first argument.
@moonlightdrive
ChildrenOnly -> ChildrenOnly(Option<QualName>)
1b3563e 
use this updated type from html5ever
@moonlightdrive
add test for serializing tags whose contents should be escaped
Loading status checks…
fbb3e00
@moonlightdrive moonlightdrive force-pushed the moonlightdrive:serializing-childrenonly branch from c9c33f3 to fbb3e00 Aug 15, 2017
@jdm jdm removed the S-awaiting-review label Aug 21, 2017
@jdm
Copy link
Member

jdm commented Aug 23, 2017

This is now waiting on servo/html5ever#304 and new published versions of the various parser crates.
@jdm jdm mentioned this pull request Sep 13, 2017
Closed
@jdm
Copy link
Member

jdm commented Sep 13, 2017

html5ever 0.20 has been released! You'll want to update the script/ Cargo.toml to make use of it.
This was referenced Oct 4, 2017
Closed
Merged
@jdm
Copy link
Member

jdm commented Oct 4, 2017

Rebased in #18747. Thanks!
@jdm jdm closed this Oct 4, 2017
bors-servo added a commit that referenced this pull request Oct 6, 2017
@bors-servo
Auto merge of #18747 - jdm:serializing-childrenonly, r=jdm
Loading status checks…
6129d6e 
Serializing childrenonly

Rebased from #17896.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #14975 (github issue number if applicable).
- [x] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18747)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Oct 7, 2017
@bors-servo
Auto merge of #18747 - jdm:serializing-childrenonly, r=jdm
Loading status checks…
a1b4b55 
Serializing childrenonly

Rebased from #17896.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #14975 (github issue number if applicable).
- [x] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18747)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Oct 9, 2017
@bors-servo
Auto merge of #18747 - jdm:serializing-childrenonly, r=jdm
Loading status checks…
39c84af 
Serializing childrenonly

Rebased from #17896.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #14975 (github issue number if applicable).
- [x] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18747)
<!-- Reviewable:end -->
bors-servo added a commit that referenced this pull request Oct 9, 2017
@bors-servo
Auto merge of #18747 - jdm:serializing-childrenonly, r=jdm
Loading status checks…
e3624e6 
Serializing childrenonly

Rebased from #17896.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #14975 (github issue number if applicable).
- [x] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18747)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm

Assignees

@jdm jdm

Labels
S-needs-code-changes
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

innerHTML on a script tag escapes tag characters
3 participants
@moonlightdrive @highfive @jdm
You can’t perform that action at this time.