X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-rasterize-thread.h;h=d7eb16bd4cb62b4a3dcddf140d99ef56927a0c0b;hp=1c94ca9b11c1ebf8519398e8d71d88c2a8501f55;hb=8f568af864987ed3039737045db38ea3db4ac962;hpb=96e0b7fdbe4cfe733a38cbcc2b493a7aeff66d6d

diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
index 1c94ca9..d7eb16b 100644
--- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
+++ b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,16 +22,17 @@
 #include <dali/devel-api/threading/conditional-wait.h>
 #include <dali/devel-api/threading/mutex.h>
 #include <dali/devel-api/threading/thread.h>
-#include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/images/pixel-data.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/rendering/texture-set.h>
-#include <dali-toolkit/internal/visuals/visual-url.h>
+#include <dali/devel-api/adaptor-framework/vector-image-renderer.h>
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
+#include <memory>
 
-struct NSVGimage;
-struct NSVGrasterizer;
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/visuals/visual-url.h>
 
 namespace Dali
 {
@@ -61,22 +62,23 @@ class RasterizingTask : public RefObject
 public:
   /**
    * Constructor
-   *
    * @param[in] svgRenderer The renderer which the rasterized image to be applied.
-   * @param[in] parsedSvg The parsed svg for rasterizing.
-   *            Note, after the task is added to the worker thread, the worker thread takes over the ownership.
-   *            When the image is to be deleted, delete it in the worker thread by calling SvgRasterizeThread::DeleteImage( parsedSvg ).
    * @param[in] url The URL to svg resource to use.
    * @param[in] width The rasterization width.
    * @param[in] height The rasterization height.
+   * @param[in] loaded The svg resource is loaded or not.
+   */
+  RasterizingTask( SvgVisual* svgRenderer, VectorImageRenderer vectorRenderer, const VisualUrl& url, float dpi, unsigned int width, unsigned int height, bool loaded );
+
+  /**
+   * Destructor.
    */
-  RasterizingTask( SvgVisual* svgRenderer, NSVGimage* parsedSvg, const VisualUrl& url, float dpi, unsigned int width, unsigned int height );
+  ~RasterizingTask() override;
 
   /**
-   * Do the rasterization with the given rasterizer.
-   *@param[in] rasterizer The rasterizer that rasterize the SVG to a buffer image
+   * Do the rasterization with the mRasterizer.
    */
-  void Rasterize( NSVGrasterizer* rasterizer );
+  void Rasterize();
 
   /**
    * Get the svg visual
@@ -90,10 +92,15 @@ public:
   PixelData GetPixelData() const;
 
   /**
-   * Get the parsed data.
-   * @return parsed image data.
+   * Get the VectorRenderer.
+   * @return VectorRenderer.
    */
-  NSVGimage* GetParsedImage() const;
+  VectorImageRenderer GetVectorRenderer() const;
+  /**
+   * Whether the resource is loaded.
+   * @return True if the resource is loaded.
+   */
+  bool IsLoaded() const;
 
   /**
    * Load svg file
@@ -109,12 +116,13 @@ private:
 
 private:
   SvgVisualPtr    mSvgVisual;
-  NSVGimage*      mParsedSvg;
+  VectorImageRenderer mVectorRenderer;
   VisualUrl       mUrl;
   PixelData       mPixelData;
   float           mDpi;
   unsigned int    mWidth;
   unsigned int    mHeight;
+  bool            mLoaded;
 };
 
 /**
@@ -162,11 +170,11 @@ public:
   /**
    * Delete the parsed SVG image, called by main thread.
    *
-   * The parsed svg should be delelted in worker thread, as the main thread does not know whether a rasterization of this svg is ongoing.
+   * The parsed svg should be deleted in worker thread, as the main thread does not know whether a rasterization of this svg is ongoing.
    *
-   * @param[in] parsedImage The image to be deleted
+   * @param[in] VectorImage The image to be deleted
    */
-  void DeleteImage( NSVGimage* parsedSvg );
+  void DeleteImage( VectorImageRenderer vectorImage );
 
 private:
 
@@ -189,7 +197,7 @@ protected:
   /**
    * Destructor.
    */
-  virtual ~SvgRasterizeThread();
+  ~SvgRasterizeThread() override;
 
 
   /**
@@ -210,13 +218,12 @@ private:
 
   std::vector<RasterizingTaskPtr>  mRasterizeTasks;     //The queue of the tasks waiting to rasterize the SVG image
   std::vector <RasterizingTaskPtr> mCompletedTasks;     //The queue of the tasks with the SVG rasterization completed
-  Vector<NSVGimage*>               mDeleteSvg;          //The images that the event thread requested to delete
+  Vector <VectorImageRenderer*>    mDeleteSvg;          //The images that the event thread requested to delete
 
   ConditionalWait            mConditionalWait;
   Dali::Mutex                mMutex;
-  EventThreadCallback*       mTrigger;
-
-  NSVGrasterizer*            mRasterizer;
+  std::unique_ptr< EventThreadCallback > mTrigger;
+  const Dali::LogFactoryInterface&       mLogFactory;
   bool                       mIsThreadWaiting;
 };