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

Enable css tables #31470

Merged
merged 1 commit into from Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions components/config/prefs.rs
Expand Up @@ -519,9 +519,6 @@ mod gen {
enabled: bool,
},
legacy_layout: bool,
tables: {
enabled: bool,
},
#[serde(default = "default_layout_threads")]
threads: i64,
writing_mode: {
Expand Down
14 changes: 4 additions & 10 deletions components/layout_2020/style_ext.rs
Expand Up @@ -3,7 +3,6 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */

use app_units::Au;
use servo_config::pref;
use style::computed_values::mix_blend_mode::T as ComputedMixBlendMode;
use style::computed_values::position::T as ComputedPosition;
use style::computed_values::transform_style::T as ComputedTransformStyle;
Expand Down Expand Up @@ -580,13 +579,12 @@ impl From<stylo::Display> for Display {
let outside = match outside {
stylo::DisplayOutside::Block => DisplayOutside::Block,
stylo::DisplayOutside::Inline => DisplayOutside::Inline,
stylo::DisplayOutside::TableCaption if pref!(layout.tables.enabled) => {
stylo::DisplayOutside::TableCaption => {
return Display::GeneratingBox(DisplayGeneratingBox::LayoutInternal(
DisplayLayoutInternal::TableCaption,
));
},
stylo::DisplayOutside::TableCaption => DisplayOutside::Block,
stylo::DisplayOutside::InternalTable if pref!(layout.tables.enabled) => {
stylo::DisplayOutside::InternalTable => {
let internal = match inside {
stylo::DisplayInside::TableRowGroup => DisplayLayoutInternal::TableRowGroup,
stylo::DisplayInside::TableColumn => DisplayLayoutInternal::TableColumn,
Expand All @@ -605,7 +603,6 @@ impl From<stylo::Display> for Display {
};
return Display::GeneratingBox(DisplayGeneratingBox::LayoutInternal(internal));
},
stylo::DisplayOutside::InternalTable => DisplayOutside::Block,
// This should not be a value of DisplayInside, but oh well
// special-case display: contents because we still want it to work despite the early return
stylo::DisplayOutside::None if inside == stylo::DisplayInside::Contents => {
Expand All @@ -627,17 +624,14 @@ impl From<stylo::Display> for Display {
stylo::DisplayInside::None => return Display::None,
stylo::DisplayInside::Contents => return Display::Contents,

stylo::DisplayInside::Table if pref!(layout.tables.enabled) => DisplayInside::Table,
stylo::DisplayInside::Table |
stylo::DisplayInside::Table => DisplayInside::Table,
stylo::DisplayInside::TableRowGroup |
stylo::DisplayInside::TableColumn |
stylo::DisplayInside::TableColumnGroup |
stylo::DisplayInside::TableHeaderGroup |
stylo::DisplayInside::TableFooterGroup |
stylo::DisplayInside::TableRow |
stylo::DisplayInside::TableCell => DisplayInside::Flow {
is_list_item: packed.is_list_item(),
},
stylo::DisplayInside::TableCell => unreachable!("Internal DisplayInside found"),
};
Display::GeneratingBox(DisplayGeneratingBox::OutsideInside { outside, inside })
}
Expand Down
1 change: 0 additions & 1 deletion resources/prefs.json
Expand Up @@ -101,7 +101,6 @@
"layout.columns.enabled": false,
"layout.flexbox.enabled": false,
"layout.legacy_layout": false,
"layout.tables.enabled": false,
"layout.threads": 3,
"layout.writing-mode.enabled": false,
"media.glvideo.enabled": false,
Expand Down
@@ -0,0 +1,2 @@
[table-caption-is-containing-block-001.html]
expected: FAIL
@@ -0,0 +1,2 @@
[table-caption-passes-abspos-up-001.html]
expected: FAIL
2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-048.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-055.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-060.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-078.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-081.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-090.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-093.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-096.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-104.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-106.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-111.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-114.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-117.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-120.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-128.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-130.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-135.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-138.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-141.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-144.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-152.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-154.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-184.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-188.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-190.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-194.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/backgrounds/background-196.xht.ini

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -0,0 +1,2 @@
[background-applies-to-015.xht]
expected: FAIL

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -0,0 +1,2 @@
[background-color-applies-to-015.xht]
expected: FAIL

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -0,0 +1,2 @@
[background-image-applies-to-015.xht]
expected: FAIL

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -0,0 +1,2 @@
[background-position-applies-to-015.xht]
expected: FAIL

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -0,0 +1,2 @@
[background-repeat-applies-to-015.xht]
expected: FAIL

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/borders/border-applies-to-013.xht.ini

This file was deleted.

2 changes: 0 additions & 2 deletions tests/wpt/meta/css/CSS2/borders/border-applies-to-014.xht.ini

This file was deleted.

2 changes: 2 additions & 0 deletions tests/wpt/meta/css/CSS2/borders/border-applies-to-015.xht.ini
@@ -0,0 +1,2 @@
[border-applies-to-015.xht]
expected: FAIL
@@ -0,0 +1,2 @@
[border-bottom-applies-to-001.xht]
expected: FAIL
@@ -0,0 +1,2 @@
[border-bottom-applies-to-002.xht]
expected: FAIL
@@ -0,0 +1,2 @@
[border-bottom-applies-to-003.xht]
expected: FAIL