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

Update webrender #26823

Merged
merged 4 commits into from Jun 9, 2020
Merged

Update webrender #26823

merged 4 commits into from Jun 9, 2020

Conversation

@jdm
Copy link
Member

jdm commented Jun 8, 2020

These changes reflect changes in webrender's API that make RenderApiSender and RenderApi objects more challenging to share. This PR moves us to a model where:

  • the compositor owns the main RenderApi object
  • other threads that need to create transactions or manipulate fonts proxy those operations to the compositor (script/layout use IPC, while other threads use non-IPC channels)
  • the webgl thread owns its own independent RenderApi
@highfive
Copy link

highfive commented Jun 8, 2020

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/constellation.rs
  • @cbrewster: components/constellation/constellation.rs
  • @emilio: components/layout/display_list/webrender_helpers.rs
@highfive
Copy link

highfive commented Jun 8, 2020

warning Warning warning

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

jdm commented Jun 8, 2020

r? @asajeffrey by random selection
@highfive highfive assigned asajeffrey and unassigned ferjm Jun 8, 2020
@jdm jdm force-pushed the jdm:single-renderapi branch from 2643137 to e43f905 Jun 8, 2020
@asajeffrey
Copy link
Member

asajeffrey commented Jun 8, 2020

Ouch. LGTM, though it's a pity we need to do this. @bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 8, 2020

📌 Commit e43f905 has been approved by asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented Jun 8, 2020

⌛ Testing commit e43f905 with merge eba5c73...
bors-servo added a commit that referenced this pull request Jun 8, 2020
@bors-servo
Auto merge of #26823 - jdm:single-renderapi, r=asajeffrey
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…
eba5c73 
Update webrender

These changes reflect changes in webrender's API that make RenderApiSender and RenderApi objects more challenging to share. This PR moves us to a model where:
* the compositor owns the main RenderApi object
* other threads that need to create transactions or manipulate fonts proxy those operations to the compositor (script/layout use IPC, while other threads use non-IPC channels)
* the webgl thread owns its own independent RenderApi
@jdm jdm force-pushed the jdm:single-renderapi branch from e43f905 to 4f7216e Jun 8, 2020
@jdm
Copy link
Member Author

jdm commented Jun 8, 2020

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

bors-servo commented Jun 8, 2020

📌 Commit 4f7216e has been approved by asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented Jun 8, 2020

⌛ Testing commit 4f7216e with merge 0d296a2...
bors-servo added a commit that referenced this pull request Jun 8, 2020
@bors-servo
Auto merge of #26823 - jdm:single-renderapi, r=asajeffrey
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…
0d296a2 
Update webrender

These changes reflect changes in webrender's API that make RenderApiSender and RenderApi objects more challenging to share. This PR moves us to a model where:
* the compositor owns the main RenderApi object
* other threads that need to create transactions or manipulate fonts proxy those operations to the compositor (script/layout use IPC, while other threads use non-IPC channels)
* the webgl thread owns its own independent RenderApi
@atouchet
atouchet reviewed Jun 8, 2020
View changes
Cargo.lock
@@ -6427,7 +6423,7 @@ dependencies = [
"num-traits",
"plane-split",
"rayon",
"ron 0.1.7",

This comment has been minimized.

Sign in to view
Copy link
@atouchet

atouchet Jun 8, 2020

Contributor

Looks like ron can be removed from servo-tidy.toml.
@bors-servo
Copy link
Contributor

bors-servo commented Jun 8, 2020

💔 Test failed - status-taskcluster
@jdm jdm force-pushed the jdm:single-renderapi branch from 4f7216e to 655e6bc Jun 8, 2020
@bors-servo
Copy link
Contributor

bors-servo commented Jun 9, 2020

📌 Commit c88bea8 has been approved by asajeffrey
bors-servo added a commit that referenced this pull request Jun 9, 2020
@bors-servo
Auto merge of #26823 - jdm:single-renderapi, r=asajeffrey
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…
9de0522 
Update webrender

These changes reflect changes in webrender's API that make RenderApiSender and RenderApi objects more challenging to share. This PR moves us to a model where:
* the compositor owns the main RenderApi object
* other threads that need to create transactions or manipulate fonts proxy those operations to the compositor (script/layout use IPC, while other threads use non-IPC channels)
* the webgl thread owns its own independent RenderApi
@bors-servo
Copy link
Contributor

bors-servo commented Jun 9, 2020

⌛ Testing commit c88bea8 with merge 9de0522...
@bors-servo
Copy link
Contributor

bors-servo commented Jun 9, 2020

💔 Test failed - status-taskcluster
@jdm
script: Don't panic when IPC WebRender APIs fail during shutdown.
Loading status checks…
125bfce
@jdm
Copy link
Member Author

jdm commented Jun 9, 2020

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

bors-servo commented Jun 9, 2020

📌 Commit 125bfce has been approved by asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented Jun 9, 2020

⌛ Testing commit 125bfce with merge 93aec3a...
bors-servo added a commit that referenced this pull request Jun 9, 2020
@bors-servo
Auto merge of #26823 - jdm:single-renderapi, r=asajeffrey
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…
93aec3a 
Update webrender

These changes reflect changes in webrender's API that make RenderApiSender and RenderApi objects more challenging to share. This PR moves us to a model where:
* the compositor owns the main RenderApi object
* other threads that need to create transactions or manipulate fonts proxy those operations to the compositor (script/layout use IPC, while other threads use non-IPC channels)
* the webgl thread owns its own independent RenderApi
@bors-servo
Copy link
Contributor

bors-servo commented Jun 9, 2020

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

jdm commented Jun 9, 2020

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

bors-servo commented Jun 9, 2020

⌛ Testing commit 125bfce with merge 7eacfa4...
@bors-servo
Copy link
Contributor

bors-servo commented Jun 9, 2020

☀️ Test successful - status-taskcluster
Approved by: asajeffrey
Pushing 7eacfa4 to master...
@bors-servo bors-servo merged commit 7eacfa4 into servo:master Jun 9, 2020
1 of 2 checks passed
1 of 2 checks passed
Community-TC (pull_request) TaskGroup: failure
Details
homu Test successful
Details
@jdm jdm mentioned this pull request Jun 10, 2020
Merged
4 of 4 tasks complete
bors-servo added a commit that referenced this pull request Jun 11, 2020
@bors-servo
Auto merge of #26854 - jdm:wr-err, 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…
264b434 
Don't panic in canvas thread if webrender isn't reachable

This fixes a regression from #26823. This method is only used by the css paint worklet API, and the caller handles a communication error on the channel correctly.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #26853
- [x] There are tests for these changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@atouchet atouchet

Assignees

@asajeffrey asajeffrey

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@jdm @highfive @asajeffrey @bors-servo @atouchet @ferjm
You can’t perform that action at this time.