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

Compute content sizes lazily in layout 2020 #26968

Merged
merged 4 commits into from
Jun 19, 2020

Conversation

nox
Copy link
Contributor

@nox nox commented Jun 18, 2020

No description provided.

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @emilio: components/style/values/generics/length.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jun 18, 2020
@highfive
Copy link

warning Warning warning

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

@nox
Copy link
Contributor Author

nox commented Jun 18, 2020

@bors-servo try=wpt-2020

@bors-servo
Copy link
Contributor

⌛ Trying commit 235df94 with merge 0ecb10c...

bors-servo added a commit that referenced this pull request Jun 18, 2020
Compute content sizes lazily in layout 2020
@bors-servo
Copy link
Contributor

☀️ Test successful - status-taskcluster
State: approved= try=True

@nox nox marked this pull request as ready for review June 18, 2020 13:09
@@ -144,10 +134,40 @@ impl IndependentFormattingContext {
}
}

pub fn content_sizes(&self) -> ContentSizes {
pub fn outer_inline(
Copy link
Member

Choose a reason for hiding this comment

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

Nit: please rename this to outer_inline_content_sizes, and similarly the next method

let container = BlockContainer::InlineFormattingContext(
builder.ongoing_inline_formatting_context,
);
return (container, builder.contains_floats, content_sizes);
return (container, builder.contains_floats);
}
builder.end_ongoing_inline_formatting_context();
}

struct Accumulator {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe remove this struct and use let mut contains_floats instead?

match &self {
Self::BlockLevelBoxes(boxes) => {
let mut content_sizes = ContentSizes::zero();
for box_ in boxes {
Copy link
Member

Choose a reason for hiding this comment

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

Can we parallelize this loop with rayon?

@SimonSapin
Copy link
Member

I took the liberty of pushing to your branch. I’d like to land it in order to rebase another branch on top of it.

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 42e9d24 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 Jun 19, 2020
@highfive highfive assigned SimonSapin and unassigned ferjm Jun 19, 2020
bors-servo added a commit that referenced this pull request Jun 19, 2020
…apin

Compute content sizes lazily in layout 2020
@bors-servo
Copy link
Contributor

⌛ Testing commit 42e9d24 with merge 853e605...

@bors-servo
Copy link
Contributor

💔 Test failed - status-taskcluster

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jun 19, 2020
@jdm
Copy link
Member

jdm commented Jun 19, 2020

@bors-servo
Copy link
Contributor

⌛ Testing commit 42e9d24 with merge 4f3cf53...

bors-servo added a commit that referenced this pull request Jun 19, 2020
…apin

Compute content sizes lazily in layout 2020
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jun 19, 2020
@bors-servo
Copy link
Contributor

💔 Test failed - status-taskcluster

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jun 19, 2020
@jdm
Copy link
Member

jdm commented Jun 19, 2020

@SimonSapin
Copy link
Member

@bors-servo retry #26895

@bors-servo
Copy link
Contributor

⌛ Testing commit 42e9d24 with merge 5326359...

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jun 19, 2020
@bors-servo
Copy link
Contributor

☀️ Test successful - status-taskcluster
Approved by: SimonSapin
Pushing 5326359 to master...

@bors-servo bors-servo merged commit 5326359 into master Jun 19, 2020
@bors-servo bors-servo deleted the layout-2020-lazy-content-sizes branch June 19, 2020 18:52
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jun 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants