flexbox 2020: Implement `align-items` and `align-self`, excluding `baseline` #27339

Manishearth · 2020-07-20T21:28:14Z

This PR is based on #27334 for ease of testing

baseline is tricky and involves keeping track of a "baseline set"

https://drafts.csswg.org/css-flexbox/#flex-baselines


        Handle flex item box sizing and minmax for flexbox in 2020


        flexbox 2020: Store align_items on FlexContext


        flexbox 2020: Enable align-self and align-items in CSS


        flexbox 2020: Respect the stretchiness of align-self

highfive · 2020-07-20T21:28:19Z

Heads up! This PR modifies the following files:

@emilio: components/style/properties/longhands/position.mako.rs

pcwalton · 2020-07-20T22:57:21Z

components/layout_2020/flexbox/layout.rs

+    fn align_along_cross_axis(
+        &self,
+        margin: &FlexRelativeSides<Length>,
+        size: &Length,


Maybe call this content_size or something?

pcwalton · 2020-07-20T22:57:29Z

Looks good other than that one nit

jdm · 2020-07-20T23:19:12Z

./tests/html/flexbox-align-self.html:41: no newline at EOF

Manishearth · 2020-07-20T23:33:42Z

@bors r=pcwalton p=1

prioritize over #27334

Manishearth · 2020-07-20T23:34:11Z

@SimonSapin would still appreciate a nonblocking review from you whenever you have time though

Manishearth · 2020-07-21T01:11:56Z

@bors-servo r=pcwalton p=1

oops

bors-servo · 2020-07-21T01:11:57Z

📌 Commit 4fe1501 has been approved by pcwalton


        Auto merge of #27339 - Manishearth:flex-align-items, r=pcwalton

flexbox 2020: Implement `align-items` and `align-self`, excluding `baseline` This PR is based on #27334 for ease of testing `baseline` is tricky and involves keeping track of a "baseline set" https://drafts.csswg.org/css-flexbox/#flex-baselines Part of #26639

bors-servo · 2020-07-21T02:04:20Z

⌛ Testing commit 4fe1501 with merge 1d7f80d...

bors-servo · 2020-07-21T02:19:08Z

💔 Test failed - status-taskcluster

jdm · 2020-07-21T02:30:58Z

error[E0425]: cannot find value `size` in this scope
    --> components/layout_2020/flexbox/layout.rs:1168:49
     |
1168 |                         let margin_box_cross = *size + self.pbm_auto_is_zero.cross;
     |                                                 ^^^^ not found in this scope
error[E0425]: cannot find value `size` in this scope
    --> components/layout_2020/flexbox/layout.rs:1172:49
     |
1172 |                         let margin_box_cross = *size + self.pbm_auto_is_zero.cross;
     |                                                 ^^^^ not found in this scope

Manishearth · 2020-07-21T03:16:48Z

@bors-servo r=pcwalton

bors-servo · 2020-07-21T03:16:49Z

📌 Commit f2bfa08 has been approved by pcwalton

bors-servo · 2020-07-21T03:36:19Z

⌛ Testing commit f2bfa08 with merge b9f05b3...


        Auto merge of #27339 - Manishearth:flex-align-items, r=pcwalton

flexbox 2020: Implement `align-items` and `align-self`, excluding `baseline` This PR is based on #27334 for ease of testing `baseline` is tricky and involves keeping track of a "baseline set" https://drafts.csswg.org/css-flexbox/#flex-baselines Part of #26639

bors-servo · 2020-07-21T04:08:57Z

💔 Test failed - status-taskcluster

Manishearth · 2020-07-21T04:14:29Z

test test_hang_monitoring_unregister ... ok�(B
error: test failed, to rerun pass '-p background_hang_monitor --test hang_monitor_tests'
Caused by:
  process didn't exit successfully: `/repo/target/debug/deps/hang_monitor_tests-2180465ee33d06ac` (signal: 27)

@bors-servo retry

#27315

bors-servo · 2020-07-21T04:58:48Z

⌛ Testing commit f2bfa08 with merge fa68873...


        Auto merge of #27339 - Manishearth:flex-align-items, r=pcwalton

flexbox 2020: Implement `align-items` and `align-self`, excluding `baseline` This PR is based on #27334 for ease of testing `baseline` is tricky and involves keeping track of a "baseline set" https://drafts.csswg.org/css-flexbox/#flex-baselines Part of #26639

bors-servo · 2020-07-21T05:38:05Z

💔 Test failed - status-taskcluster

Manishearth · 2020-07-21T05:51:05Z

@bors-servo retry

WR build scripts?

CYBAI · 2020-07-21T05:53:40Z

that's #27039 👀

Manishearth · 2020-07-21T05:53:43Z

     7: _ZN12_GLOBAL__N_126builtin_variable_generator11add_uniformEPK9glsl_typePKc
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/glslopt-0.1.2/glsl-optimizer/src/compiler/glsl/builtin_variables.cpp:449
     8: _ZN12_GLOBAL__N_126builtin_variable_generator17generate_uniformsEv
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/glslopt-0.1.2/glsl-optimizer/src/compiler/glsl/builtin_variables.cpp:983
     9: _Z31_mesa_glsl_initialize_variablesP9exec_listP22_mesa_glsl_parse_state
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/glslopt-0.1.2/glsl-optimizer/src/compiler/glsl/builtin_variables.cpp:1553
    10: _Z16_mesa_ast_to_hirP9exec_listP22_mesa_glsl_parse_state
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/glslopt-0.1.2/glsl-optimizer/src/compiler/glsl/ast_to_hir.cpp:131
    11: glslopt_optimize
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/glslopt-0.1.2/glsl-optimizer/src/compiler/glsl/glsl_optimizer.cpp:673
    12: glslopt::Context::optimize
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/glslopt-0.1.2/src/lib.rs:48
    13: build_script_build::write_optimized_shaders::{{closure}}
               at /root/.cargo/git/checkouts/webrender-479e138e1c1b9e8b/34d968a/webrender/build.rs:159
    14: core::ops::function::impls::<impl core::ops::function::Fn<A> for &F>::call
               at /rustc/2753fab7ce3647033146b07c8b6c9f4856a910b0/src/libcore/ops/function.rs:243
    15: build_parallel::compile_object
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/build-parallel-0.1.1/src/lib.rs:24
    16: build_parallel::compile_objects::{{closure}}::{{closure}}
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/build-parallel-0.1.1/src/lib.rs:90
    17: crossbeam_utils::thread::ScopedThreadBuilder::spawn::{{closure}}
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/crossbeam-utils-0.7.2/src/thread.rs:415
    18: crossbeam_utils::thread::ScopedThreadBuilder::spawn::{{closure}}
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/crossbeam-utils-0.7.2/src/thread.rs:423
    19: <alloc::boxed::Box<F> as core::ops::function::FnMut<A>>::call_mut
               at /rustc/2753fab7ce3647033146b07c8b6c9f4856a910b0/src/liballoc/boxed.rs:1088
    20: crossbeam_utils::thread::ScopedThreadBuilder::spawn::{{closure}}
               at /root/.cargo/registry/src/github.com-1ecc6299db9ec823/crossbeam-utils-0.7.2/src/thread.rs:431
    21: std::sys_common::backtrace::__rust_begin_short_backtrace
               at /rustc/2753fab7ce3647033146b07c8b6c9f4856a910b0/src/libstd/sys_common/backtrace.rs:130
    22: std::thread::Builder::spawn_unchecked::{{closure}}::{{closure}}
               at /rustc/2753fab7ce3647033146b07c8b6c9f4856a910b0/src/libstd/thread/mod.rs:475
    23: <std::panic::AssertUnwindSafe<F> as core::ops::function::FnOnce<()>>::call_once

bors-servo · 2020-07-21T06:36:51Z

⌛ Testing commit f2bfa08 with merge c02da14...

bors-servo · 2020-07-21T07:38:06Z

☀️ Test successful - status-taskcluster
Approved by: pcwalton
Pushing c02da14 to master...

SimonSapin · 2020-07-21T09:05:07Z

Looks good, thanks!

Manishearth added 4 commits Jul 20, 2020

Handle flex item box sizing and minmax for flexbox in 2020

Loading status checks…

6914c51

flexbox 2020: Store align_items on FlexContext

63ac4d1

flexbox 2020: Enable align-self and align-items in CSS

1af5efc

flexbox 2020: Respect the stretchiness of align-self

d1b92b6

Manishearth requested review from pcwalton and SimonSapin Jul 20, 2020

highfive assigned SimonSapin Jul 20, 2020

highfive added the S-awaiting-review label Jul 20, 2020

Manishearth added A-layout/2020 A-layout/flex labels Jul 20, 2020

pcwalton reviewed Jul 20, 2020

View changes

components/layout_2020/flexbox/layout.rs Outdated

fn align_along_cross_axis(

&self,

margin: &FlexRelativeSides<Length>,

size: &Length,

This comment has been minimized.

Sign in to view

Copy link

pcwalton Jul 20, 2020
Contributor

Maybe call this content_size or something?

Manishearth force-pushed the Manishearth:flex-align-items branch from e45ca96 to cda3620 Jul 20, 2020

Manishearth force-pushed the Manishearth:flex-align-items branch from cda3620 to 4fe1501 Jul 20, 2020

highfive assigned pcwalton and unassigned SimonSapin Jul 21, 2020

highfive added S-awaiting-merge and removed S-awaiting-review labels Jul 21, 2020

highfive added S-tests-failed and removed S-awaiting-merge labels Jul 21, 2020

highfive added the S-awaiting-review label Jul 21, 2020

highfive added S-awaiting-merge and removed S-awaiting-review labels Jul 21, 2020

highfive added S-tests-failed and removed S-awaiting-merge labels Jul 21, 2020

highfive added S-awaiting-merge and removed S-tests-failed labels Jul 21, 2020

highfive added S-tests-failed and removed S-awaiting-merge labels Jul 21, 2020

highfive added S-awaiting-merge and removed S-tests-failed labels Jul 21, 2020

bors-servo merged commit c02da14 into servo:master Jul 21, 2020
2 checks passed

2 checks passed

Community-TC (pull_request) TaskGroup: success
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Jul 21, 2020

Manishearth deleted the Manishearth:flex-align-items branch Jul 21, 2020

servo / servo

flexbox 2020: Implement `align-items` and `align-self`, excluding `baseline` #27339

flexbox 2020: Implement `align-items` and `align-self`, excluding `baseline` #27339

Manishearth commented Jul 20, 2020 •

edited

highfive commented Jul 20, 2020

This comment has been minimized.

pcwalton commented Jul 20, 2020

jdm commented Jul 20, 2020

Manishearth commented Jul 20, 2020

Manishearth commented Jul 20, 2020

Manishearth commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

jdm commented Jul 21, 2020

Manishearth commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

Manishearth commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

Manishearth commented Jul 21, 2020

CYBAI commented Jul 21, 2020

Manishearth commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

SimonSapin commented Jul 21, 2020

servo / servo

Join GitHub today

flexbox 2020: Implement `align-items` and `align-self`, excluding `baseline` #27339

flexbox 2020: Implement `align-items` and `align-self`, excluding `baseline` #27339

Conversation

Manishearth commented Jul 20, 2020 • edited

highfive commented Jul 20, 2020

This comment has been minimized.

pcwalton Jul 20, 2020

pcwalton commented Jul 20, 2020

jdm commented Jul 20, 2020

Manishearth commented Jul 20, 2020

Manishearth commented Jul 20, 2020

Manishearth commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

jdm commented Jul 21, 2020

Manishearth commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

Manishearth commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

Manishearth commented Jul 21, 2020

CYBAI commented Jul 21, 2020

Manishearth commented Jul 21, 2020

bors-servo commented Jul 21, 2020

bors-servo commented Jul 21, 2020

SimonSapin commented Jul 21, 2020

Manishearth commented Jul 20, 2020 •

edited