From b85a5dac5d65856366046b29f0a74c7f9079b065 Mon Sep 17 00:00:00 2001
From: Matthias Deiml <matthias@deiml.net>
Date: Sun, 14 Jun 2020 00:02:51 +0200
Subject: [PATCH] Implement visibility for layout_2020

---
 components/layout_2020/display_list/mod.rs    | 51 ++++++++++++-------
 .../longhands/inherited_box.mako.rs           |  4 +-
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/components/layout_2020/display_list/mod.rs b/components/layout_2020/display_list/mod.rs
index 93279212246..4fc0c390d0d 100644
--- a/components/layout_2020/display_list/mod.rs
+++ b/components/layout_2020/display_list/mod.rs
@@ -16,6 +16,7 @@ use net_traits::image_cache::UsePlaceholder;
 use std::sync::Arc;
 use style::computed_values::text_decoration_style::T as ComputedTextDecorationStyle;
 use style::dom::OpaqueNode;
+use style::properties::longhands::visibility::computed_value::T as Visibility;
 use style::properties::ComputedValues;
 use style::values::computed::{BorderStyle, Length, LengthPercentage};
 use style::values::specified::text::TextDecorationLine;
@@ -93,28 +94,42 @@ impl Fragment {
         containing_block: &PhysicalRect<Length>,
     ) {
         match self {
-            Fragment::Box(b) => BuilderForBoxFragment::new(b, containing_block).build(builder),
+            Fragment::Box(b) => match b.style.get_inherited_box().visibility {
+                Visibility::Visible => {
+                    BuilderForBoxFragment::new(b, containing_block).build(builder)
+                },
+                Visibility::Hidden => (),
+                Visibility::Collapse => (),
+            },
             Fragment::AbsoluteOrFixedPositioned(_) => {},
             Fragment::Anonymous(_) => {},
-            Fragment::Image(i) => {
-                builder.is_contentful = true;
-                let rect = i
-                    .rect
-                    .to_physical(i.style.writing_mode, containing_block)
-                    .translate(containing_block.origin.to_vector());
+            Fragment::Image(i) => match i.style.get_inherited_box().visibility {
+                Visibility::Visible => {
+                    builder.is_contentful = true;
+                    let rect = i
+                        .rect
+                        .to_physical(i.style.writing_mode, containing_block)
+                        .translate(containing_block.origin.to_vector());
 
-                let common = builder.common_properties(rect.to_webrender(), &i.style);
-                builder.wr.push_image(
-                    &common,
-                    rect.to_webrender(),
-                    image_rendering(i.style.get_inherited_box().image_rendering),
-                    wr::AlphaType::PremultipliedAlpha,
-                    i.image_key,
-                    wr::ColorF::WHITE,
-                );
+                    let common = builder.common_properties(rect.to_webrender(), &i.style);
+                    builder.wr.push_image(
+                        &common,
+                        rect.to_webrender(),
+                        image_rendering(i.style.get_inherited_box().image_rendering),
+                        wr::AlphaType::PremultipliedAlpha,
+                        i.image_key,
+                        wr::ColorF::WHITE,
+                    );
+                },
+                Visibility::Hidden => (),
+                Visibility::Collapse => (),
             },
-            Fragment::Text(t) => {
-                self.build_display_list_for_text_fragment(t, builder, containing_block)
+            Fragment::Text(t) => match t.parent_style.get_inherited_box().visibility {
+                Visibility::Visible => {
+                    self.build_display_list_for_text_fragment(t, builder, containing_block)
+                },
+                Visibility::Hidden => (),
+                Visibility::Collapse => (),
             },
         }
     }
diff --git a/components/style/properties/longhands/inherited_box.mako.rs b/components/style/properties/longhands/inherited_box.mako.rs
index fe2cc5ed024..37d86d62695 100644
--- a/components/style/properties/longhands/inherited_box.mako.rs
+++ b/components/style/properties/longhands/inherited_box.mako.rs
@@ -9,10 +9,8 @@
 // TODO: collapse. Well, do tables first.
 ${helpers.single_keyword(
     "visibility",
-    "visible hidden",
+    "visible hidden collapse",
     engines="gecko servo-2013 servo-2020",
-    servo_2020_pref="layout.2020.unimplemented",
-    extra_gecko_values="collapse",
     gecko_ffi_name="mVisible",
     animation_value_type="ComputedValue",
     spec="https://drafts.csswg.org/css-box/#propdef-visibility",