Skip to content

Commit e554cf3

Browse files
vmpstrChromium LUCI CQ
authored and
Chromium LUCI CQ
committed
VT: Remove containment requirement.
This patch removes the containment requirement from view-transitions. This is to align with proposed resolution w3c/csswg-drafts#7882 [email protected], [email protected] Fixed: 1409491 Change-Id: Iad0eb54c8d2de503f209a58a9f438e586fcd6a36 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4188811 Reviewed-by: David Bokan Reviewed-by: Khushal Sagar Commit-Queue: Vladimir Levin Cr-Commit-Position: refs/heads/main@{#1096187}
1 parent e245da2 commit e554cf3

36 files changed

+3
-252
lines changed

third_party/blink/renderer/core/view_transition/view_transition_style_tracker.cc

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
namespace blink {
4646
namespace {
4747

48-
const char* kContainmentNotSatisfied =
49-
"Aborting transition. Element must contain paint or layout for "
50-
"view-transition-name : ";
5148
const char* kDuplicateTagBaseError =
5249
"Unexpected duplicate view-transition-name: ";
5350

@@ -65,11 +62,6 @@ const String& AnimationUAStyles() {
6562
return kAnimationUAStyles;
6663
}
6764

68-
bool SatisfiesContainment(const LayoutObject& object) {
69-
return object.ShouldApplyPaintContainment() ||
70-
object.ShouldApplyLayoutContainment();
71-
}
72-
7365
absl::optional ComputeInsetDifference(PhysicalRect reference_rect,
7466
const LayoutRect& target_rect,
7567
float device_pixel_ratio) {
@@ -346,25 +338,6 @@ bool ViewTransitionStyleTracker::FlattenAndVerifyElements(
346338
VectorOf& elements,
347339
VectorOf& transition_names,
348340
absl::optional& root_data) {
349-
for (const auto& element : ViewTransitionSupplement::From(*document_)
350-
->ElementsWithViewTransitionName()) {
351-
DCHECK(element->ComputedStyleRef().ViewTransitionName());
352-
353-
// Ignore elements which are not rendered.
354-
if (!element->GetLayoutObject())
355-
continue;
356-
357-
// Skip the transition if containment is not satisfied.
358-
if (!element->IsDocumentElement() &&
359-
!SatisfiesContainment(*element->GetLayoutObject())) {
360-
StringBuilder message;
361-
message.Append(kContainmentNotSatisfied);
362-
message.Append(element->ComputedStyleRef().ViewTransitionName());
363-
AddConsoleError(message.ReleaseString());
364-
return false;
365-
}
366-
}
367-
368341
// We need to flatten the data first, and sort it by ordering which reflects
369342
// the setElement ordering.
370343
struct FlatData : public GarbageCollected {
@@ -812,11 +785,9 @@ bool ViewTransitionStyleTracker::RunPostPrePaintSteps() {
812785

813786
DCHECK_NE(element_data->target_element, document_->documentElement());
814787
auto* layout_object = element_data->target_element->GetLayoutObject();
815-
if (!layout_object || !SatisfiesContainment(*layout_object)) {
816-
StringBuilder message;
817-
message.Append(kContainmentNotSatisfied);
818-
message.Append(entry.key);
819-
AddConsoleError(message.ReleaseString());
788+
// TODO(khushalsagar): Verify that skipping a transition when things become
789+
// display none is aligned with spec.
790+
if (!layout_object) {
820791
return false;
821792
}
822793

third_party/blink/web_tests/external/wpt/css/css-view-transitions/3d-transform-incoming-ref.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
background: blue;
1616
}
1717
.shared {
18-
contain: layout;
1918
width: 100px;
2019
height: 100px;
2120
}

third_party/blink/web_tests/external/wpt/css/css-view-transitions/3d-transform-incoming.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
}
2626
.shared {
2727
view-transition-name: shared;
28-
contain: layout;
2928
width: 100px;
3029
height: 100px;
3130
}
@@ -34,7 +33,6 @@
3433
width: 10px;
3534
height: 10px;
3635
background: red;
37-
contain: layout;
3836
}
3937

4038
::view-transition-group(hidden) { animation-duration: 300s; }

third_party/blink/web_tests/external/wpt/css/css-view-transitions/3d-transform-outgoing-ref.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
background: green;
1010
}
1111
.shared {
12-
contain: layout;
1312
width: 100px;
1413
height: 100px;
1514
}

third_party/blink/web_tests/external/wpt/css/css-view-transitions/3d-transform-outgoing.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
}
2727
.shared {
2828
view-transition-name: shared;
29-
contain: layout;
3029
width: 100px;
3130
height: 100px;
3231
}
@@ -35,7 +34,6 @@
3534
width: 10px;
3635
height: 10px;
3736
background: red;
38-
contain: layout;
3937
}
4038

4139
::view-transition-group(hidden) { animation-duration: 300s; }

third_party/blink/web_tests/external/wpt/css/css-view-transitions/css-tags-paint-order-ref.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
<style>
77
div {
8-
contain: layout;
98
position: absolute;
109
top: 50px;
1110
width: 100px;

third_party/blink/web_tests/external/wpt/css/css-view-transitions/css-tags-paint-order.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
<script src="/common/reftest-wait.js">script>
99
<style>
10-
div { contain: layout; }
1110
#one {
1211
background: green;
1312
width: 100px;

third_party/blink/web_tests/external/wpt/css/css-view-transitions/dialog-in-top-layer-during-transition-new.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
padding: 0;
1818

1919
view-transition-name: dialog;
20-
contain: layout;
2120
}
2221

2322
#target::backdrop {
@@ -26,7 +25,6 @@
2625
background: grey;
2726

2827
view-transition-name: backdrop;
29-
contain: layout;
3028
}
3129

