Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-26 23:58:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: Mark the entire shadow tree for restyle when its stylesheet is invalidated (#38529)

Browse source 
This change fix this bugs: modify stylesheet of shadow tree does not
take effect if there is no other Dom change within the shadow tree
happens.

Fixes: This change fix some bugs reported by this issue #38211. 
Testing: This fixes some subtests in
`/css/cssom/CSSStyleSheet-constructable.html` and
`/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html`,
and make some subtest failed in
`/css/cssom/CSSStyleSheet-constructable-baseURL.html`, because the
`BaseUrl` is not yet supported for `CSSStylesheet`.

Signed-off-by: sharpshooter_pt <ibluegalaxy_taoj@163.com>
This commit is contained in:
JoeDow 2025-08-18 20:48:35 +08:00 • committed by GitHub
parent 5c885d61ad
commit ce16fbce75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/shadowroot.rs
View file

@ -14,6 +14,7 @@ use script_bindings::script_runtime::JSContext;
use servo_arc::Arc; use servo_arc::Arc;
use style::author_styles::AuthorStyles; use style::author_styles::AuthorStyles;
use style::dom::TElement; use style::dom::TElement;
use style::invalidation::element::restyle_hints::RestyleHint;
use style::shared_lock::SharedRwLockReadGuard; use style::shared_lock::SharedRwLockReadGuard;
use style::stylesheets::Stylesheet; use style::stylesheets::Stylesheet;
use style::stylist::{CascadeData, Stylist}; use style::stylist::{CascadeData, Stylist};
@ -270,6 +271,11 @@ impl ShadowRoot {
// Mark the host element dirty so a reflow will be performed. // Mark the host element dirty so a reflow will be performed.
if let Some(host) = self.host.get() { if let Some(host) = self.host.get() {
host.upcast::<Node>().dirty(NodeDamage::Style); host.upcast::<Node>().dirty(NodeDamage::Style);
// Also mark the host element with `RestyleHint::restyle_subtree` so a reflow
// can traverse into the shadow tree.
let mut restyle = self.document.ensure_pending_restyle(&host);
restyle.hint.insert(RestyleHint::restyle_subtree());
} }
} }

6
tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-baseURL.html.ini vendored
View file

@ -1,3 +1,9 @@
[CSSStyleSheet-constructable-baseURL.html] [CSSStyleSheet-constructable-baseURL.html]
[Constructing sheet with custom base URL ueses that URL for CSS rules]
expected: FAIL
[Constructing sheet with relative URL adds to the constructor document's base URL]
expected: FAIL
[Constructing sheet with invalid base URL throws a NotAllowedError] [Constructing sheet with invalid base URL throws a NotAllowedError]
expected: FAIL expected: FAIL

6
tests/wpt/meta/css/cssom/CSSStyleSheet-constructable-disallow-import.tentative.html.ini vendored
View file

@ -1,9 +1,3 @@
[CSSStyleSheet-constructable-disallow-import.tentative.html] [CSSStyleSheet-constructable-disallow-import.tentative.html]
[@import rules are not parsed in CSSStyleSheet.replaceSync]
expected: FAIL
[@import rules are not parsed in CSSStyleSheet.replace]
expected: FAIL
[@import rules should not trigger any loads.] [@import rules should not trigger any loads.]
expected: FAIL expected: FAIL

3
tests/wpt/meta/css/cssom/CSSStyleSheet-constructable.html.ini vendored
View file

@ -14,9 +14,6 @@
[Constructed stylesheet can be used and modified in multiple TreeScopes] [Constructed stylesheet can be used and modified in multiple TreeScopes]
expected: FAIL expected: FAIL
[CSSStyleSheet.replaceSync correctly updates the style of its adopters synchronously]
expected: FAIL
[Adopted sheets are ordered after non-adopted sheets in the shadow root] [Adopted sheets are ordered after non-adopted sheets in the shadow root]
expected: FAIL expected: FAIL