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

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
Member

nox commented Sep 9, 2019 •
edited by SimonSapin

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!
@SimonSapin SimonSapin force-pushed the nox:victor branch 2 times, most recently from d159564 to a7526ba Sep 9, 2019
@paulrouget paulrouget removed their assignment Sep 10, 2019
@emilio
emilio reviewed Sep 10, 2019
View changes
components/style/values/specified/box.rs Show resolved Hide resolved
components/style/values/specified/box.rs
@@ -352,12 +393,14 @@ impl Display {
match self.outside() {
DisplayOutside::Inline => {
let inside = match self.inside() {
#[cfg(any(feature = "servo-layout-2013", feature = "gecko"))]

This comment has been minimized.

Sign in to view
Copy link
@emilio

emilio Sep 10, 2019

Member

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

This comment has been minimized.

Sign in to view
Copy link
@nox

nox Sep 10, 2019

Author Member

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.

This comment has been minimized.

Sign in to view
Copy link
@nox

nox Sep 11, 2019

Author Member

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

This comment has been minimized.

Sign in to view
Copy link
@nox

nox Sep 11, 2019

Author Member

Err, I meant I made it store DisplayInline::Flow, sorry.
@SimonSapin
SimonSapin reviewed Sep 10, 2019
View changes
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

SimonSapin commented Sep 10, 2019

r+ with nits

Thanks @nox!
nox and others added 5 commits Aug 20, 2019
@nox
Kill fragments
d0d4bb7
@nox
Remove some more code
eaf08ef
@nox
Rename RecalcStyleAndConstructFlows to RecalcStyle
be0e84b 
It doesn't construct flows anymore.
@SimonSapin @nox
Import files from Victor
8690475 
https://github.com/SimonSapin/victor/tree/fdb11f3e87f6d2d59170d10169fa6deb94e53b94
@nox
Import victor's layout system 🍷
Loading status checks…
4444c5a
@nox nox force-pushed the nox:victor branch from a7526ba to 4444c5a Sep 11, 2019
@nox
Copy link
Member Author

nox commented Sep 11, 2019

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

bors-servo commented Sep 11, 2019

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

bors-servo commented Sep 11, 2019

⌛ Testing commit 4444c5a with merge 86ad841...
bors-servo added a commit that referenced this pull request Sep 11, 2019
@bors-servo
Auto merge of #24165 - nox:victor, 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…
86ad841 
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

bors-servo commented Sep 11, 2019

☀️ 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
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
Taskcluster (pull_request) TaskGroup: success
Details
homu Test successful
Details
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Sep 13, 2019
@emilio
Bug 1580963 - Cherry-pick style changes from servo's victor import.
5c93ac4 
servo/servo#24165

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

--HG--
extra : moz-landing-system : lando
xeonchen pushed a commit to xeonchen/gecko that referenced this pull request Sep 13, 2019
@emilio
Bug 1580963 - Cherry-pick style changes from servo's victor import.
2652ec7 
servo/servo#24165

Differential Revision: https://phabricator.services.mozilla.com/D45740
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 4, 2019
@marco-c
Bug 1580963 - Cherry-pick style changes from servo's victor import.
b4e52f9 
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
@marco-c
Bug 1580963 - Cherry-pick style changes from servo's victor import.
0e5056c 
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
@marco-c
Bug 1580963 - Cherry-pick style changes from servo's victor import.
e100f86 
servo/servo#24165

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

UltraBlame original commit: ff80bc57d655e8da75c74e99830ff3346c0bbb1c
@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
Reviewers

@SimonSapin SimonSapin

@emilio emilio

Assignees

@SimonSapin SimonSapin

Labels
A-layout/2020
Projects
Layout 2020
  
Merged / resolved
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@nox @highfive @SimonSapin @bors-servo @emilio @paulrouget
You can’t perform that action at this time.