3230
.hidden {

third_party/blink/web_tests/external/wpt/css/css-view-transitions/dialog-in-top-layer-during-transition-old.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
padding: 0;
1818

1919
view-transition-name: dialog;
20-
contain: layout;
2120
}
2221

2322
#target::backdrop {
@@ -26,7 +25,6 @@
2625
background: grey;
2726

2827
view-transition-name: backdrop;
29-
contain: layout;
3028
}
3129

3230
.hidden {

third_party/blink/web_tests/external/wpt/css/css-view-transitions/element-with-overflow.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@
1212
height: 10px;
1313
view-transition-name: hidden;
1414
background: green;
15-
contain: layout;
1615
}
1716

1817
.target {
1918
width: 100px;
2019
height: 100px;
2120
background: lightblue;
22-
contain: layout;
2321
view-transition-name: target;
2422
}
2523
.inner {

third_party/blink/web_tests/external/wpt/css/css-view-transitions/new-content-element-writing-modes.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
contain: paint;
2828
border: 1px solid black;
2929
}
30-
.source {
31-
contain: layout;
32-
}
3330
#target {
3431
background: red;
3532
position: absolute;

third_party/blink/web_tests/external/wpt/css/css-view-transitions/new-content-object-fit-fill.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
width: 10px;
3030
height: 10px;
3131
view-transition-name: hidden;
32-
contain: layout;
3332
}
3433

3534
html::view-transition-group(target) {

third_party/blink/web_tests/external/wpt/css/css-view-transitions/new-content-object-fit-none.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
width: 10px;
2222
height: 10px;
2323
view-transition-name: hidden;
24-
contain: layout;
2524
}
2625

2726
html::view-transition-group(target) {

third_party/blink/web_tests/external/wpt/css/css-view-transitions/no-containment-on-new-element-mid-transition.html

Lines changed: 0 additions & 38 deletions
This file was deleted.

third_party/blink/web_tests/external/wpt/css/css-view-transitions/no-containment-on-new-element-mid-transition.html.ini

Lines changed: 0 additions & 3 deletions
This file was deleted.

third_party/blink/web_tests/external/wpt/css/css-view-transitions/no-containment-on-new-element.html

Lines changed: 0 additions & 47 deletions
This file was deleted.

third_party/blink/web_tests/external/wpt/css/css-view-transitions/no-containment-on-new-element.html.ini

Lines changed: 0 additions & 3 deletions
This file was deleted.

third_party/blink/web_tests/external/wpt/css/css-view-transitions/no-containment-on-old-element.html

Lines changed: 0 additions & 46 deletions
This file was deleted.

third_party/blink/web_tests/external/wpt/css/css-view-transitions/no-containment-on-old-element.html.ini

Lines changed: 0 additions & 3 deletions
This file was deleted.

third_party/blink/web_tests/external/wpt/css/css-view-transitions/old-content-object-fit-fill.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
width: 10px;
3030
height: 10px;
3131
view-transition-name: hidden;
32-
contain: layout;
3332
}
3433

3534
html::view-transition-group(target) {

third_party/blink/web_tests/external/wpt/css/css-view-transitions/old-content-object-fit-none.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
width: 10px;
2222
height: 10px;
2323
view-transition-name: hidden;
24-
contain: layout;
2524
}
2625

2726
html::view-transition-group(target) {

third_party/blink/web_tests/external/wpt/css/css-view-transitions/only-child-group.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
color: red;
2929
}
3030

31-
div {
32-
contain: layout;
33-
}
3431
style>
3532
<div id="target">div>
3633
<div id="target2">div>

third_party/blink/web_tests/external/wpt/css/css-view-transitions/only-child-new.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
color: red;
2929
}
3030

31-
#target {
32-
contain: layout;
33-
}
34-
3531
style>
3632
<div id="target">div>
3733

third_party/blink/web_tests/external/wpt/css/css-view-transitions/only-child-old.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
color: red;
2929
}
3030

31-
#target {
32-
contain: layout;
33-
}
34-
3531
style>
3632
<div id="target">div>
3733

0 commit comments

Comments
 (0)