Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	dali/internal/update/resources/resource-manager.h
	dali/public-api/actors/text-actor.h
	dali/public-api/scripting/scripting.h

Change-Id: I0c89909f20b40d72fe3718387eed1a87519c0822

diff --cc automated-tests/src/dali/utc-Dali-TypeRegistry.cpp
Simple merge

diff --cc dali/internal/common/fixed-size-memory-pool.cpp
index c2594aa,c2594aa..5ee0377
--- 1/dali/internal/common/fixed-size-memory-pool.cpp
--- 2/dali/internal/common/fixed-size-memory-pool.cpp
+++ b/dali/internal/common/fixed-size-memory-pool.cpp
@@@ -19,7 -19,7 +19,7 @@@
  #include <dali/internal/common/fixed-size-memory-pool.h>
  
  // INTERNAL HEADERS
--#include <dali/public-api/dali-core.h>
++#include <dali/public-api/common/dali-common.h>
  
  namespace Dali
  {

diff --cc dali/internal/event/images/buffer-image-impl.h
index 9dbd3c2,a8d7294..618846f
--- 1/dali/internal/event/images/buffer-image-impl.h
--- 2/dali/internal/event/images/buffer-image-impl.h
+++ b/dali/internal/event/images/buffer-image-impl.h
@@@ -19,11 -19,10 +19,11 @@@
   */
  
  // INTERNAL INCLUDES
 +#include <dali/integration-api/bitmap.h> // For Integration::BitmapPtr
  #include <dali/public-api/object/ref-object.h>
- #include <dali/public-api/images/buffer-image.h>
- #include <dali/public-api/images/image.h>
  #include <dali/internal/event/images/image-impl.h>
+ #include <dali/public-api/images/image.h>
+ #include <dali/public-api/images/buffer-image.h>
  
  namespace Dali
  {

diff --cc dali/internal/event/resources/resource-client.cpp
Simple merge

diff --cc dali/internal/event/resources/resource-client.h
index 015105c,9c0edc3..88e1920
--- 1/dali/internal/event/resources/resource-client.h
--- 2/dali/internal/event/resources/resource-client.h
+++ b/dali/internal/event/resources/resource-client.h
@@@ -27,8 -27,10 +27,9 @@@
  #include <dali/internal/event/resources/resource-client-declarations.h>
  #include <dali/internal/event/resources/image-ticket.h>
  #include <dali/internal/event/resources/resource-ticket-lifetime-observer.h>
 -#include <dali/internal/common/bitmap-upload.h>
  #include <dali/internal/common/message.h>
  #include <dali/internal/update/modeling/internal-mesh-data.h>
++#include <dali/integration-api/bitmap.h>
  
  namespace Dali
  {

diff --cc dali/internal/file.list
Simple merge

diff --cc dali/internal/render/common/texture-cache-dispatcher.h
Simple merge

diff --cc dali/internal/render/gl-resources/texture-cache.cpp
Simple merge

diff --cc dali/internal/render/gl-resources/texture-cache.h
Simple merge

diff --cc dali/internal/render/shaders/program.cpp
Simple merge

diff --cc dali/internal/update/resources/resource-manager.cpp
Simple merge

diff --cc dali/internal/update/resources/resource-manager.h
index 612f13a,ff201de..9c848e3
--- 1/dali/internal/update/resources/resource-manager.h
--- 2/dali/internal/update/resources/resource-manager.h
+++ b/dali/internal/update/resources/resource-manager.h
@@@ -362,7 -408,19 +371,6 @@@ public
    /********************************************************************************
     ********************************* Private Methods  *****************************
     ********************************************************************************/
--private:
 -
 -  /**
 -   * @param[in] id Resource id to clear
 -   * @param[in] typePath Glyphs to be loaded, and cleared beforehand
 -   */
 -  void ClearRequestedGlyphArea( ResourceId id, const ResourceTypePath& typePath );
 -
 -  /**
 -   * Sends loaded glyphs to texture atlas for uploading
 -   * @param[in] glyphSet Loaded glyphs
 -   */
 -  void UploadGlyphsToTexture( const Integration::GlyphSet& glyphSet );
  
    /**
     * Sends notification messages for load sucess & failure,

diff --cc dali/public-api/dali-core.h
Simple merge

diff --cc dali/public-api/file.list
Simple merge

diff --cc dali/public-api/shader-effects/shader-effect.h
Simple merge