Start supporting images in layout 2020 #24928

nox · 2019-11-29T12:48:53Z

No description provided.

highfive · 2019-11-29T12:48:58Z

Heads up! This PR modifies the following files:

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

highfive · 2019-11-29T12:49:01Z

Warning

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

SimonSapin · 2019-11-29T17:06:47Z

components/layout_2020/flow/mod.rs

+    match (computed_margin_inline_start, computed_margin_inline_end) {
+        (LengthOrAuto::Auto, LengthOrAuto::Auto) => (inline_margins / 2., inline_margins / 2.),
+        (LengthOrAuto::Auto, LengthOrAuto::LengthPercentage(end)) => (inline_margins - end, end),
+        (LengthOrAuto::LengthPercentage(start), _) => (start, inline_margins - start),


Nit: This _ can only be Auto, right? Could we make it a specific pattern?

It can be LengthOrAuto::LengthPercentage too, which we ignore because that's over-constraining.

SimonSapin · 2019-11-29T17:06:47Z

components/layout_2020/replaced.rs

+    ) -> IndependentLayout {
+        let (fragments, content_block_size) = match self.kind {
+            ReplacedContentKind::Image(ref image) => {
+                // FIXME(nox): We should not assume block size is known.


Or, on the contrary, isn’t it always known for replaced boxes and should we take DefiniteContainingBlock here instead?

You are right, at that point we should know both sizes, I'll make it use DefiniteContainingBlock.

Alright, r=me with that.

It turns out we can't do that: this is also called from IndependentFormattingContext::layout, where we don't know for sure the block size.

Tbh that makes me wonder if we shouldn't separate replaced content from independent formatting contexts.

Yeah I considered that when reading your previous message. Or if not separate data types, at least remove IndependentFormattingContext::layout and make parent boxes call IndependentFormattingContext::as_replaced themselves.

That doesn’t need to happen in this PR though. I’ll r+

SimonSapin · 2019-11-30T21:56:38Z

@bors-servo r+

bors-servo · 2019-11-30T21:56:39Z

📌 Commit 686243e has been approved by SimonSapin

bors-servo · 2019-11-30T22:30:03Z

⌛ Testing commit 686243e with merge c99b1ad...


        Auto merge of #24928 - servo:2020-images, r=SimonSapin

Start supporting images in layout 2020

bors-servo · 2019-11-30T22:56:41Z

💔 Test failed - status-taskcluster

SimonSapin · 2019-12-01T00:02:35Z

One failure in layout 2020 mode, could be legit?

  ▶ FAIL [expected CRASH] /css/CSS2/box-display/containing-block-007.xht
  └   → /css/CSS2/box-display/containing-block-007.xht 8ad90a71ec464d4cd92c5f8f5343f88d4e6f4902
/css/CSS2/box-display/containing-block-007-ref.xht 46b4d6b0ef99e6a3b5982147134474a332c2e7a1


        Fix an unimplemented in layout 2020


        Make InlineLevelBox::Atomic store an IndependentFormattingContext


        Fix inline margins of in flow blocks in 2020


        Start supporting images in layout 2020

SimonSapin · 2019-12-01T09:58:42Z

The fixed crash is due to removing on unimplemented!. I’ve updated WPT expectations.

@bors-servo r+

bors-servo · 2019-12-01T09:58:43Z

📌 Commit 5a360ac has been approved by SimonSapin

bors-servo · 2019-12-01T09:58:48Z

⌛ Testing commit 5a360ac with merge e2dd15a...


        Auto merge of #24928 - servo:2020-images, r=SimonSapin

Start supporting images in layout 2020

bors-servo · 2019-12-01T10:44:50Z

💔 Test failed - status-taskcluster

SimonSapin · 2019-12-01T10:47:56Z

@bors-servo retry #24726

bors-servo · 2019-12-01T10:48:01Z

⌛ Testing commit 5a360ac with merge 73ce1fa...


        Auto merge of #24928 - servo:2020-images, r=SimonSapin

Start supporting images in layout 2020

bors-servo · 2019-12-01T11:17:41Z

💔 Test failed - status-taskcluster

SimonSapin · 2019-12-01T14:50:48Z

@bors-servo retry #24622

bors-servo · 2019-12-01T14:53:47Z

⌛ Testing commit 5a360ac with merge 40fd791...


        Auto merge of #24928 - servo:2020-images, r=SimonSapin

Start supporting images in layout 2020

bors-servo · 2019-12-01T14:54:39Z

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

highfive assigned SimonSapin Nov 29, 2019

highfive added the S-awaiting-review label Nov 29, 2019

SimonSapin approved these changes Nov 29, 2019

View changes

highfive added S-awaiting-merge and removed S-awaiting-review labels Nov 30, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Nov 30, 2019

nox added 4 commits Nov 28, 2019

Fix an unimplemented in layout 2020

ecfb822

Make InlineLevelBox::Atomic store an IndependentFormattingContext

48a4a82

Fix inline margins of in flow blocks in 2020

f24e8d0

Start supporting images in layout 2020

Loading status checks…

5a360ac

SimonSapin force-pushed the 2020-images branch from 686243e to 5a360ac Dec 1, 2019

highfive added S-awaiting-review and removed S-tests-failed labels Dec 1, 2019

highfive added S-awaiting-merge and removed S-awaiting-review labels Dec 1, 2019

highfive removed the S-awaiting-merge label Dec 1, 2019

highfive added the S-tests-failed label Dec 1, 2019

highfive added S-awaiting-merge and removed S-tests-failed labels Dec 1, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Dec 1, 2019

highfive added S-awaiting-merge and removed S-tests-failed labels Dec 1, 2019

bors-servo merged commit 5a360ac into master Dec 1, 2019
2 checks passed

2 checks passed

Community-TC (pull_request) TaskGroup: success
Details

homu Test successful
Details

bors-servo deleted the 2020-images branch Dec 1, 2019

highfive removed the S-awaiting-merge label Dec 1, 2019

SimonSapin mentioned this pull request Dec 3, 2019

Meta: https://servo.org in Layout 2020 #25041

Closed

3 of 8 tasks complete

SimonSapin added the A-layout/2020 label Dec 6, 2019

SimonSapin added this to Done / resolved in Layout 2020 Dec 6, 2019

servo / servo

Start supporting images in layout 2020 #24928

Start supporting images in layout 2020 #24928

nox commented Nov 29, 2019

highfive commented Nov 29, 2019

highfive commented Nov 29, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

SimonSapin commented Nov 30, 2019

bors-servo commented Nov 30, 2019

bors-servo commented Nov 30, 2019

bors-servo commented Nov 30, 2019

SimonSapin commented Dec 1, 2019

SimonSapin commented Dec 1, 2019

bors-servo commented Dec 1, 2019

bors-servo commented Dec 1, 2019

bors-servo commented Dec 1, 2019

SimonSapin commented Dec 1, 2019

bors-servo commented Dec 1, 2019

bors-servo commented Dec 1, 2019

SimonSapin commented Dec 1, 2019

bors-servo commented Dec 1, 2019

bors-servo commented Dec 1, 2019

servo / servo

Join GitHub today

Start supporting images in layout 2020 #24928

Start supporting images in layout 2020 #24928

Conversation

nox commented Nov 29, 2019

highfive commented Nov 29, 2019

highfive commented Nov 29, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

SimonSapin commented Nov 30, 2019

bors-servo commented Nov 30, 2019

bors-servo commented Nov 30, 2019

bors-servo commented Nov 30, 2019

SimonSapin commented Dec 1, 2019

SimonSapin commented Dec 1, 2019

bors-servo commented Dec 1, 2019

bors-servo commented Dec 1, 2019

bors-servo commented Dec 1, 2019

SimonSapin commented Dec 1, 2019

bors-servo commented Dec 1, 2019

bors-servo commented Dec 1, 2019

SimonSapin commented Dec 1, 2019

bors-servo commented Dec 1, 2019

bors-servo commented Dec 1, 2019