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

Conflicts:
	automated-tests/src/dali/CMakeLists.txt
	automated-tests/src/dali/utc-Dali-TextActor.cpp
	dali/integration-api/platform-abstraction.h
	dali/internal/event/actors/text-actor-impl.cpp
	dali/public-api/actors/text-actor.h
	dali/public-api/shader-effects/shader-effect.h

Change-Id: Ie11e1650979d994dc66975c65c55d88ca05570ee

diff --cc automated-tests/src/dali-internal/CMakeLists.txt
index 8fbfd4c,26b6e8f..c0157ce
--- 1/automated-tests/src/dali-internal/CMakeLists.txt
--- 2/automated-tests/src/dali-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-internal/CMakeLists.txt
@@@ -9,9 -9,15 +9,11 @@@ SET(TC_SOURCE
          utc-Dali-Internal-Handles.cpp
          utc-Dali-Internal-ImageFactory.cpp
          utc-Dali-Internal-Mesh.cpp
 -        utc-Dali-Internal-Text.cpp
          utc-Dali-Internal-ResourceClient.cpp
          utc-Dali-Internal-Image-Culling.cpp
 -        utc-Dali-Internal-Text-Culling.cpp
          utc-Dali-Internal-Constraint.cpp
+         utc-Dali-Internal-FixedSizeMemoryPool.cpp
+         utc-Dali-Internal-MemoryPoolObjectAllocator.cpp
  )
  
  LIST(APPEND TC_SOURCES

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

diff --cc automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
Simple merge

diff --cc automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
Simple merge

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

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

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

diff --cc dali/integration-api/platform-abstraction.h
index 5f7601e,5b16ccb..9708d1c
--- 1/dali/integration-api/platform-abstraction.h
--- 2/dali/integration-api/platform-abstraction.h
+++ b/dali/integration-api/platform-abstraction.h
@@@ -190,6 -320,93 +190,14 @@@ public
     */
    virtual DynamicsFactory* GetDynamicsFactory() = 0;
  
 -   * Read from the metrics cache into the global metrics parameter
 -   *
 -   * @note fontFamily and fontStyle must have been validated previously.
 -   * @see ValidateFontFamilyName().
 -   *
 -   * @param[in] fontFamily The name of the font family
 -   * @param[in] fontStyle The name of the font style
 -   * @param[out] globalMetrics The data store to write into
 -   * @return \e true if the operation succeeded
 -   */
 -  virtual bool ReadGlobalMetricsFromCache( const std::string& fontFamily,
 -                                           const std::string& fontStyle,
 -                                           Integration::GlobalMetrics& globalMetrics ) = 0;
 -
 -  /**
 -   *
 -   * @note fontFamily and fontStyle must have been validated previously.
 -   * @see ValidateFontFamilyName().
 -   *
 -   * Write the global metrics parameter to the metrics cache
 -   * @param[in] fontFamily The name of the font family
 -   * @param[in] fontStyle The name of the font style
 -   * @param[out] globalMetrics The data store to write
 -   */
 -  virtual void WriteGlobalMetricsToCache( const std::string& fontFamily,
 -                                          const std::string& fontStyle,
 -                                          const Integration::GlobalMetrics& globalMetrics ) = 0;
 -
 -  /**
 -   * Read the metrics from the cache into the supplied vector
 -   *
 -   * @note fontFamily and fontStyle must have been validated previously.
 -   * @see ValidateFontFamilyName().
 -   *
 -   * @param[in] fontFamily The name of the font family
 -   * @param[in] fontStyle The name of the font style
 -   * @param[out] glyphMetricsContainer The vector of metrics to write
 -   * @return true if the operation succeeded
 -   */
 -  virtual bool ReadMetricsFromCache( const std::string& fontFamily,
 -                                     const std::string& fontStyle,
 -                                     std::vector<Integration::GlyphMetrics>& glyphMetricsContainer ) = 0;
 -
 -  /**
 -   * Write the metrics to the cache
 -   *
 -   * @note fontFamily and fontStyle must have been validated previously.
 -   * @see ValidateFontFamilyName().
 -   *
 -   * @param[in] fontFamily The name of the font family
 -   * @param[in] fontStyle The name of the font style
 -   * @param[in] glyphSet The set of metrics to write
 -   */
 -  virtual void WriteMetricsToCache( const std::string& fontFamily,
 -                                    const std::string& fontStyle,
 -                                    const Integration::GlyphSet& glyphSet ) = 0;
 -
 -  /**
 -   * Retrieves file names from the given directory.
 -   *
 -   * @param[in] directoryName The directory name.
 -   * @param[out] fileNames The file names in the given directory.
 -   */
 -  virtual void GetFileNamesFromDirectory( const std::string& directoryName,
 -                                          std::vector<std::string>& fileNames ) = 0;
 -
 -  /**
 -   * Retrieves the glyph image which represents the character.
 -   *
 -   * @param[in] fontFamily The font's family name.
 -   * @param[in] fontStyle The font's style.
 -   * @param[in] fontSize The font's size (in points).
 -   * @param[in] character The given character.
 -   *
 -   * @return A bitmap representing the character.
 -   */
 -  virtual Integration::BitmapPtr GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, float fontSize, uint32_t character ) const = 0;
 -
 -  /**
+   /**
+    * Load a shader binary file into a buffer
+    * @param[in] filename The shader binary filename to load
+    * @param[out] buffer  A buffer to receive the file.
+    * @result             true if the file is loaded.
+    */
+   virtual bool LoadShaderBinFile( const std::string& filename, std::vector< unsigned char >& buffer ) const = 0;
+ 
  }; // class PlatformAbstraction
  
  } // namespace Integration

