Merge "CanvasRenderer: Add Gradient, LinearGradient, RadialGradient classes" into...

diff --cc dali/internal/canvas-renderer/common/shape-impl.h
index 44ad5c1,f4a0628..4c22519
--- 1/dali/internal/canvas-renderer/common/shape-impl.h
--- 2/dali/internal/canvas-renderer/common/shape-impl.h
+++ b/dali/internal/canvas-renderer/common/shape-impl.h
@@@ -20,8 -20,10 +20,9 @@@
  
  // EXTERNAL INCLUDES
  #include <dali/public-api/object/base-object.h>
 -#include <dali/public-api/signals/connection-tracker.h>
  
  // INTERNAL INCLUDES
+ #include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
  #include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
  #include <dali/internal/canvas-renderer/common/drawable-impl.h>
  

diff --cc dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
Simple merge

diff --cc dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
Simple merge