Commit 21b80a10 authored by Oriol Brufau's avatar Oriol Brufau
Browse files

Bug 1804696 - Re-evaluate container queries when container gets display:contents. r=emilio 

Differential Revision: https://phabricator.services.mozilla.com/D164234
parent 0fa74e7f

servo/components/style/dom.rs

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ use crate::shared_lock::{Locked, SharedRwLock}; 
use crate::stylist::CascadeData;

use crate::traversal_flags::TraversalFlags;

use crate::values::AtomIdent;

use crate::values::computed::Display;

use crate::{LocalName, Namespace, WeakAtom};

use atomic_refcell::{AtomicRef, AtomicRefMut};

use dom::ElementState;
@@ -946,7 +947,7 @@ pub trait TElement: 
    /// Returns the size of the element to be used in container size queries.

    /// This will usually be the size of the content area of the primary box,

    /// but can be None if there is no box or if some axis lacks size containment.

    fn query_container_size(&self) -> euclid::default::Size2D<Option<app_units::Au>>;

    fn query_container_size(&self, display: &Display) -> euclid::default::Size2D<Option<app_units::Au>>;

}



/// TNode and TElement aren't Send because we want to be careful and explicit

servo/components/style/gecko/wrapper.rs

+9 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ use crate::shared_lock::{Locked, SharedRwLock}; 
use crate::string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};

use crate::stylist::CascadeData;

use crate::values::{AtomIdent, AtomString};

use crate::values::computed::Display;

use crate::CaseSensitivityExt;

use crate::LocalName;

use app_units::Au;
@@ -1036,7 +1037,14 @@ impl<'le> TElement for GeckoElement<'le> { 
    }



    #[inline]

    fn query_container_size(&self) -> Size2D<Option<Au>> {

    fn query_container_size(&self, display: &Display) -> Size2D<Option<Au>> {

        // If an element gets 'display: contents' and its nsIFrame has not been removed yet,

        // Gecko_GetQueryContainerSize will not notice that it can't have size containment.

        // Other cases like 'display: inline' will be handled once the new nsIFrame is created.

        if display.is_contents() {

            return Size2D::new(None, None);

        }



        let mut width = -1;

        let mut height = -1;

        unsafe {

servo/components/style/matching.rs

+7 −0
Original line number Diff line number Diff line
@@ -976,6 +976,13 @@ pub trait MatchMethods: TElement { 
            // Stopped being a size container. Re-evaluate container queries and units on all our descendants.

            // Changes into and between different size containment is handled in `UpdateContainerQueryStyles`.

            restyle_requirement = ChildRestyleRequirement::MustMatchDescendants;

        } else if old_container_type.is_size_container_type() &&

            !old_primary_style.is_display_contents() &&

            new_primary_style.is_display_contents()

        {

            // Also re-evaluate when a container gets 'display: contents', since size queries will now evaluate to unknown.

            // Other displays like 'inline' will keep generating a box, so they are handled in `UpdateContainerQueryStyles`.

            restyle_requirement = ChildRestyleRequirement::MustMatchDescendants;

        }



        restyle_requirement = cmp::max(

servo/components/style/stylesheets/container_rule.rs

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ impl ContainerCondition { 
            }

        }



        let size = potential_container.query_container_size();

        let size = potential_container.query_container_size(&box_style.clone_display());

        let style = style.clone();

        TraversalResult::Done(ContainerLookupResult {

            element: potential_container,
@@ -464,7 +464,7 @@ impl<'a> ContainerSizeQuery<'a> { 
        let box_style = style.get_box();



        let container_type = box_style.clone_container_type();

        let size = e.query_container_size();

        let size = e.query_container_size(&box_style.clone_display());

        match container_type {

            ContainerType::Size => {

                TraversalResult::Done(

testing/web-platform/meta/css/css-contain/container-queries/display-contents.html.ini

+0 −5
Original line number Diff line number Diff line 
[display-contents.html]

  expected:

    if (os == "android") and fission: [OK, TIMEOUT]
 
  [getComputedStyle when container becomes display:contents]

    expected: FAIL



  [getComputedStyle when intermediate container becomes display:contents]

    expected: FAIL