Skip to content
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

Add layout_2020 support for filters and mix-blend-mode #25788

Merged
merged 2 commits into from Feb 19, 2020

Conversation

@mrobinson
Copy link
Member

mrobinson commented Feb 18, 2020


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

highfive commented Feb 18, 2020

Heads up! This PR modifies the following files:

  • @jgraham: tests/wpt/include-layout-2020.ini
  • @emilio: components/style/properties/longhands/effects.mako.rs

/// CSS filters to be applied to this stacking context (including opacity).
filters: Vec<wr::FilterOp>,

/// The blend mode with which this stacking context blends with its backdrop.
mix_blend_mode: wr::MixBlendMode,
Comment on lines 68 to 73

This comment has been minimized.

Copy link
@SimonSapin

SimonSapin Feb 18, 2020

Member

Do these need to be kept in the stacking context tree, or could they be recomputed from the &ComputedValues style of the element that generates this stacking context?

This comment has been minimized.

Copy link
@mrobinson

mrobinson Feb 18, 2020

Author Member

I think they can be recomputed. I can try to organize the code in that way.

This comment has been minimized.

Copy link
@mrobinson

mrobinson Feb 18, 2020

Author Member

Okay. I've pushed a new version of this change that minimizes data members in the StackingContext data structure.

@mrobinson mrobinson force-pushed the mrobinson:stacking-contexts-v3a branch 2 times, most recently from 9123459 to 90f1bf0 Feb 18, 2020
Copy link
Member

SimonSapin left a comment

r+ with two changes

@@ -414,3 +490,52 @@ impl AnonymousFragment {
}
}
}

pub trait ToLayout {

This comment has been minimized.

Copy link
@SimonSapin

SimonSapin Feb 18, 2020

Member

Could this reuse the geom::ToWebrender trait instead? (And perhaps move it to some other module since it’s not geometry-specific. Perhaps display_list/mod.rs since that’s the module that interacts most with WebRender?)

This comment has been minimized.

Copy link
@mrobinson

mrobinson Feb 19, 2020

Author Member

Great idea. I've moved this to a "conversions" module that is similar to the one in layout_2013.

@@ -19,5 +19,7 @@ skip: true
skip: false
[css-backgrounds]
skip: false
[filter-effects]
skip: false

This comment has been minimized.

Copy link
@SimonSapin

SimonSapin Feb 18, 2020

Member

Also add css-color for the opacity property?

This comment has been minimized.

Copy link
@mrobinson

mrobinson Feb 19, 2020

Author Member

Okay. Done.

@mrobinson mrobinson force-pushed the mrobinson:stacking-contexts-v3a branch from 90f1bf0 to d03560b Feb 19, 2020
@mrobinson
Copy link
Member Author

mrobinson commented Feb 19, 2020

@bors-servo r=SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Feb 19, 2020

📌 Commit d03560b has been approved by SimonSapin

@highfive highfive assigned SimonSapin and unassigned asajeffrey Feb 19, 2020
bors-servo added a commit that referenced this pull request Feb 19, 2020
Add layout_2020 support for filters and mix-blend-mode

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [x] 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 19, 2020

Testing commit d03560b with merge 6b29b78...

@bors-servo
Copy link
Contributor

bors-servo commented Feb 19, 2020

💔 Test failed - status-taskcluster

@SimonSapin
Copy link
Member

SimonSapin commented Feb 19, 2020

@bors-servo retry

  • #24726
  • Could not HEAD 'https://jcenter.bintray.com/com/android/databinding/compilerCommon/3.1.3/compilerCommon-3.1.3.jar'. Received status code 504 from server: Gateway Time-out
@bors-servo
Copy link
Contributor

bors-servo commented Feb 19, 2020

Testing commit d03560b with merge 0061131...

bors-servo added a commit that referenced this pull request Feb 19, 2020
Add layout_2020 support for filters and mix-blend-mode

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [x] 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 19, 2020

☀️ Test successful - status-taskcluster
Approved by: SimonSapin
Pushing 0061131 to master...

@bors-servo bors-servo merged commit d03560b into servo:master Feb 19, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
SimonSapin added a commit that referenced this pull request Feb 19, 2020
Add layout_2020 support for filters and mix-blend-mode

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [x] 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. -->
@mrobinson mrobinson deleted the mrobinson:stacking-contexts-v3a branch Feb 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.