Revert "Update color blending style in LottieItem"

This reverts commit 74c65db99ab841039dfba50dc72dc2b165aac49b.

Change-Id: I370ab2755d6971422637ed85a9fdba8cd260bce3

diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp
index f0e181a6613b6a0e31238584e0f5b0e46a044b1e..4cd22e4c5f3c1aa709b7a3487e5a4182c9bbdd65 100644 (file)
--- a/src/lottie/lottieitem.cpp
+++ b/src/lottie/lottieitem.cpp
@@ -165,28 +165,6 @@ bool renderer::Composition::render(const rlottie::Surface &surface)
     painter.setDrawRegion(
         VRect(int(surface.drawRegionPosX()), int(surface.drawRegionPosY()),
               int(surface.drawRegionWidth()), int(surface.drawRegionHeight())));
-
-    // layer surface should be created if it is not created already or its size
-    // is changed.
-    bool isLayerSurfaceCreated = mSurfaceCache.is_layer_surface_created();
-    bool isLayerSurfaceSizeChanged =
-        isLayerSurfaceCreated &&
-        (mSurfaceCache.get_layer_surface()->width() != surface.width() ||
-         mSurfaceCache.get_layer_surface()->height() != surface.height());
-
-    if (!isLayerSurfaceCreated || isLayerSurfaceSizeChanged) {
-        if (isLayerSurfaceCreated && isLayerSurfaceSizeChanged)
-            mSurfaceCache.delete_layer_surface();
-
-        mSurfaceCache.create_layer_surface(surface.width(), surface.height(),
-                                           VBitmap::Format::ARGB32_Premultiplied);
-
-        // set layer draw region
-        mSurfaceCache.get_layer_painter()->setDrawRegion(
-            VRect(int(surface.drawRegionPosX()), int(surface.drawRegionPosY()),
-                  int(surface.drawRegionWidth()), int(surface.drawRegionHeight())));
-    }
-
     mRootLayer->render(&painter, {}, {}, mSurfaceCache);
     painter.end();
     return true;
@@ -236,7 +214,7 @@ void renderer::Mask::preprocess(const VRect &clip)
 }
 
 void renderer::Layer::render(VPainter *painter, const VRle &inheritMask,
-                             const VRle &matteRle, SurfaceCache &cache)
+                             const VRle &matteRle, SurfaceCache &)
 {
     auto renderlist = renderList();
 
@@ -252,42 +230,31 @@ void renderer::Layer::render(VPainter *painter, const VRle &inheritMask,
         mask = inheritMask;
     }
 
-    VPainter *usedPainter = painter;
-
-    if (cache.get_layer_painter() != nullptr) {
-        usedPainter = cache.get_layer_painter();
-        usedPainter->begin(cache.get_layer_surface());
-    }
-
     for (auto &i : renderlist) {
-        usedPainter->setBrush(i->mBrush);
+        painter->setBrush(i->mBrush);
         VRle rle = i->rle();
         if (matteRle.empty()) {
             if (mask.empty()) {
                 // no mask no matte
-                usedPainter->drawRle(VPoint(), rle);
+                painter->drawRle(VPoint(), rle);
             } else {
                 // only mask
-                usedPainter->drawRle(rle, mask);
+                painter->drawRle(rle, mask);
             }
+
         } else {
             if (!mask.empty()) rle = rle & mask;
 
             if (rle.empty()) continue;
             if (matteType() == model::MatteType::AlphaInv) {
                 rle = rle - matteRle;
-                usedPainter->drawRle(VPoint(), rle);
+                painter->drawRle(VPoint(), rle);
             } else {
                 // render with matteRle as clip.
-                usedPainter->drawRle(rle, matteRle);
+                painter->drawRle(rle, matteRle);
             }
         }
     }
-
-    if (cache.get_layer_painter() != nullptr) {
-        usedPainter->end();
-        painter->drawBitmap(VPoint(), *cache.get_layer_surface(), mCombinedAlpha * 255.0f);
-    }
 }
 
 void renderer::LayerMask::preprocess(const VRect &clip)
@@ -1271,9 +1238,9 @@ renderer::Fill::Fill(model::Fill *data)
     mDrawable.setName(mModel.name());
 }
 
-bool renderer::Fill::updateContent(int frameNo, const VMatrix &, float)
+bool renderer::Fill::updateContent(int frameNo, const VMatrix &, float alpha)
 {
-    auto combinedAlpha = mModel.opacity(frameNo);
+    auto combinedAlpha = alpha * mModel.opacity(frameNo);
     auto color = mModel.color(frameNo).toColor(combinedAlpha);
 
     VBrush brush(color);
@@ -1317,9 +1284,9 @@ renderer::Stroke::Stroke(model::Stroke *data)
 static vthread_local std::vector<float> Dash_Vector;
 
 bool renderer::Stroke::updateContent(int frameNo, const VMatrix &matrix,
-                                     float)
+                                     float alpha)
 {
-    auto combinedAlpha = mModel.opacity(frameNo);
+    auto combinedAlpha = alpha * mModel.opacity(frameNo);
     auto color = mModel.color(frameNo).toColor(combinedAlpha);
 
     VBrush brush(color);

diff --git a/src/lottie/lottieitem.h b/src/lottie/lottieitem.h
index 587f10bee487c11f0146ce6cae1a1e5c1d352afa..001ce667ccd79526732c745e109b18e2d6da380d 100644 (file)
--- a/src/lottie/lottieitem.h
+++ b/src/lottie/lottieitem.h
@@ -106,31 +106,9 @@ public:
     }
 
     void release_surface(VBitmap &surface) { mCache.push_back(surface); }
-    bool is_layer_surface_created() const { return mIsLayerBitmapCreated; }
-    void create_layer_surface(size_t width, size_t height, VBitmap::Format format)
-    {
-        if (mIsLayerBitmapCreated) return;
-
-        mLayerBitmap = std::make_unique<VBitmap>(width, height, format);
-        mBitmapPainter = std::make_unique<VPainter>(mLayerBitmap.get());
-        mIsLayerBitmapCreated = true;
-    }
-    void delete_layer_surface()
-    {
-        if (!mIsLayerBitmapCreated) return;
-
-        mLayerBitmap.reset();
-        mBitmapPainter.reset();
-        mIsLayerBitmapCreated = false;
-    }
-    VPainter* get_layer_painter() const { return mBitmapPainter.get(); }
-    VBitmap* get_layer_surface() const { return mLayerBitmap.get(); }
 
 private:
     std::vector<VBitmap> mCache;
-    std::unique_ptr<VBitmap>   mLayerBitmap{nullptr};
-    std::unique_ptr<VPainter>  mBitmapPainter{nullptr};
-    bool                       mIsLayerBitmapCreated{false};
 };
 
 class Drawable final : public VDrawable {