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

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

Merged
merged 7 commits into from Jul 21, 2020

Conversation

Manishearth
Copy link
Member

@Manishearth Manishearth commented Jul 20, 2020

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

@highfive
Copy link

highfive commented Jul 20, 2020

Heads up! This PR modifies the following files:

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

@Manishearth Manishearth added A-layout/2020 A-layout/flex labels Jul 20, 2020
fn align_along_cross_axis(
&self,
margin: &FlexRelativeSides<Length>,
size: &Length,
Copy link
Contributor

@pcwalton pcwalton Jul 20, 2020

Choose a reason for hiding this comment

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

Maybe call this content_size or something?

@pcwalton
Copy link
Contributor

pcwalton commented Jul 20, 2020

Looks good other than that one nit

@jdm
Copy link
Member

jdm commented Jul 20, 2020

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

@Manishearth
Copy link
Member Author

Manishearth commented Jul 20, 2020

@bors r=pcwalton p=1

prioritize over #27334

@Manishearth
Copy link
Member Author

Manishearth commented Jul 20, 2020

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

@Manishearth
Copy link
Member Author

Manishearth commented Jul 21, 2020

@bors-servo r=pcwalton p=1

oops

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2020

📌 Commit 4fe1501 has been approved by pcwalton

@highfive highfive assigned pcwalton and unassigned SimonSapin Jul 21, 2020
bors-servo added a commit that referenced this issue Jul 21, 2020
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
Copy link
Contributor

bors-servo commented Jul 21, 2020

Testing commit 4fe1501 with merge 1d7f80d...

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2020

💔 Test failed - status-taskcluster

@jdm
Copy link
Member

jdm commented Jul 21, 2020

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
Copy link
Member Author

Manishearth commented Jul 21, 2020

@bors-servo r=pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2020

📌 Commit f2bfa08 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2020

Testing commit f2bfa08 with merge b9f05b3...

bors-servo added a commit that referenced this issue Jul 21, 2020
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
Copy link
Contributor

bors-servo commented Jul 21, 2020

💔 Test failed - status-taskcluster

@Manishearth
Copy link
Member Author

Manishearth commented Jul 21, 2020

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

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2020

Testing commit f2bfa08 with merge fa68873...

bors-servo added a commit that referenced this issue Jul 21, 2020
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
Copy link
Contributor

bors-servo commented Jul 21, 2020

💔 Test failed - status-taskcluster

@Manishearth
Copy link
Member Author

Manishearth commented Jul 21, 2020

@bors-servo retry

WR build scripts?

@CYBAI
Copy link
Member

CYBAI commented Jul 21, 2020

that's #27039 👀

@Manishearth
Copy link
Member Author

Manishearth commented Jul 21, 2020

     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
Copy link
Contributor

bors-servo commented Jul 21, 2020

Testing commit f2bfa08 with merge c02da14...

@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2020

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

@bors-servo bors-servo merged commit c02da14 into servo:master Jul 21, 2020
2 checks passed
@SimonSapin
Copy link
Member

SimonSapin commented Jul 21, 2020

Looks good, thanks!

@Manishearth Manishearth deleted the flex-align-items branch Jul 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-layout/flex A-layout/2020
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants