Fix GradientOverlayFilter double-scaling issue when layer has scale transform. (#3527)

Author: CodeJhF

resources/filter/GradientOverlayScale.pag

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bdf7ba8cae24a4c9e51dc734416c44cc67a5867fe56c2f22554c7d30229bb56
+size 270

src/rendering/filters/layerstyle/GradientOverlayFilter.cpp

@@ -27,8 +27,7 @@ GradientOverlayFilter::GradientOverlayFilter(GradientOverlayStyle* layerStyle)
     : layerStyle(layerStyle) {
 }
 
-void GradientOverlayFilter::update(Frame layerFrame, const tgfx::Point& filterScale,
-                                   const tgfx::Point&) {
+void GradientOverlayFilter::update(Frame layerFrame, const tgfx::Point&, const tgfx::Point&) {
   opacity = layerStyle->opacity->getValueAt(layerFrame);
   colors = layerStyle->colors->getValueAt(layerFrame);
   angle = layerStyle->angle->getValueAt(layerFrame);
@@ -37,7 +36,6 @@ void GradientOverlayFilter::update(Frame layerFrame, const tgfx::Point& filterSc
   scale = layerStyle->scale->getValueAt(layerFrame) / 100.f;
   offset = layerStyle->offset->getValueAt(layerFrame);
   blendMode = layerStyle->blendMode->getValueAt(layerFrame);
-  _filterScale = filterScale;
 }
 
 bool GradientOverlayFilter::draw(Canvas* canvas, std::shared_ptr<tgfx::Image> source) {
@@ -82,10 +80,7 @@ bool GradientOverlayFilter::draw(Canvas* canvas, std::shared_ptr<tgfx::Image> so
   tgfx::Paint paint;
   paint.setShader(shader);
   auto rect = tgfx::Rect::MakeWH(width, height);
-  canvas->save();
-  canvas->scale(1.f / _filterScale.x, 1.f / _filterScale.y);
   canvas->drawRect(rect, paint);
-  canvas->restore();
   return true;
 }
 

src/rendering/filters/layerstyle/GradientOverlayFilter.h

@@ -40,6 +40,5 @@ class GradientOverlayFilter : public LayerStyleFilter {
   bool reverse = false;
   float scale = 1.0;
   Point offset = Point::Zero();
-  tgfx::Point _filterScale = tgfx::Point::Make(1.0f, 1.0f);
 };
 }  // namespace pag

test/baseline/version.json

@@ -8334,6 +8334,7 @@
         "GaussianBlur_NoRepeat_Clip": "60a88e548",
         "Glow": "60a88e548",
         "GradientOverlayFilter": "60a88e548",
+        "GradientOverlayFilter_Scale": "432167b87",
         "GradientOverlayFilter_Star": "60a88e548",
         "HueSaturation": "60a88e548",
         "LevelsIndividualFilter": "60a88e548",

test/src/PAGFilterTest.cpp

@@ -344,6 +344,22 @@ PAG_TEST(PAGFilterTest, GradientOverlayFilter_Star) {
   EXPECT_TRUE(Baseline::Compare(pagSurface, "PAGFilterTest/GradientOverlayFilter_Star"));
 }
 
+/**
+ * 用例描述: GradientOverlayFilter_Scale
+ */
+PAG_TEST(PAGFilterTest, GradientOverlayFilter_Scale) {
+  auto pagFile = LoadPAGFile("resources/filter/GradientOverlayScale.pag");
+  ASSERT_NE(pagFile, nullptr);
+  auto pagSurface = OffscreenSurface::Make(pagFile->width(), pagFile->height());
+  ASSERT_NE(pagSurface, nullptr);
+  auto pagPlayer = std::make_shared<PAGPlayer>();
+  pagPlayer->setSurface(pagSurface);
+  pagPlayer->setComposition(pagFile);
+  pagPlayer->setProgress(0.0);
+  pagPlayer->flush();
+  EXPECT_TRUE(Baseline::Compare(pagSurface, "PAGFilterTest/GradientOverlayFilter_Scale"));
+}
+
 /**
  * 用例描述: FeatherMask
  */