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

Fire error when placeholder is loaded #21399

Merged
merged 1 commit into from Aug 26, 2018
Merged

Fire error when placeholder is loaded #21399

merged 1 commit into from Aug 26, 2018

Conversation

@gterzian
Copy link
Member

gterzian commented Aug 13, 2018 •
edited by SimonSapin

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #21397 (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 Aug 13, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/htmlimageelement.rs
  • @KiChjang: components/script/dom/htmlimageelement.rs
@highfive
Copy link

highfive commented Aug 13, 2018

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@jdm
Copy link
Member

jdm commented Aug 13, 2018

We should run this through try and add a test if no results change.
@jdm jdm assigned jdm and unassigned mbrubeck Aug 13, 2018
@jdm
jdm approved these changes Aug 13, 2018
View changes
@gterzian
Copy link
Member Author

gterzian commented Aug 14, 2018

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Aug 14, 2018

⌛ Trying commit c34b2d0 with merge 8ea4c94...
bors-servo added a commit that referenced this pull request Aug 14, 2018
@bors-servo
Auto merge of #21399 - gterzian:error_on_placeholder_load, 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…
8ea4c94 
Fire error when placeholder is loaded

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #21397 (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. -->

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

bors-servo commented Aug 14, 2018

💔 Test failed - mac-rel-wpt1
@gterzian
Copy link
Member Author

gterzian commented Aug 14, 2018 •
edited 

{"status": "PASS", "group": "default", "message": null, "stack": null, "subtest": "document.open bailout should not have any side effects (active parser whose script nesting level is greater than 0)", "test": "/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-synchronous-script.window.html", "line": 47791, "action": "test_result", "expected": "FAIL"

looks like an intermittent, I'll look into writing a test...
@gterzian gterzian force-pushed the gterzian:error_on_placeholder_load branch from c34b2d0 to 5bbfe2c Aug 14, 2018
@gterzian
Copy link
Member Author

gterzian commented Aug 14, 2018 •
edited

@jdm I've added a "mozilla" wpt test because I couldn't find any reference to placeholder in the spec, and I assume whether to load a placeholder or not isn't normalized. There already is a wpt test to cover the case of a non-existent image at https://github.com/servo/servo/blob/master/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/nonexistent-image.html

We were passing that test because it hits the ImageResponse::None branch(not due to url parsing failure by the way), so I've copy/pasted it and change the url to the one from the manual test you linked to in the issue, and we indeed get a placeholder. The test was failing without the current changes...
@gterzian gterzian force-pushed the gterzian:error_on_placeholder_load branch 2 times, most recently from 1f24a76 to 61a9391 Aug 14, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2018

☔ The latest upstream changes (presumably #21519) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm
jdm approved these changes Aug 25, 2018
View changes
Copy link
Member

jdm left a comment

Sorry for forgetting about this! This is ready to be merged after a rebase.
@jdm jdm removed the S-awaiting-review label Aug 25, 2018
@gterzian
fire error when placeholder image is loaded
Loading status checks…
7b8d903
@gterzian gterzian force-pushed the gterzian:error_on_placeholder_load branch from 61a9391 to 7b8d903 Aug 26, 2018
@gterzian
Copy link
Member Author

gterzian commented Aug 26, 2018

Ok, this one has been rebased...
@jdm
Copy link
Member

jdm commented Aug 26, 2018

@vors-servo r+
@atouchet
Copy link
Contributor

atouchet commented Aug 26, 2018

@jdm typo.
@jdm
Copy link
Member

jdm commented Aug 26, 2018

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

bors-servo commented Aug 26, 2018

📌 Commit 7b8d903 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Aug 26, 2018

⌛ Testing commit 7b8d903 with merge da36740...
bors-servo added a commit that referenced this pull request Aug 26, 2018
@bors-servo
Auto merge of #21399 - gterzian:error_on_placeholder_load, r=jdm
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…
da36740 
Fire error when placeholder is loaded

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #21397 (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. -->

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

bors-servo commented Aug 26, 2018

💔 Test failed - mac-rel-wpt3
@gterzian
Copy link
Member Author

gterzian commented Aug 26, 2018

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

bors-servo commented Aug 26, 2018

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

bors-servo commented Aug 26, 2018

☀️ Test successful - android, 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-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing da36740 to master...
@bors-servo bors-servo merged commit 7b8d903 into servo:master Aug 26, 2018
3 of 4 checks passed
3 of 4 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Aug 26, 2018
Merged
4 of 4 tasks complete
@gterzian gterzian deleted the gterzian:error_on_placeholder_load branch Aug 27, 2018
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-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Image loads that yield a placeholder image receive a load event instead of an error event
6 participants
@gterzian @highfive @jdm @bors-servo @atouchet @mbrubeck
You can’t perform that action at this time.