corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset d9e8e468a2f2 (bug 1866566) for wpt failures on content-visibility-animation-with-scroll-timeline-in-hidden-subtree.html.

Browse Source
This commit is contained in:
Cosmin Sabou
2023-12-05 18:59:19 +02:00
parent 00064cd24c
commit 424d51a33c
24 changed files with 18 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dom/animation/Animation.cpp
View File

@@ -1953,22 +1953,6 @@ void Animation::SetHiddenByContentVisibility(bool hidden) {
GetTimeline()->NotifyAnimationContentVisibilityChanged(this, !hidden);
}
void Animation::UpdateHiddenByContentVisibility() {
// To be consistent with nsIFrame::UpdateAnimationVisibility, here we only
// deal with CSSAnimation and CSSTransition.
if (!AsCSSAnimation() && !AsCSSTransition()) {
return;
}
NonOwningAnimationTarget target = GetTargetForAnimation();
if (!target) {
return;
}
if (auto* frame = target.mElement->GetPrimaryFrame()) {
SetHiddenByContentVisibility(
frame->IsHiddenByContentVisibilityOnAnyAncestor());
}
}
StickyTimeDuration Animation::IntervalStartTime(
const StickyTimeDuration& aActiveDuration) const {
MOZ_ASSERT(AsCSSTransition() || AsCSSAnimation(),

1
dom/animation/Animation.h
View File

@@ -399,7 +399,6 @@ class Animation : public DOMEventTargetHelper,
bool IsHiddenByContentVisibility() const {
return mHiddenByContentVisibility;
}
void UpdateHiddenByContentVisibility();
DocGroup* GetDocGroup();
void SetSyncWithGeometricAnimations() { mSyncWithGeometricAnimations = true; }

6
dom/animation/AnimationTimeline.cpp
View File

@@ -112,10 +112,4 @@ void AnimationTimeline::NotifyAnimationContentVisibilityChanged(
}
}
void AnimationTimeline::UpdateHiddenByContentVisibility() {
for (Animation* animation : mAnimations) {
animation->UpdateHiddenByContentVisibility();
}
}
} // namespace mozilla::dom

1
dom/animation/AnimationTimeline.h
View File

@@ -113,7 +113,6 @@ class AnimationTimeline : public nsISupports, public nsWrapperCache {
virtual void RemoveAnimation(Animation* aAnimation);
virtual void NotifyAnimationContentVisibilityChanged(Animation* aAnimation,
bool aIsVisible);
void UpdateHiddenByContentVisibility();
virtual Document* GetDocument() const = 0;

11
dom/animation/ScrollTimeline.cpp
View File

@@ -263,17 +263,6 @@ const nsIScrollableFrame* ScrollTimeline::GetScrollFrame() const {
return nullptr;
}
void ScrollTimeline::NotifyAnimationContentVisibilityChanged(
Animation* aAnimation, bool aIsVisible) {
AnimationTimeline::NotifyAnimationContentVisibilityChanged(aAnimation,
aIsVisible);
if (mAnimationOrder.isEmpty()) {
UnregisterFromScrollSource();
} else {
RegisterWithScrollSource();
}
}
// ------------------------------------
// Methods of ProgressTimelineScheduler
// ------------------------------------

3
dom/animation/ScrollTimeline.h
View File

@@ -197,9 +197,6 @@ class ScrollTimeline : public AnimationTimeline {
PseudoStyleType aPseudoType,
const StyleScrollTimeline& aNew);
void NotifyAnimationContentVisibilityChanged(Animation* aAnimation,
bool aIsVisible) override;
protected:
virtual ~ScrollTimeline() { Teardown(); }
ScrollTimeline() = delete;

5
dom/base/Document.cpp
View File

@@ -18983,9 +18983,4 @@ RadioGroupContainer& Document::OwnedRadioGroupContainer() {
return *mRadioGroupContainer;
}
void Document::UpdateHiddenByContentVisibilityForAnimations() {
for (AnimationTimeline* timeline : Timelines()) {
timeline->UpdateHiddenByContentVisibility();
}
}
} // namespace mozilla::dom

1
dom/base/Document.h
View File

@@ -3034,7 +3034,6 @@ class Document : public nsINode,
DocumentTimeline* Timeline();
LinkedList<DocumentTimeline>& Timelines() { return mTimelines; }
void UpdateHiddenByContentVisibilityForAnimations();
SVGSVGElement* GetSVGRootElement() const;

18
layout/base/PresShell.cpp
View File

