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

Generate ::before and ::after content for layout_2020 #25817

Merged
merged 5 commits into from Feb 25, 2020
Merged

Generate ::before and ::after content for layout_2020 #25817

merged 5 commits into from Feb 25, 2020
+380 −30

Conversation

@ferjm
Copy link
Member

ferjm commented Feb 20, 2020

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • There are tests for these changes

This PR generates content from the <string> and attr(<identifier>) content property values. I'll work on other values in follow-ups.
@highfive
Copy link

highfive commented Feb 20, 2020

Heads up! This PR modifies the following files:

  • @jgraham: tests/wpt/include-layout-2020.ini
  • @emilio: components/style/values/specified/counters.rs, components/style/properties/longhands/counters.mako.rs, components/style/values/generics/counters.rs
@ferjm
Copy link
Member Author

ferjm commented Feb 20, 2020

r? @SimonSapin
@SimonSapin
SimonSapin reviewed Feb 20, 2020
View changes
tests/wpt/include-layout-2020.ini Show resolved Hide resolved
components/layout_2020/dom_traversal.rs Outdated Show resolved Hide resolved
components/layout_2020/dom_traversal.rs Outdated Show resolved Hide resolved
components/layout_2020/dom_traversal.rs Outdated Show resolved Hide resolved
components/layout_2020/dom_traversal.rs Outdated Show resolved Hide resolved
components/style/values/generics/counters.rs Show resolved Hide resolved
@ferjm ferjm force-pushed the ferjm:before.after.layout.2020 branch from 2bc960d to f3fd6e2 Feb 20, 2020
@bors-servo
Copy link
Contributor

bors-servo commented Feb 21, 2020

☔ The latest upstream changes (presumably #25806) made this pull request unmergeable. Please resolve the merge conflicts.
@ferjm ferjm force-pushed the ferjm:before.after.layout.2020 branch from f3fd6e2 to d64eda2 Feb 21, 2020
@SimonSapin
Copy link
Member

SimonSapin commented Feb 21, 2020

Looks good, thanks!

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

bors-servo commented Feb 21, 2020

📌 Commit d64eda2 has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Feb 21, 2020

⌛ Testing commit d64eda2 with merge c47d457...
bors-servo added a commit that referenced this pull request Feb 21, 2020
@bors-servo
Auto merge of #25817 - ferjm:before.after.layout.2020, 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…
c47d457 
Generate ::before and ::after content for layout_2020

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] There are tests for these changes

This PR generates content from the `<string>` and `attr(<identifier>)` `content` property values. I'll work on other values in follow-ups.
@bors-servo
Copy link
Contributor

bors-servo commented Feb 21, 2020

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

jdm commented Feb 21, 2020 

error: variant is never constructed: `Replaced`
  --> components/layout_2020/dom_traversal.rs:52:5
   |
52 |     Replaced(ReplacedContent),
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `-D dead-code` implied by `-D warnings`
error: aborting due to previous error
@SimonSapin
Copy link
Member

SimonSapin commented Feb 21, 2020

That’s… surprising. This variant is constructed here:

servo/components/layout_2020/dom_traversal.rs

Line 115 in afb1faf

replaced.map_or(Contents::OfElement, Contents::Replaced),

The variant constructor is passed as a function rather than being called directly, but this PR’s diff doesn’t touch that code at all
@ferjm
Copy link
Member Author

ferjm commented Feb 22, 2020

@bors-servo r=SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Feb 22, 2020

📌 Commit 88ce438 has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Feb 22, 2020

⌛ Testing commit 88ce438 with merge 4424f38...
bors-servo added a commit that referenced this pull request Feb 22, 2020
@bors-servo
Auto merge of #25817 - ferjm:before.after.layout.2020, 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…
4424f38 
Generate ::before and ::after content for layout_2020

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] There are tests for these changes

This PR generates content from the `<string>` and `attr(<identifier>)` `content` property values. I'll work on other values in follow-ups.
ferjm added 4 commits Feb 20, 2020
@ferjm
Generate ::before and ::after string content for layout 2020
bc66948
@ferjm
Generate ::before and ::after content from attr() for layout 2020
5b2d6c8
@ferjm
Update test expectations for layout_2020 generated content
1cdd66a
@ferjm
Temporarily allow PseudoElementContentItem unused variant
Loading status checks…
60fd1e0
@ferjm ferjm force-pushed the ferjm:before.after.layout.2020 branch from 9d21a01 to 60fd1e0 Feb 25, 2020
@ferjm
Copy link
Member Author

ferjm commented Feb 25, 2020

@bors-servo try=wpt
bors-servo added a commit that referenced this pull request Feb 25, 2020
@bors-servo
Auto merge of #25817 - ferjm:before.after.layout.2020, 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…
e633796 
Generate ::before and ::after content for layout_2020

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] There are tests for these changes

This PR generates content from the `<string>` and `attr(<identifier>)` `content` property values. I'll work on other values in follow-ups.
@bors-servo
Copy link
Contributor

bors-servo commented Feb 25, 2020

⌛ Trying commit 60fd1e0 with merge e633796...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 25, 2020

☀️ Test successful - status-taskcluster
State: approved= try=True
1 similar comment
@bors-servo
Copy link
Contributor

bors-servo commented Feb 25, 2020

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

ferjm commented Feb 25, 2020

@bors-servo r=SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Feb 25, 2020

📌 Commit 60fd1e0 has been approved by SimonSapin
bors-servo added a commit that referenced this pull request Feb 25, 2020
@bors-servo
Auto merge of #25817 - ferjm:before.after.layout.2020, 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…
6165a77 
Generate ::before and ::after content for layout_2020

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] There are tests for these changes

This PR generates content from the `<string>` and `attr(<identifier>)` `content` property values. I'll work on other values in follow-ups.
@bors-servo
Copy link
Contributor

bors-servo commented Feb 25, 2020

⌛ Testing commit 60fd1e0 with merge 6165a77...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 25, 2020

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

SimonSapin commented Feb 25, 2020

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

bors-servo commented Feb 25, 2020

⌛ Testing commit 60fd1e0 with merge 54015be...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 25, 2020

☀️ Test successful - status-taskcluster
Approved by: SimonSapin
Pushing 54015be to master...
@bors-servo bors-servo merged commit 54015be into servo:master Feb 25, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
@ferjm ferjm deleted the ferjm:before.after.layout.2020 branch May 27, 2020
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
A-layout/2020
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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