Properly insert text in document when parsing #14867

Merged
merged 3 commits into from Jan 7, 2017

Projects

None yet

4 participants

@nox
Member
nox commented Jan 5, 2017 edited

This change is Reviewable

@metajack metajack was assigned by highfive Jan 5, 2017
@highfive
highfive commented Jan 5, 2017

Heads up! This PR modifies the following files:

  • @fitzgen: components/script/dom/htmlstyleelement.rs, components/script/Cargo.toml, components/script/dom/servoparser/html.rs, components/script/dom/virtualmethods.rs
  • @kichjang: components/script/dom/htmlstyleelement.rs, components/script/Cargo.toml, components/script/dom/servoparser/html.rs, components/script/dom/virtualmethods.rs
@highfive
highfive commented Jan 5, 2017

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@nox
Member
nox commented Jan 5, 2017
@bors-servo
Contributor

⌛️ Trying commit c54eea7 with merge 5906442...

@bors-servo bors-servo added a commit that referenced this pull request Jan 5, 2017
@bors-servo bors-servo Auto merge of #14867 - nox:a-base-de-popopopop, r=<try>
Update html5ever to 0.12.1 and make use of its pop hook
5906442
@metajack
Contributor
metajack commented Jan 5, 2017

This needs a little bit of comment. It's not clear what this is for unless you read the spec.

r=me with that addressed.

@nox
Member
nox commented Jan 5, 2017

@bors-servo r=jack

@bors-servo
Contributor

📌 Commit c8f951b has been approved by jack

@jdm jdm referenced this pull request Jan 5, 2017
Closed

Added current_line variable to track current line #14661

1 of 5 tasks complete
@nox
Member
nox commented Jan 6, 2017

@bors-servo r=jack

@bors-servo
Contributor

📌 Commit cf93159 has been approved by jack

@bors-servo
Contributor

⌛️ Testing commit cf93159 with merge f976cac...

@bors-servo bors-servo added a commit that referenced this pull request Jan 6, 2017
@bors-servo bors-servo Auto merge of #14867 - nox:a-base-de-popopopop, r=jack
Update html5ever to 0.12.1 and make use of its pop hook

<!-- 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/14867)
<!-- Reviewable:end -->
f976cac
@bors-servo
Contributor

💔 Test failed - linux-rel-wpt

@nox
Member
nox commented Jan 6, 2017

I forgot to update x5e, so style elements don't get parsed at all when in XHTML now...

Looking into the other failures now.

@nox
Member
nox commented Jan 6, 2017

Oh nice. The new line number tracking means that every "\n" gets its own Text node because we don't coalesce adjacent Text children when parsing, thus many unrelated test failures.

@nox
Member
nox commented Jan 6, 2017

Ygg01/xml5ever#24 for the XML issues.

@nox
Member
nox commented Jan 6, 2017
@bors-servo
Contributor

⌛️ Trying commit 1c0f3ef with merge 0cf88e4...

@bors-servo bors-servo added a commit that referenced this pull request Jan 6, 2017
@bors-servo bors-servo Auto merge of #14867 - nox:a-base-de-popopopop, r=<try>
Update html5ever to 0.12.1 and make use of its pop hook

<!-- 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/14867)
<!-- Reviewable:end -->
0cf88e4
@bors-servo
Contributor

💔 Test failed - mac-rel-wpt2

@nox nox changed the title from Update html5ever to 0.12.1 and make use of its pop hook to Properly insert text in document when parsing Jan 6, 2017
@highfive highfive removed the S-tests-failed label Jan 6, 2017
@nox
Member
nox commented Jan 6, 2017
@bors-servo
Contributor

⌛️ Trying commit 30fce30 with merge 4e2318e...

@bors-servo bors-servo added a commit that referenced this pull request Jan 6, 2017
@bors-servo bors-servo Auto merge of #14867 - nox:a-base-de-popopopop, r=<try>
Properly insert text in document when parsing

<!-- 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/14867)
<!-- Reviewable:end -->
4e2318e
@bors-servo
Contributor

💔 Test failed - linux-rel-wpt

@nox
Member
nox commented Jan 7, 2017
@bors-servo
Contributor

⌛️ Trying commit 764ee1c with merge 1eb1ea0...

@bors-servo bors-servo added a commit that referenced this pull request Jan 7, 2017
@bors-servo bors-servo Auto merge of #14867 - nox:a-base-de-popopopop, r=<try>
Properly insert text in document when parsing

<!-- 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/14867)
<!-- Reviewable:end -->
1eb1ea0
@bors-servo
Contributor

💔 Test failed - linux-rel-wpt

nox added some commits Jan 6, 2017
@nox nox Update html5ever to 0.12.1 a89bbc9
@nox nox Update xml5ever to 0.3.0 8caa564
@nox nox Properly insert text in document when parsing
If the last child of a node is a Text child and we are inserting text in that node,
we need to append it to that Text child. Doing that means that
HTMLStyleElement::children_changed gets called less frequently, but that's not a
problem during parsing thanks to the pop hook.
0cb0946
@nox
Member
nox commented Jan 7, 2017

@bors-servo r=metajack

@bors-servo
Contributor

📌 Commit 0cb0946 has been approved by metajack

@bors-servo
Contributor

⌛️ Testing commit 0cb0946 with merge f313e8b...

@bors-servo bors-servo added a commit that referenced this pull request Jan 7, 2017
@bors-servo bors-servo Auto merge of #14867 - nox:a-base-de-popopopop, r=metajack
Properly insert text in document when parsing

<!-- 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/14867)
<!-- Reviewable:end -->
f313e8b
@bors-servo bors-servo merged commit 0cb0946 into servo:master Jan 7, 2017

2 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@bors-servo bors-servo referenced this pull request Jan 7, 2017
Merged

Implement Subresource Integrity #14865

3 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment