X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fsvg%2Fsvg-rasterize-thread.h;h=1f426cb3c55998177b73c21b438338fb1d6049c3;hb=refs%2Fchanges%2F60%2F81060%2F11;hp=e3b1ce22e22af209c8cf55e05b2e19bd7323d66b;hpb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
index e3b1ce2..1f426cb 100644
--- a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
+++ b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H__
-#define __DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H__
+#ifndef DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H
+#define DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -18,16 +18,16 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
 #include <dali/devel-api/threading/conditional-wait.h>
 #include <dali/devel-api/threading/mutex.h>
 #include <dali/devel-api/threading/thread.h>
-#include <dali/devel-api/rendering/texture-set.h>
-#include <dali/devel-api/images/pixel-data.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/devel-api/adaptor-framework/event-thread-callback.h>
+#include <dali/public-api/rendering/texture-set.h>
 
 struct NSVGimage;
 struct NSVGrasterizer;
@@ -41,8 +41,8 @@ namespace Toolkit
 namespace Internal
 {
 
-class SvgRenderer;
-typedef IntrusivePtr< SvgRenderer > SvgRendererPtr;
+class SvgVisual;
+typedef IntrusivePtr< SvgVisual > SvgVisualPtr;
 class RasterizingTask;
 typedef IntrusivePtr< RasterizingTask > RasterizingTaskPtr;
 
@@ -50,7 +50,7 @@ typedef IntrusivePtr< RasterizingTask > RasterizingTaskPtr;
  * The svg rasterizing tasks to be processed in the worker thread.
  *
  * Life cycle of a rasterizing task is as follows:
- * 1. Created by SvgRenderer in the main thread
+ * 1. Created by SvgVisual in the main thread
  * 2. Queued in the worked thread waiting to be processed.
  * 3. If this task gets its turn to do the rasterization, it triggers main thread to apply the rasterized image to material then been deleted in main thread call back
  *    Or if this task is been removed ( new image/size set to the renderer or actor off stage) before its turn to be processed, it then been deleted in the worker thread.
@@ -68,7 +68,7 @@ public:
    * @param[in] width The rasterization width.
    * @param[in] height The rasterization height.
    */
-  RasterizingTask( SvgRenderer* svgRenderer, NSVGimage* parsedSvg, unsigned int width, unsigned int height );
+  RasterizingTask( SvgVisual* svgRenderer, NSVGimage* parsedSvg, unsigned int width, unsigned int height );
 
   /**
    * Do the rasterization with the given rasterizer.
@@ -79,13 +79,13 @@ public:
   /**
    * Get the svg renderer
    */
-  SvgRenderer* GetSvgRenderer() const;
+  SvgVisual* GetSvgVisual() const;
 
   /**
    * Get the rasterization result.
    * @return The pixel data with the rasterized pixels.
    */
-  PixelDataPtr GetPixelData() const;
+  PixelData GetPixelData() const;
 
 private:
 
@@ -96,8 +96,8 @@ private:
   RasterizingTask& operator=( const RasterizingTask& task );
 
 private:
-  SvgRendererPtr  mSvgRenderer;
-  PixelDataPtr    mPixelData;
+  SvgVisualPtr  mSvgVisual;
+  PixelData       mPixelData;
   NSVGimage*      mParsedSvg;
   unsigned int    mWidth;
   unsigned int    mHeight;
@@ -144,7 +144,7 @@ public:
    *
    * @param[in] renderer The renderer pointer.
    */
-  void RemoveTask( SvgRenderer* renderer );
+  void RemoveTask( SvgVisual* renderer );
 
   /**
    * Delete the parsed SVG image, called by main thread.
@@ -213,4 +213,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H__ */
+#endif // DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H