Commit a6c2b0da authored by Yi Gu's avatar Yi Gu Committed by Commit Bot

[CodeHealth] Move CheckUsesCompositedScrolling to CompositorAnimations

This was missed in crrev.com/c/2204224 and it should be no-op.

Bug: None
Change-Id: Iac8597d4693a95eae50c9e62f63fe41c71de598e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2204649Reviewed-by: default avatarMajid Valipour <majidvp@chromium.org>
Commit-Queue: Yi Gu <yigu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772312}
parent ea1b9004
...@@ -179,15 +179,6 @@ AtomicString GetCSSTransitionCSSPropertyName(const Animation* animation) { ...@@ -179,15 +179,6 @@ AtomicString GetCSSTransitionCSSPropertyName(const Animation* animation) {
.GetCSSPropertyName() .GetCSSPropertyName()
.ToAtomicString(); .ToAtomicString();
} }
bool CheckElementComposited(const Node& target) {
DCHECK(target.GetDocument().Lifecycle().GetState() >=
DocumentLifecycle::kCompositingClean);
auto* layout_box_model_object = target.GetLayoutBoxModelObject();
if (!layout_box_model_object)
return false;
return layout_box_model_object->UsesCompositedScrolling();
}
} // namespace } // namespace
Animation* Animation::Create(AnimationEffect* effect, Animation* Animation::Create(AnimationEffect* effect,
...@@ -1697,7 +1688,7 @@ Animation::CheckCanStartAnimationOnCompositorInternal() const { ...@@ -1697,7 +1688,7 @@ Animation::CheckCanStartAnimationOnCompositorInternal() const {
// TODO(crbug.com/476553): Once all ScrollNodes including uncomposited ones // TODO(crbug.com/476553): Once all ScrollNodes including uncomposited ones
// are in the compositor, the animation should be composited. // are in the compositor, the animation should be composited.
if (timeline_->IsScrollTimeline() && if (timeline_->IsScrollTimeline() &&
!CheckElementComposited( !CompositorAnimations::CheckUsesCompositedScrolling(
*To<ScrollTimeline>(*timeline_).ResolvedScrollSource())) *To<ScrollTimeline>(*timeline_).ResolvedScrollSource()))
reasons |= CompositorAnimations::kTimelineSourceHasInvalidCompositingState; reasons |= CompositorAnimations::kTimelineSourceHasInvalidCompositingState;
......
...@@ -775,4 +775,13 @@ void CompositorAnimations::GetAnimationOnCompositor( ...@@ -775,4 +775,13 @@ void CompositorAnimations::GetAnimationOnCompositor(
DCHECK(!keyframe_models.IsEmpty()); DCHECK(!keyframe_models.IsEmpty());
} }
bool CompositorAnimations::CheckUsesCompositedScrolling(const Node& target) {
DCHECK(target.GetDocument().Lifecycle().GetState() >=
DocumentLifecycle::kCompositingClean);
auto* layout_box_model_object = target.GetLayoutBoxModelObject();
if (!layout_box_model_object)
return false;
return layout_box_model_object->UsesCompositedScrolling();
}
} // namespace blink } // namespace blink
...@@ -161,6 +161,8 @@ class CORE_EXPORT CompositorAnimations { ...@@ -161,6 +161,8 @@ class CORE_EXPORT CompositorAnimations {
static CompositorElementIdNamespace CompositorElementNamespaceForProperty( static CompositorElementIdNamespace CompositorElementNamespaceForProperty(
CSSPropertyID property); CSSPropertyID property);
static bool CheckUsesCompositedScrolling(const Node& target);
private: private:
static FailureReasons CheckCanStartEffectOnCompositor( static FailureReasons CheckCanStartEffectOnCompositor(
const Timing&, const Timing&,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment