mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #18175 - stshine:no-floats-in-flexbox, r=mbrubeck
layout: Stop call normal block size assignment for flex container No need to call the `assign_block_size_block_base()` method of normal block in flex.rs since it is implemented for CSS2. <!-- Please describe your changes on the following line: --> --- <!-- 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 - [X] These changes fix #14813 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes <!-- 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. --> <!-- 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/18175) <!-- Reviewable:end -->
This commit is contained in:
commit
7e363d60bb
16 changed files with 29 additions and 50 deletions
|
@ -1429,6 +1429,9 @@ impl BlockFlow {
|
|||
/// Determines the type of formatting context this is. See the definition of
|
||||
/// `FormattingContextType`.
|
||||
pub fn formatting_context_type(&self) -> FormattingContextType {
|
||||
if self.is_inline_flex_item() || self.is_block_flex_item() {
|
||||
return FormattingContextType::Other
|
||||
}
|
||||
let style = self.fragment.style();
|
||||
if style.get_box().float != float::T::none {
|
||||
return FormattingContextType::Other
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue