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

Conflicts:
	dali/internal/event/text/atlas/glyph-atlas.h
	dali/internal/event/text/atlas/texture-atlas.cpp
	dali/internal/event/text/atlas/texture-atlas.h
	dali/internal/event/text/font-impl.cpp
	dali/internal/event/text/font-metrics.cpp
	dali/internal/file.list
	dali/internal/render/gl-resources/bitmap-texture.h
	dali/internal/render/gl-resources/texture-cache.h
	dali/public-api/text/text-style.cpp

Change-Id: Ic5d6f2084145d48f22012989837b0c4fdae5739f

diff --cc automated-tests/src/dali/CMakeLists.txt
Simple merge

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

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

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/bitmap-texture.cpp
Simple merge

diff --cc dali/internal/render/gl-resources/bitmap-texture.h
index 3fc0a8e,7cbdfbc..d2470c7
--- 1/dali/internal/render/gl-resources/bitmap-texture.h
--- 2/dali/internal/render/gl-resources/bitmap-texture.h
+++ b/dali/internal/render/gl-resources/bitmap-texture.h
@@@ -73,7 -74,30 +73,14 @@@ public
     */
    virtual ~BitmapTexture();
  
 -public: // Message interface
 -
 -  /**
 -   * Upload an array of bitmaps
 -   * @param bitmapArray array of bitmap items
 -   */
 -  void UploadBitmapArray( const BitmapUploadArray& bitmapArray);
 -
 -  /**
 -   * Clear an array of areas from bitmap to the given color
 -   * @param[in] areaArray Array of rects to clear
 -   * @param[in] blockSize Size of block to clear
 -   * @param[in] color Clear color
 -   */
 -  void ClearAreas( const BitmapClearArray& areaArray, std::size_t blockSize, uint32_t color );
 -
+   /**
+    * Retrieve the bitmap
+    * @return The bitmap or NULL if already discarded
+    */
+   Integration::Bitmap* GetBitmap() { return mBitmap.Get(); }
+ 
  public:
+ 
    /**
     * @copydoc Texture::Init
     */

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

diff --cc dali/internal/render/gl-resources/texture-cache.h
index 07ed002,1bbc7f9..e8b66bf
--- 1/dali/internal/render/gl-resources/texture-cache.h
--- 2/dali/internal/render/gl-resources/texture-cache.h
+++ b/dali/internal/render/gl-resources/texture-cache.h
@@@ -137,6 -138,23 +138,16 @@@ public
    void UpdateTexture( ResourceId id, Integration::BitmapPtr bitmap );
  
    /**
 - /**
 -   * Add an array of bitmaps to an existing texture used as an Atlas
 -   * @param[in] id Resource id of the texture
 -   * @param[in] uploadArray array of upload bitmap structures
 -   */
 -  void AddBitmapUploadArray( ResourceId id, const BitmapUploadArray& uploadArray );
 -
+    * Update the part of a texture with a newly loaded bitmap
+    * May be called from Update thread
+    * @param[in] destId The ID of the texture to update
+    * @param[in] srcId The resource ID of the source bitmap
+    * @param [in] xOffset Specifies an offset in the x direction within the texture
+    * @param [in] yOffset Specifies an offset in the y direction within the texture
+    */
+   void UpdateTexture( ResourceId destId, ResourceId srcId, std::size_t xOffset, std::size_t yOffset );
+ 
+   /**
     * Update the area of the texture from the associated bitmap
     * @param[in] id Resource Id of the bitmap
     * @param[in] area The area of the bitmap that has changed

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
Simple merge

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

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