Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / common / blending-options.h

diff --git a/dali/internal/common/blending-options.h b/dali/internal/common/blending-options.h
index 07f149f..b469c26 100644 (file)
--- a/dali/internal/common/blending-options.h
+++ b/dali/internal/common/blending-options.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_BLENDING_OPTIONS_H__
-#define __DALI_BLENDING_OPTIONS_H__
+#ifndef DALI_BLENDING_OPTIONS_H
+#define DALI_BLENDING_OPTIONS_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -19,8 +19,9 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/actors/blending.h>
+#include <dali/public-api/rendering/renderer.h>
 #include <dali/public-api/math/vector4.h>
+#include <dali/internal/common/owner-pointer.h>
 
 namespace Dali
 {
@@ -56,43 +57,43 @@ struct BlendingOptions
   /**
    * @copydoc Dali::RenderableActor::SetBlendFunc()
    */
-  void SetBlendFunc( BlendingFactor::Type srcFactorRgb,   BlendingFactor::Type destFactorRgb,
-                     BlendingFactor::Type srcFactorAlpha, BlendingFactor::Type destFactorAlpha );
+  void SetBlendFunc( BlendFactor::Type srcFactorRgb,   BlendFactor::Type destFactorRgb,
+                     BlendFactor::Type srcFactorAlpha, BlendFactor::Type destFactorAlpha );
 
   /**
    * @copydoc Dali::RenderableActor::GetBlendFunc()
    */
-  BlendingFactor::Type GetBlendSrcFactorRgb() const;
+  BlendFactor::Type GetBlendSrcFactorRgb() const;
 
   /**
    * @copydoc Dali::RenderableActor::GetBlendFunc()
    */
-  BlendingFactor::Type GetBlendDestFactorRgb() const;
+  BlendFactor::Type GetBlendDestFactorRgb() const;
 
   /**
    * @copydoc Dali::RenderableActor::GetBlendFunc()
    */
-  BlendingFactor::Type GetBlendSrcFactorAlpha() const;
+  BlendFactor::Type GetBlendSrcFactorAlpha() const;
 
   /**
    * @copydoc Dali::RenderableActor::GetBlendFunc()
    */
-  BlendingFactor::Type GetBlendDestFactorAlpha() const;
+  BlendFactor::Type GetBlendDestFactorAlpha() const;
 
   /**
    * @copydoc Dali::RenderableActor::SetBlendEquation()
    */
-  void SetBlendEquation( BlendingEquation::Type equationRgb, BlendingEquation::Type equationAlpha );
+  void SetBlendEquation( BlendEquation::Type equationRgb, BlendEquation::Type equationAlpha );
 
   /**
    * @copydoc Dali::RenderableActor::GetBlendEquation()
    */
-  BlendingEquation::Type GetBlendEquationRgb() const;
+  BlendEquation::Type GetBlendEquationRgb() const;
 
   /**
    * @copydoc Dali::RenderableActor::GetBlendEquation()
    */
-  BlendingEquation::Type GetBlendEquationAlpha() const;
+  BlendEquation::Type GetBlendEquationAlpha() const;
 
   /**
    * Set the blend color.
@@ -119,7 +120,7 @@ private:
 
   unsigned int mBitmask; ///< A bitmask of blending options
 
-  Vector4* mBlendColor; ///< A heap-allocated color (owned)
+  OwnerPointer< Vector4> mBlendColor; ///< A heap-allocated color (owned)
 
 };
 
@@ -127,4 +128,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_BLENDING_OPTIONS_H__
+#endif // DALI_BLENDING_OPTIONS_H