diff --cc dali/internal/event/effects/shader-effect-impl.cpp
Simple merge

diff --cc dali/internal/event/effects/shader-factory.cpp
Simple merge

diff --cc dali/internal/file.list
index c777091,5d1554c..2f74f2e
--- 1/dali/internal/file.list
--- 2/dali/internal/file.list
+++ b/dali/internal/file.list
@@@ -5,8 -5,10 +5,9 @@@ internal_src_files = 
    $(internal_src_dir)/common/core-impl.cpp \
    $(internal_src_dir)/common/internal-constants.cpp \
    $(internal_src_dir)/common/message-buffer.cpp \
 -  $(internal_src_dir)/common/text-parameters.cpp \
    $(internal_src_dir)/common/image-sampler.cpp \
    $(internal_src_dir)/common/dali-hash.cpp \
+   $(internal_src_dir)/common/fixed-size-memory-pool.cpp \
    \
    $(internal_src_dir)/event/actor-attachments/actor-attachment-impl.cpp \
    $(internal_src_dir)/event/actor-attachments/camera-attachment-impl.cpp \

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

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
index 53b5453,61f967e..1a2c943
--- 1/dali/public-api/shader-effects/shader-effect.h
--- 2/dali/public-api/shader-effects/shader-effect.h
+++ b/dali/public-api/shader-effects/shader-effect.h
@@@ -67,10 -67,11 +67,10 @@@ class ShaderEffect
   */
  enum GeometryType
  {
-   GEOMETRY_TYPE_IMAGE = 0x01,         ///< image, with flat color or texture
-   GEOMETRY_TYPE_UNTEXTURED_MESH = 0x02,///< Complex meshes, with flat color
-   GEOMETRY_TYPE_TEXTURED_MESH = 0x04, ///< Complex meshes, with texture
+   GEOMETRY_TYPE_IMAGE = 0x01,           ///< image, with flat color or texture
 -  GEOMETRY_TYPE_TEXT = 0x02,            ///< text, with flat color or texture
 -  GEOMETRY_TYPE_UNTEXTURED_MESH = 0x04, ///< Complex meshes, with flat color
 -  GEOMETRY_TYPE_TEXTURED_MESH = 0x08,   ///< Complex meshes, with texture
 -  GEOMETRY_TYPE_LAST = 0x10
++  GEOMETRY_TYPE_UNTEXTURED_MESH = 0x02, ///< Complex meshes, with flat color
++  GEOMETRY_TYPE_TEXTURED_MESH = 0x04,   ///< Complex meshes, with texture
 +  GEOMETRY_TYPE_LAST = 0x08
  };
  
  /**