SkiaCompositingLayer: opacity animation doesn't damage correctly

fujii · fujii · commit d06ccb1bca68 · 2026-06-02T00:33:03.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=316045 Reviewed by Carlos Garcia Campos. Don't convert float opacity values into bool type before comparing. Test: platform/glib/damage/animations-opacity-2.html * LayoutTests/platform/glib/damage/animations-opacity-2-expected.txt: Added. * LayoutTests/platform/glib/damage/animations-opacity-2.html: Added. * Source/WebCore/platform/graphics/skia/SkiaCompositingLayer.cpp: (WebCore::SkiaCompositingLayer::syncAnimations): Canonical link: https://commits.webkit.org/314344@main
diff --git a/LayoutTests/platform/glib/damage/animations-opacity-2-expected.txt b/LayoutTests/platform/glib/damage/animations-opacity-2-expected.txt
@@ -0,0 +1 @@
+PASS
diff --git a/LayoutTests/platform/glib/damage/animations-opacity-2.html b/LayoutTests/platform/glib/damage/animations-opacity-2.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <link rel="stylesheet" href="./common.css">
+    <style>
+      body {
+          margin-top: 50px;
+      }
+      .rect {
+          width: 64px;
+          height: 64px;
+          margin-left: 50px;
+          background-color: green;
+          animation-name: animate;
+          animation-duration: 5s;
+          animation-iteration-count: infinite;
+          animation-timing-function: linear;
+      }
+      @keyframes animate {
+          from {
+              opacity: 1.0;
+          }
+          to {
+              opacity: 0.15;
+          }
+      }
+    </style>
+  </head>
+  <body>
+    <div class="rect">opacity animation</div>
+    <script src="./common.js"></script>
+    <script>
+      setupTestCase({disableConsoleLog: true});
+
+      setTimeout(() => {
+          var damage = latestFrameDamage();
+          if (!assertEq(damage.rects.length, 1, "wrong number of damage rects")
+              || !assertRectsEq(damage.rects, [[50, 50, 64, 64]])) {
+              failTest(failure);
+              return;
+          }
+          passTest();
+      }, 2000);
+    </script>
+  </body>
+</html>
diff --git a/Source/WebCore/platform/graphics/skia/SkiaCompositingLayer.cpp b/Source/WebCore/platform/graphics/skia/SkiaCompositingLayer.cpp
@@ -328,9 +328,7 @@ std::optional<SkiaCompositingLayer::AnimationsState> SkiaCompositingLayer::syncA
     }
     state.opacity = applicationResults.opacity;
 #if ENABLE(DAMAGE_TRACKING)
-    const bool currentOpacity = opacity();
-    const bool newOpacity = state.opacity.value_or(m_opacity);
-    if (frameDamagePropagationEnabled() && currentOpacity != newOpacity) {
+    if (frameDamagePropagationEnabled() && opacity() != state.opacity.value_or(m_opacity)) {
         damageWholeLayer();
         // FIXME: add collectFrameDamageDespiteBeingInvisible?
     }

Original file line number	Diff line number	Diff line change
`@@ -328,9 +328,7 @@ std::optional<SkiaCompositingLayer::AnimationsState> SkiaCompositingLayer::syncA`
`328`	`328`	`}`
`329`	`329`	`state.opacity = applicationResults.opacity;`
`330`	`330`	`#if ENABLE(DAMAGE_TRACKING)`
`331`		`- const bool currentOpacity = opacity();`
`332`		`- const bool newOpacity = state.opacity.value_or(m_opacity);`
`333`		`- if (frameDamagePropagationEnabled() && currentOpacity != newOpacity) {`
	`331`	`+ if (frameDamagePropagationEnabled() && opacity() != state.opacity.value_or(m_opacity)) {`
`334`	`332`	`damageWholeLayer();`
`335`	`333`	`// FIXME: add collectFrameDamageDespiteBeingInvisible?`
`336`	`334`	`}`