@@ -11950,15 +11950,8 @@ void PresShell::UpdateRelevancyOfContentVisibilityAutoFrames() {
return;
}
bool isRelevantContentChanged = false;
for (nsIFrame* frame : mContentVisibilityAutoFrames) {
isRelevantContentChanged |=
frame->UpdateIsRelevantContent(mContentVisibilityRelevancyToUpdate);
}
if (isRelevantContentChanged) {
if (nsPresContext* presContext = GetPresContext()) {
presContext->UpdateHiddenByContentVisibilityForAnimations();
}
frame->UpdateIsRelevantContent(mContentVisibilityRelevancyToUpdate);
}
mContentVisibilityRelevancyToUpdate.clear();
@@ -11992,7 +11985,6 @@ PresShell::ProximityToViewportResult PresShell::DetermineProximityToViewport() {
auto input = DOMIntersectionObserver::ComputeInput(
*mDocument, /* aRoot = */ nullptr, &rootMargin);
bool isRelevantContentChanged = false;
for (nsIFrame* frame : mContentVisibilityAutoFrames) {
auto* element = frame->GetContent()->AsElement();
result.mAnyScrollIntoViewFlag |=
@@ -12013,8 +12005,7 @@ PresShell::ProximityToViewportResult PresShell::DetermineProximityToViewport() {
.Intersects();
element->SetVisibleForContentVisibility(intersects);
if (oldVisibility.isNothing() || *oldVisibility != intersects) {
isRelevantContentChanged |=
frame->UpdateIsRelevantContent(ContentRelevancyReason::Visible);
frame->UpdateIsRelevantContent(ContentRelevancyReason::Visible);
}
// 14.2.3.3
@@ -12022,11 +12013,6 @@ PresShell::ProximityToViewportResult PresShell::DetermineProximityToViewport() {
result.mHadInitialDetermination = true;
}
}
if (isRelevantContentChanged) {
if (nsPresContext* presContext = GetPresContext()) {
presContext->UpdateHiddenByContentVisibilityForAnimations();
}
}
return result;
}

5
layout/base/nsPresContext.cpp
View File

@@ -3077,11 +3077,6 @@ PerformanceMainThread* nsPresContext::GetPerformanceMainThread() const {
return nullptr;
}
void nsPresContext::UpdateHiddenByContentVisibilityForAnimations() {
mDocument->UpdateHiddenByContentVisibilityForAnimations();
TimelineManager()->UpdateHiddenByContentVisibilityForAnimations();
}
#ifdef DEBUG
void nsPresContext::ValidatePresShellAndDocumentReleation() const {

2
layout/base/nsPresContext.h
View File

@@ -1079,8 +1079,6 @@ class nsPresContext : public nsISupports, public mozilla::SupportsWeakPtr {
return mFontPaletteValueSet;
}
void UpdateHiddenByContentVisibilityForAnimations();
protected:
friend class nsRunnableMethod<nsPresContext>;
void ThemeChangedInternal();

5
layout/generic/nsIFrame.cpp
View File

@@ -7003,7 +7003,7 @@ bool nsIFrame::IsDescendantOfTopLayerElement() const {
return false;
}
bool nsIFrame::UpdateIsRelevantContent(
void nsIFrame::UpdateIsRelevantContent(
const ContentRelevancy& aRelevancyToUpdate) {
MOZ_ASSERT(StyleDisplay()->ContentVisibility(*this) ==
StyleContentVisibility::Auto);
@@ -7053,7 +7053,7 @@ bool nsIFrame::UpdateIsRelevantContent(
}
if (!overallRelevancyChanged) {
return false;
return;
}
HandleLastRememberedSize();
@@ -7075,7 +7075,6 @@ bool nsIFrame::UpdateIsRelevantContent(
new AsyncEventDispatcher(element, event.forget());
DebugOnly<nsresult> rv = asyncDispatcher->PostDOMEvent();
NS_ASSERTION(NS_SUCCEEDED(rv), "AsyncEventDispatcher failed to dispatch");
return true;
}
nsresult nsIFrame::CharacterDataChanged(const CharacterDataChangeInfo&) {

4
layout/generic/nsIFrame.h
View File

@@ -3303,10 +3303,8 @@ class nsIFrame : public nsQueryFrame {
* Update the whether or not this frame is considered relevant content for the
* purposes of `content-visibility: auto` according to the rules specified in
* https://drafts.csswg.org/css-contain-2/#relevant-to-the-user.
* Returns true if the over-all relevancy changed.
*/
[[nodiscard]] bool UpdateIsRelevantContent(
const ContentRelevancy& aRelevancyToUpdate);
void UpdateIsRelevantContent(const ContentRelevancy& aRelevancyToUpdate);
/**
* Get the "type" of the frame.

1
layout/style/TimelineCollection.h
View File

@@ -55,7 +55,6 @@ class TimelineCollection final
// if it does not already exist.
static TimelineCollection* Get(const dom::Element* aElement,
PseudoStyleType aPseudoType);
const TimelineMap& Timelines() const { return mTimelines; }
private:
// The element. Weak reference is fine since it owns us.

16
layout/style/TimelineManager.cpp
View File

@@ -168,20 +168,4 @@ void TimelineManager::DoUpdateTimelines(
// siblings when mutating {scroll|view}-timeline-name.
}
void TimelineManager::UpdateHiddenByContentVisibilityForAnimations() {
for (auto* scrollTimelineCollection : mScrollTimelineCollections) {
for (ScrollTimeline* timeline :
scrollTimelineCollection->Timelines().Values()) {
timeline->UpdateHiddenByContentVisibility();
}
}
for (auto* viewTimelineCollection : mViewTimelineCollections) {
for (ViewTimeline* timeline :
viewTimelineCollection->Timelines().Values()) {
timeline->UpdateHiddenByContentVisibility();
}
}
}
} // namespace mozilla

2
layout/style/TimelineManager.h
View File

@@ -51,8 +51,6 @@ class TimelineManager {
const ComputedStyle* aComputedStyle,
ProgressTimelineType aType);
void UpdateHiddenByContentVisibilityForAnimations();
private:
template <typename StyleType, typename TimelineType>
void DoUpdateTimelines(nsPresContext* aPresContext, dom::Element* aElement,

2
testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-animation-and-scroll.html.ini Normal file
View File

@@ -0,0 +1,2 @@
[content-visibility-animation-and-scroll.html]
expected: TIMEOUT

11
testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-animation-in-auto-subtree.html.ini
View File

@@ -1,4 +1,13 @@
[content-visibility-animation-in-auto-subtree.html]
expected: TIMEOUT
[Events and promises are handled normally for animations without an owning element]
[Animation events do not fire for a CSS animation running in a content visibility subtree]
expected: TIMEOUT
[The finished promise does not resolve due to the normal passage of time for a CSS animation in a content visibility subtree]
expected: NOTRUN
[The finished promise does not resolve due to the normal passage of time for a CSS transition in a content visibility subtree]
expected: NOTRUN
[Events and promises are handled normally for animations without an owning element]
expected: NOTRUN

2
testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-animation-with-scroll-timeline-in-auto-subtree.html.ini
View File

@@ -1,2 +0,0 @@
[content-visibility-animation-with-scroll-timeline-in-auto-subtree.html]
prefs: [layout.css.scroll-driven-animations.enabled:true]

2
testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-animation-with-scroll-timeline-in-hidden-subtree.html.ini
View File

@@ -1,2 +0,0 @@
[content-visibility-animation-with-scroll-timeline-in-hidden-subtree.html]
prefs: [layout.css.scroll-driven-animations.enabled:true]

2
testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-animation-in-auto-subtree.html
View File

@@ -14,7 +14,7 @@
to { opacity: 0; }
}
#target {
background: green;
background: 'green';
height: 100px;
width: 100px;
}

82
testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-animation-with-scroll-timeline-in-auto-subtree.html
View File

@@ -1,82 +0,0 @@
<!DOCTYPE html>
<meta charset=utf8>
<title>Test getComputedStyle on a CSS animation with scroll timeline in a content visibility subtree using content-visibility: auto</title>
<link rel="help" href="https://drafts.csswg.org/css-contain-2/">
<script src="/web-animations/testcommon.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
#container {
content-visibility: auto;
}
#scrollContainer {
height: 100vh;
overflow-y: scroll;
scroll-timeline-name: --targetTimeline;
}
#innerspacer {
height: 300vh;
}
@keyframes fade {
from { opacity: 1; }
to { opacity: 0; }
}
#target {
background: green;
height: 100px;
width: 100px;
}
.animate {
animation-name: fade;
animation-duration: 1ms;
animation-direction: alternate;
animation-timeline: --targetTimeline;
}
</style>
<body>
<div id="log"></div>
<div id="spacer"></div>
<div id="scrollContainer">
<div id="container"></div>
<div id="innerspacer"></div>
</div>
</body>
<script>
"use strict";
function createAnimatingElement(test, name) {
const container = document.getElementById('container');
const target = document.createElement('div');
container.appendChild(target);
target.id = 'target';
target.className = name;
return target;
}
promise_test(async t => {
const container = document.getElementById('container');
const target = createAnimatingElement(t, 'animate');
scrollContainer.scrollTop = 10000;
const animation = target.getAnimations()[0];
await animation.ready;
await waitForAnimationFrames(1);
let expectedOpacity = getComputedStyle(target).opacity;
assert_equals(expectedOpacity, '0', 'scrollContainer scrolls to bottom, so the opacity should be 0');
document.getElementById('spacer').style.height = '300vh';
await waitForAnimationFrames(1);
assert_equals(getComputedStyle(target).opacity, expectedOpacity, 'Opacity does not change when it is hidden by c-v');
scrollContainer.scrollTop = 0;
assert_equals(getComputedStyle(target).opacity, expectedOpacity, 'The animation is hidden by c-v, so opacity does not change even if scrollTop changes');
await waitForAnimationFrames(2);
document.getElementById('spacer').style.height = '0vh';
await waitForAnimationFrames(2);
assert_equals(getComputedStyle(target).opacity, '1', 'Now that the animation is visible, opacity should be updated');
}, 'Animation with scroll-timeline should be affected c-v');
</script>

81
testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-animation-with-scroll-timeline-in-hidden-subtree.html
View File

@@ -1,81 +0,0 @@
<!DOCTYPE html>
<meta charset=utf8>
<title>Test getComputedStyle on a CSS animation with scroll-timeline in a content-visibility subtree</title>
<link rel="help" href="https://drafts.csswg.org/css-contain-2/">
<script src="/web-animations/testcommon.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
#container {
content-visibility: visible;
}
#scrollContainer {
height: 100vh;
overflow-y: scroll;
scroll-timeline-name: --targetTimeline;
}
#innerspacer {
height: 300vh;
}
@keyframes fade {
from { opacity: 1; }
to { opacity: 0; }
}
#target {
background: green;
height: 100px;
width: 100px;
}
.animate {
animation-name: fade;
animation-duration: 1ms;
animation-direction: alternate;
animation-timeline: --targetTimeline;
}
</style>
<body>
<div id="log"></div>
<div id="scrollContainer">
<div id="container"></div>
<div id="innerspacer"></div>
</div>
</body>
<script>
"use strict";
function createAnimatingElement(test, name) {
const container = document.getElementById('container');
const target = document.createElement('div');
container.appendChild(target);
target.id = 'target';
target.className = name;
return target;
}
promise_test(async t => {
const container = document.getElementById('container');
const target = createAnimatingElement(t, 'animate');
scrollContainer.scrollTop = 10000;
const animation = target.getAnimations()[0];
await animation.ready;
await waitForAnimationFrames(1);
let expectedOpacity = getComputedStyle(target).opacity;
assert_equals(expectedOpacity, '0', 'scrollContainer scrolls to bottom, so the opacity should be 0');
document.getElementById('container').style.contentVisibility = 'hidden';
await waitForAnimationFrames(1);
assert_equals(getComputedStyle(target).opacity, expectedOpacity, 'Opacity does not change when it is hidden by c-v');
scrollContainer.scrollTop = 0;
assert_equals(getComputedStyle(target).opacity, expectedOpacity, 'The animation is hidden by c-v, so opacity does not change even if scrollTop changes');
await waitForAnimationFrames(2);
document.getElementById('container').style.contentVisibility = 'visible';
await waitForAnimationFrames(2);
assert_equals(getComputedStyle(target).opacity, '1', 'Now that the animation is visible, opacity should be updated');
}, 'Animation with scroll-timeline should be affected c-v');
</script>

74
testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-web-animation-in-auto-subtree.html
View File

@@ -1,74 +0,0 @@
<!DOCTYPE html>
<meta charset=utf8>
<title>Web Animation does not stop even if target is hidden by c-v</title>
<link rel="help" href="https://drafts.csswg.org/css-contain-2/">
<script src="/web-animations/testcommon.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
#container {
content-visibility: auto;
}
@keyframes fade {
from { opacity: 1; }
to { opacity: 0; }
}
#target {
background: green;
height: 100px;
width: 100px;
}
.animate {
animation: fade 1s linear 2 alternate;
}
.transition {
transition: opacity 1s linear;
}
</style>
<body>
<div id="spacer"></div>
<div id="container"></div>
</body>
<script>
"use strict";
function createElementWithWebAnimation(test) {
const container = document.getElementById('container');
const target = document.createElement('div');
container.appendChild(target);
target.id = 'target';
const keyframes = [
{ opacity: 1 },
{ opacity: 0 },
];
const options = {
duration: 2000,
iterations: 1,
easing: 'linear',
direction: 'alternate',
};
target.animate(keyframes, options);
return target;
}
promise_test(async t => {
// Make sure the target is hidden from the beginning.
document.getElementById("spacer").style.height = "300vh";
const target = createElementWithWebAnimation(t);
const animation = target.getAnimations()[0];
let animationFinishEvent = false;
animation.addEventListener('finish', () => {
animationFinishEvent = true;
});
animation.currentTime = 1999;
await animation.ready;
await waitForAnimationFrames(2);
assert_true(animationFinishEvent,
'Web Animation event should keep going even if target is hidden by c-v');
}, 'Web Animation does not stop even if target is hidden by c-v');
</script>