From: subhransu mohanty Date: Wed, 1 Aug 2018 04:06:44 +0000 (+0900) Subject: lottie: remove dead code. X-Git-Tag: submit/tizen/20180917.042405~148 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F185593%2F1;p=platform%2Fcore%2Fuifw%2Flottie-player.git lottie: remove dead code. Change-Id: Ia56674a813a65007f07b2a54d230743ced6b6511 --- diff --git a/src/lottie/lottiemodel.cpp b/src/lottie/lottiemodel.cpp index 7015749..934b6ce 100644 --- a/src/lottie/lottiemodel.cpp +++ b/src/lottie/lottiemodel.cpp @@ -48,110 +48,6 @@ public: bool mRepeaterFound; }; -class LottiePathOperationProcesser : public LOTDataVisitor { -public: - LottiePathOperationProcesser() : mPathOperator(false), mPathNode(false) {} - void visit(LOTCompositionData *obj) {} - void visit(LOTLayerData *obj) {} - void visit(LOTTransformData *) {} - void visit(LOTShapeGroupData *obj) {} - void visit(LOTShapeData *) { mPathNode = true; } - void visit(LOTRectData *) { mPathNode = true; } - void visit(LOTEllipseData *) { mPathNode = true; } - void visit(LOTTrimData *) { mPathOperator = true; } - void visit(LOTRepeaterData *) {} - void visit(LOTFillData *) {} - void visit(LOTStrokeData *) {} - void visit(LOTPolystarData *) { mPathNode = true; } - void visitChildren(LOTGroupData *obj) - { - int curOpCount = mPathOperationList.size(); - mPathOperator = false; - mPathNode = false; - for (auto i = obj->mChildren.rbegin(); i != obj->mChildren.rend(); - ++i) { - auto child = *i; - child.get()->accept(this); - if (mPathOperator) { - mPathOperationList.push_back(child); - // obj->mChildren.erase(std::next(i).base()); - } - if (mPathNode) { - updatePathObject(static_cast(child.get())); - } - mPathOperator = false; - mPathNode = false; - } - mPathOperationList.erase(mPathOperationList.begin() + curOpCount, - mPathOperationList.end()); - } - - void updatePathObject(LOTPath *drawable) - { - for (auto i = mPathOperationList.rbegin(); - i != mPathOperationList.rend(); ++i) { - drawable->mPathOperations.push_back(*i); - } - } - -public: - bool mPathOperator; - bool mPathNode; - std::vector> mPathOperationList; -}; - -class LottiePaintOperationProcesser : public LOTDataVisitor { -public: - LottiePaintOperationProcesser() : mPaintOperator(false), mPathNode(false) {} - void visit(LOTCompositionData *obj) {} - void visit(LOTLayerData *obj) {} - void visit(LOTTransformData *) {} - void visit(LOTShapeGroupData *obj) {} - void visit(LOTShapeData *) { mPathNode = true; } - void visit(LOTRectData *) { mPathNode = true; } - void visit(LOTEllipseData *) { mPathNode = true; } - void visit(LOTTrimData *) {} - void visit(LOTRepeaterData *) {} - void visit(LOTFillData *) { mPaintOperator = true; } - void visit(LOTStrokeData *) { mPaintOperator = true; } - void visit(LOTPolystarData *) { mPathNode = true; } - void visitChildren(LOTGroupData *obj) - { - int curOpCount = mPaintOperationList.size(); - mPaintOperator = false; - mPathNode = false; - for (auto i = obj->mChildren.rbegin(); i != obj->mChildren.rend(); - ++i) { - auto child = *i; - child.get()->accept(this); - if (mPaintOperator) { - mPaintOperationList.push_back(child); - // obj->mChildren.erase(std::next(i).base()); - } - if (mPathNode) { - // put it in the list - updatePathObject(static_cast(child.get())); - } - mPaintOperator = false; - mPathNode = false; - } - mPaintOperationList.erase(mPaintOperationList.begin() + curOpCount, - mPaintOperationList.end()); - } - - void updatePathObject(LOTPath *drawable) - { - for (auto i = mPaintOperationList.begin(); - i != mPaintOperationList.end(); ++i) { - drawable->mPaintOperations.push_back(*i); - } - } - -public: - bool mPaintOperator; - bool mPathNode; - std::vector> mPaintOperationList; -}; void LOTCompositionData::processRepeaterObjects() { @@ -159,18 +55,6 @@ void LOTCompositionData::processRepeaterObjects() accept(&visitor); } -void LOTCompositionData::processPathOperatorObjects() -{ - LottiePathOperationProcesser visitor; - accept(&visitor); -} - -void LOTCompositionData::processPaintOperatorObjects() -{ - LottiePaintOperationProcesser visitor; - accept(&visitor); -} - VMatrix LOTTransformData::matrix(int frameNo) const { if (mStaticMatrix) diff --git a/src/lottie/lottiemodel.h b/src/lottie/lottiemodel.h index fa9e9d5..6880ffa 100644 --- a/src/lottie/lottiemodel.h +++ b/src/lottie/lottiemodel.h @@ -313,8 +313,6 @@ public: class LOTCompositionData : public LOTGroupData { public: - void processPathOperatorObjects(); - void processPaintOperatorObjects(); void processRepeaterObjects(); void accept(LOTDataVisitor *visitor) override {visitor->visit(this); visitor->visitChildren(this);} @@ -577,8 +575,6 @@ public: else return VPath::Direction::CW;} public: int mDirection; - std::vector> mPathOperations; - std::vector> mPaintOperations; }; class LOTShapeData : public LOTPath diff --git a/src/lottie/lottieparser.cpp b/src/lottie/lottieparser.cpp index bcdc213..af1304f 100644 --- a/src/lottie/lottieparser.cpp +++ b/src/lottie/lottieparser.cpp @@ -1952,7 +1952,6 @@ std::shared_ptr LottieParser::model() { std::shared_ptr model = std::make_shared(); model->mRoot = d->composition(); - model->mRoot->processPathOperatorObjects(); model->mRoot->processRepeaterObjects(); #ifdef DEBUG_PARSER