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

Import victor's layout system 🍷 #24165

Merged
merged 5 commits into from Sep 11, 2019
Merged

Import victor's layout system 🍷 #24165

merged 5 commits into from Sep 11, 2019

Conversation

nox
Copy link
Contributor

@nox nox commented Sep 9, 2019

This change is Reviewable

@highfive
Copy link

highfive commented Sep 9, 2019

Heads up! This PR modifies the following files:

  • @emilio: components/style/values/generics/length.rs, components/style/style_adjuster.rs, components/layout/model.rs, components/style/values/computed/length.rs, components/style/values/specified/box.rs

@highfive
Copy link

highfive commented Sep 9, 2019

warning Warning warning

  • These commits modify style and layout code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 9, 2019
@paulrouget paulrouget removed their assignment Sep 10, 2019
components/style/values/specified/box.rs Show resolved Hide resolved
@@ -352,12 +393,14 @@ impl Display {
match self.outside() {
DisplayOutside::Inline => {
let inside = match self.inside() {
#[cfg(any(feature = "servo-layout-2013", feature = "gecko"))]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#[cfg]ing this out is wrong, why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't keep it, I removed DisplayInside::Block and DisplayInside::Inline. Those are hacks to make layout supposedly easier, but it's just hindering layout 2020.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added back a blockification which makes it store DisplayInside::FlowRoot with servo-layout-2020.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Err, I meant I made it store DisplayInline::Flow, sorry.

components/layout_2020/lib.rs Show resolved Hide resolved
components/layout_2020/dom_traversal.rs Show resolved Hide resolved
components/layout_2020/primitives.rs Outdated Show resolved Hide resolved
components/layout_2020/style_ext.rs Outdated Show resolved Hide resolved
components/layout_2020/flow/construct.rs Show resolved Hide resolved
@SimonSapin
Copy link
Member

r+ with nits

Thanks @nox!

@nox
Copy link
Contributor Author

nox commented Sep 11, 2019

@bors-servo r=SimonSapin

@bors-servo
Copy link
Contributor

📌 Commit 4444c5a has been approved by SimonSapin

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 11, 2019
@bors-servo
Copy link
Contributor

⌛ Testing commit 4444c5a with merge 86ad841...

bors-servo pushed a commit that referenced this pull request Sep 11, 2019
Import victor's layout system 🍷

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

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: SimonSapin
Pushing 86ad841 to master...

@bors-servo bors-servo merged commit 4444c5a into servo:master Sep 11, 2019
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 11, 2019
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Sep 13, 2019
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 4, 2019
servo/servo#24165

Differential Revision: https://phabricator.services.mozilla.com/D45740

UltraBlame original commit: ff80bc57d655e8da75c74e99830ff3346c0bbb1c
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 4, 2019
servo/servo#24165

Differential Revision: https://phabricator.services.mozilla.com/D45740

UltraBlame original commit: ff80bc57d655e8da75c74e99830ff3346c0bbb1c
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 4, 2019
servo/servo#24165

Differential Revision: https://phabricator.services.mozilla.com/D45740

UltraBlame original commit: ff80bc57d655e8da75c74e99830ff3346c0bbb1c
@SimonSapin SimonSapin added the A-layout/2020 https://github.com/servo/servo/wiki/Layout-2020 label Dec 6, 2019
@SimonSapin SimonSapin added this to Done / resolved in Layout 2020 Dec 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-layout/2020 https://github.com/servo/servo/wiki/Layout-2020
Projects
Status: Merged / resolved
Layout 2020
  
Merged / resolved
Development

Successfully merging this pull request may close these issues.

None yet

6 participants