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

Fix combination of border and border-radius being drawn incorrectly #26215

Merged
merged 2 commits into from May 2, 2020
Merged

Fix combination of border and border-radius being drawn incorrectly #26215

merged 2 commits into from May 2, 2020
+52 −2

Conversation

@dralley
Copy link
Contributor

dralley commented Apr 17, 2020 •
edited

fixes #20922

Manual testcase in the attached issue

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #20922
  • There are tests for these changes OR
  • These changes do not require tests because ___
@highfive
Copy link

highfive commented Apr 17, 2020

Heads up! This PR modifies the following files:

  • @emilio: components/layout/display_list/builder.rs
@highfive
Copy link

highfive commented Apr 17, 2020

warning Warning warning

  • These commits modify layout code, but no tests are modified. Please consider adding a test!
@dralley
Copy link
Contributor Author

dralley commented Apr 17, 2020

I'm open to fixing this for Layout 2020, but I haven't figured out where the controlling code is (or if it even exists yet)
@jdm
Copy link
Member

jdm commented Apr 17, 2020

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

bors-servo commented Apr 17, 2020

⌛ Trying commit 84ffa73 with merge 99e9220...
bors-servo added a commit that referenced this pull request Apr 17, 2020
@bors-servo
Auto merge of #26215 - dralley:fix-image-border, 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…
99e9220 
Fix combination of border and border-radius being drawn incorrectly

fixes #20922

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #20922

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because ___
@dralley
Fix combination of border and border-radius being drawn incorrectly
Loading status checks…
232df23 
fixes #20922
@dralley dralley force-pushed the dralley:fix-image-border branch from 84ffa73 to 232df23 Apr 17, 2020
@jdm
Copy link
Member

jdm commented Apr 17, 2020

Is there a meaningful automated test that we can add to this? Is there some way of achieving the same effect as border-radius without using border-radius?
@jdm
Copy link
Member

jdm commented Apr 21, 2020

@SimonSapin See my previous comment.
@SimonSapin
Copy link
Member

SimonSapin commented Apr 22, 2020 •
edited

Since this is about how borders are painted in the presence of border-radius, I suppose we could have a reftest where the reference uses two nested elements with a different border-radius and background-color?

Though like with anything other than axis-aligned rectangles we risk running into false negative due to anti-aliasing, and may need to make that reftest "fuzzy".
@jdm
Copy link
Member

jdm commented Apr 30, 2020

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

bors-servo commented Apr 30, 2020

⌛ Trying commit fc4f84d with merge 0c72e7a...
bors-servo added a commit that referenced this pull request Apr 30, 2020
@bors-servo
Auto merge of #26215 - dralley:fix-image-border, 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…
0c72e7a 
Fix combination of border and border-radius being drawn incorrectly

fixes #20922

Manual testcase in the attached issue

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #20922

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because ___
@bors-servo
Copy link
Contributor

bors-servo commented Apr 30, 2020

☀️ Test successful - status-taskcluster
State: approved= try=True
@jdm
Copy link
Member

jdm commented May 1, 2020

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

bors-servo commented May 1, 2020

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

bors-servo commented May 1, 2020

⌛ Testing commit fc4f84d with merge 3e79058...
bors-servo added a commit that referenced this pull request May 1, 2020
@bors-servo
Auto merge of #26215 - dralley:fix-image-border, 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…
3e79058 
Fix combination of border and border-radius being drawn incorrectly

fixes #20922

Manual testcase in the attached issue

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #20922

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because ___
@bors-servo
Copy link
Contributor

bors-servo commented May 1, 2020

💔 Test failed - status-taskcluster
@jdm
Copy link
Member

jdm commented May 1, 2020

The new test definitely fails in layout 2020 as well:
Screen Shot 2020-04-30 at 10 12 51 PM

It would be nice to get that fixed.
@jdm
Copy link
Member

jdm commented May 1, 2020

@SimonSapin Any suggestions for where to start with applying the border-radius clipping to image fragments?
@SimonSapin
Copy link
Member

SimonSapin commented May 1, 2020

I’ve filed #26390 about this.
@jdm
Add automated test.
Loading status checks…
1d9d55c
@jdm jdm force-pushed the dralley:fix-image-border branch from fc4f84d to 1d9d55c May 2, 2020
@jdm
Copy link
Member

jdm commented May 2, 2020

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

bors-servo commented May 2, 2020

📌 Commit 1d9d55c has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented May 2, 2020

⌛ Testing commit 1d9d55c with merge 73abf56...
@bors-servo
Copy link
Contributor

bors-servo commented May 2, 2020

☀️ Test successful - status-taskcluster
Approved by: jdm
Pushing 73abf56 to master...
@bors-servo bors-servo merged commit 73abf56 into servo:master May 2, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
@dralley dralley deleted the dralley:fix-image-border branch May 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Elements with a combination of 'border' and 'border-radius' are drawn incorrectly
5 participants
@dralley @highfive @jdm @bors-servo @SimonSapin
You can’t perform that action at this time.