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

Make the parser decode input from document's encoding #22432

Merged
merged 4 commits into from Dec 12, 2018
Merged

Make the parser decode input from document's encoding #22432

merged 4 commits into from Dec 12, 2018

Conversation

@nox
Copy link
Member

nox commented Dec 12, 2018 •
edited by SimonSapin

This change is Reviewable
nox added 3 commits Dec 8, 2018
@nox
Remove an argument to ServoParser::parse_html_script_input
d1d79bf 
Since the spec of document.open was updated, this argument became useless.
@nox
Use Mime::get_param
dbef324
@nox
Fix an ignore_malloc_size_of comment
848a4e2
@highfive
Copy link

highfive commented Dec 12, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/document.rs, components/script/Cargo.toml, components/script/dom/servoparser/mod.rs, components/script/dom/bindings/trace.rs
  • @KiChjang: components/script/dom/document.rs, components/script/Cargo.toml, components/net_traits/lib.rs, components/script/dom/servoparser/mod.rs, components/script/dom/bindings/trace.rs
@nox
Copy link
Member Author

nox commented Dec 12, 2018

@bors-servo try=wpt
@highfive
Copy link

highfive commented Dec 12, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify script code, but no tests are modified. Please consider adding a test!
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

⌛ Trying commit 39f92f7 with merge 7629cd3...
bors-servo added a commit that referenced this pull request Dec 12, 2018
@bors-servo
Auto merge of #22432 - servo:encoding, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
7629cd3 
Make the parser decode input from document's encoding
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

💔 Test failed - linux-rel-wpt
@nox
Make the parser decode input from document's encoding
Loading status checks…
a2abfc6 
The document's encoding is only computed from the Content-Type header for now,
with no sniffing at all.
@nox nox force-pushed the encoding branch from 39f92f7 to a2abfc6 Dec 12, 2018
@SimonSapin
SimonSapin reviewed Dec 12, 2018
View changes
components/script/dom/document.rs
let encoding = content_type
.get_param(mime::CHARSET)
.and_then(|charset| Encoding::for_label(charset.as_str().as_bytes()))
.unwrap_or(UTF_8);

This comment has been minimized.

Sign in to view
Copy link
@SimonSapin

SimonSapin Dec 12, 2018

Member

I think this fallback is incorrect per spec, but it’s likely better until we implement <meta charset> sniffing.
@SimonSapin
Copy link
Member

SimonSapin commented Dec 12, 2018

Nice!

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

📌 Commit a2abfc6 has been approved by SimonSapin
@highfive highfive assigned SimonSapin and unassigned asajeffrey Dec 12, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

⌛ Testing commit a2abfc6 with merge 36d55df...
bors-servo added a commit that referenced this pull request Dec 12, 2018
@bors-servo
Auto merge of #22432 - servo:encoding, r=SimonSapin
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
36d55df 
Make the parser decode input from document's encoding

<!-- 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/22432)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

💔 Test failed - linux-rel-css
@nox
Copy link
Member Author

nox commented Dec 12, 2018

@bors-servo retry #13480
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

⌛ Testing commit a2abfc6 with merge e399cd5...
bors-servo added a commit that referenced this pull request Dec 12, 2018
@bors-servo
Auto merge of #22432 - servo:encoding, r=SimonSapin
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
e399cd5 
Make the parser decode input from document's encoding

<!-- 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/22432)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

💔 Test failed - mac-rel-wpt2
@nox
Copy link
Member Author

nox commented Dec 12, 2018

@bors-servo retry #22430
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

⚡ Previous build results for android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster, windows-msvc-dev are reusable. Rebuilding only mac-rel-wpt2...
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

💔 Test failed - mac-rel-wpt2
@nox
Copy link
Member Author

nox commented Dec 12, 2018

@bors-servo retry #22430
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

⌛ Testing commit a2abfc6 with merge 2e01a23...
bors-servo added a commit that referenced this pull request Dec 12, 2018
@bors-servo
Auto merge of #22432 - servo:encoding, r=SimonSapin
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
2e01a23 
Make the parser decode input from document's encoding

<!-- 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/22432)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2018

☀️ Test successful - android-mac, arm32, arm64, linux-rel-css, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster
Approved by: SimonSapin
Pushing 2e01a23 to master...
@bors-servo bors-servo merged commit a2abfc6 into master Dec 12, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@nox nox mentioned this pull request Dec 13, 2018
Open
@SimonSapin SimonSapin deleted the encoding branch Jan 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SimonSapin SimonSapin

Assignees

@SimonSapin SimonSapin

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@nox @highfive @bors-servo @SimonSapin @asajeffrey
You can’t perform that action at this time.