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

Conflicts:
	automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
	dali/internal/common/core-impl.cpp
	dali/internal/common/core-impl.h
	dali/internal/event/common/thread-local-storage.cpp
	dali/internal/event/common/thread-local-storage.h
	dali/internal/file.list
	dali/internal/render/renderers/scene-graph-text-renderer.cpp
	dali/public-api/dali-core.h

Change-Id: Ia39397ce21005dd731862e4e1d4e3cb1ebabe92f

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

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

diff --cc automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
index e645849,689286d..19a3662
--- 1/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
--- 2/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
+++ b/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
@@@ -387,7 -388,8 +388,8 @@@ int UtcDaliHitTestAlgorithmStencil(void
    layer.Add( stencil );
  
    // Create a renderable actor and add that to the layer
 -  Actor layerHitActor = TextActor::New();
 +  Actor layerHitActor = ImageActor::New();
+   layerHitActor.SetRelayoutEnabled( false );
    layerHitActor.SetSize( 100.0f, 100.0f );
    layerHitActor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
    layerHitActor.SetParentOrigin( ParentOrigin::TOP_LEFT );

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

diff --cc automated-tests/src/dali/utc-Dali-ImageActor.cpp
index da544c1,8c65eee..47b0efc
--- 1/automated-tests/src/dali/utc-Dali-ImageActor.cpp
--- 2/automated-tests/src/dali/utc-Dali-ImageActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-ImageActor.cpp
@@@ -181,8 -181,9 +181,9 @@@ int UtcDaliImageActorSetSize01(void
  
    BufferImage img = BufferImage::New( 1,1 );
    ImageActor actor = ImageActor::New( img );
+   actor.SetRelayoutEnabled( false );
  
 -  ShaderEffect effect = ShaderEffect::New( " ", " ", " ", " ", ShaderEffect::HINT_GRID );
 +  ShaderEffect effect = ShaderEffect::New( " ", " ", GEOMETRY_TYPE_IMAGE, ShaderEffect::HINT_GRID );
    actor.SetShaderEffect( effect );
  
    const float INVALID_SIZE = float(1u<<31);

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

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

diff --cc dali/internal/common/core-impl.cpp
index e94b3a3,982f7d3..bbd6ac3
--- 1/dali/internal/common/core-impl.cpp
--- 2/dali/internal/common/core-impl.cpp
+++ b/dali/internal/common/core-impl.cpp
@@@ -423,6 -454,16 +436,11 @@@ GestureEventProcessor& Core::GetGesture
    return *(mGestureEventProcessor);
  }
  
 -EmojiFactory& Core::GetEmojiFactory()
 -{
 -  return *mEmojiFactory;
 -}
 -
+ RelayoutController& Core::GetRelayoutController()
+ {
+   return *(mRelayoutController.Get());
+ }
+ 
  void Core::CreateThreadLocalStorage()
  {
    // a pointer to the ThreadLocalStorage object will be stored in TLS

diff --cc dali/internal/common/core-impl.h
index 0393f25,353f50e..5154cb2
--- 1/dali/internal/common/core-impl.h
--- 2/dali/internal/common/core-impl.h
+++ b/dali/internal/common/core-impl.h
@@@ -59,6 -59,9 +59,7 @@@ class ResourceManager
  class ImageFactory;
  class ShaderFactory;
  class TouchResampler;
 -class EmojiFactory;
+ class RelayoutController;
  
  namespace SceneGraph
  {
@@@ -258,6 -267,18 +259,12 @@@ private:  // for use by ThreadLocalStor
     */
    GestureEventProcessor& GetGestureEventProcessor();
  
 -   * Returns the Emoji factory.
 -   * @return a reference to the Emoji factory.
 -   */
 -  EmojiFactory& GetEmojiFactory();
 -
 -  /**
+   /**
+    * Return the relayout controller
+    * @Return Return a reference to the relayout controller
+    */
+   RelayoutController& GetRelayoutController();
+ 
  private:
  
    /**
@@@ -291,6 -313,8 +298,7 @@@ private
    ResourceClient*                           mResourceClient;              ///< Asynchronous Resource Loading
    ResourceManager*                          mResourceManager;             ///< Asynchronous Resource Loading
    TouchResampler*                           mTouchResampler;              ///< Resamples touches to correct frame rate.
 -  EmojiFactory*                             mEmojiFactory;                ///< Emoji resource factory.
+   IntrusivePtr< RelayoutController >        mRelayoutController;          ///< Size negotiation relayout controller
  
    bool                                      mIsActive         : 1;        ///< Whether Core is active or suspended
    bool                                      mProcessingEvent  : 1;        ///< True during ProcessEvents()

diff --cc dali/internal/event/common/thread-local-storage.cpp
index 3648713,5bf87ae..04944f9
--- 1/dali/internal/event/common/thread-local-storage.cpp
--- 2/dali/internal/event/common/thread-local-storage.cpp
+++ b/dali/internal/event/common/thread-local-storage.cpp
@@@ -114,6 -119,16 +114,11 @@@ GestureEventProcessor& ThreadLocalStora
    return mCore->GetGestureEventProcessor();
  }
  
 -EmojiFactory& ThreadLocalStorage::GetEmojiFactory()
 -{
 -  return mCore->GetEmojiFactory();
 -}
 -
+ RelayoutController& ThreadLocalStorage::GetRelayoutController()
+ {
+   return mCore->GetRelayoutController();
+ }
+ 
  } // namespace Internal
  
  } // namespace Dali

diff --cc dali/internal/event/common/thread-local-storage.h
index dad308f,956211e..01dbcbf
--- 1/dali/internal/event/common/thread-local-storage.h
--- 2/dali/internal/event/common/thread-local-storage.h
+++ b/dali/internal/event/common/thread-local-storage.h
@@@ -39,8 -39,11 +39,9 @@@ class NotificationManager
  class ResourceClient;
  class ResourceManager;
  class ImageFactory;
 -class FontFactory;
  class ShaderFactory;
  class GestureEventProcessor;
 -class EmojiFactory;
+ class RelayoutController;
  
  namespace SceneGraph
  {
@@@ -145,6 -154,18 +146,12 @@@ public
     */
    GestureEventProcessor& GetGestureEventProcessor();
  
 -   * Returns the Emoji factory.
 -   * @return a reference to the Emoji factory.
 -   */
 -  EmojiFactory& GetEmojiFactory();
 -
 -  /**
+   /**
+    * Return the relayout controller
+    * @Return Return a reference to the relayout controller
+    */
+   RelayoutController& GetRelayoutController();
+ 
  private:
  
    Core* mCore;                            ///< reference to core

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

diff --cc dali/internal/file.list
index f62180e,8204242..7d5dcad
--- 1/dali/internal/file.list
--- 2/dali/internal/file.list
+++ b/dali/internal/file.list
@@@ -90,9 -95,34 +91,10 @@@ internal_src_files = 
    $(internal_src_dir)/event/resources/resource-client.cpp \
    $(internal_src_dir)/event/resources/resource-ticket.cpp \
    $(internal_src_dir)/event/resources/resource-type-path.cpp \
 -  $(internal_src_dir)/event/text/character-impl.cpp \
 -  $(internal_src_dir)/event/text/glyph-metric.cpp \
 -  $(internal_src_dir)/event/text/font-layout.cpp \
 -  $(internal_src_dir)/event/text/font-factory.cpp \
 -  $(internal_src_dir)/event/text/font-impl.cpp \
 -  $(internal_src_dir)/event/text/font-metrics.cpp \
 -  $(internal_src_dir)/event/text/text-format.cpp \
 -  $(internal_src_dir)/event/text/text-request-helper.cpp \
 -  $(internal_src_dir)/event/text/text-impl.cpp \
 -  $(internal_src_dir)/event/text/utf8-impl.cpp \
 -  $(internal_src_dir)/event/text/glyph-status/glyph-status.cpp \
 -  $(internal_src_dir)/event/text/glyph-status/glyph-status-container.cpp \
 -  $(internal_src_dir)/event/text/glyph-status/debug/glyph-status-container-debug.cpp \
 -  $(internal_src_dir)/event/text/atlas/texture-atlas.cpp \
 -  $(internal_src_dir)/event/text/atlas/atlas-size.cpp \
 -  $(internal_src_dir)/event/text/atlas/atlas-ranking.cpp \
 -  $(internal_src_dir)/event/text/atlas/atlas-rank-generator.cpp \
 -  $(internal_src_dir)/event/text/atlas/debug/atlas-debug.cpp \
 -  $(internal_src_dir)/event/text/atlas/glyph-atlas.cpp \
 -  $(internal_src_dir)/event/text/atlas/glyph-atlas-manager.cpp \
 -  $(internal_src_dir)/event/text/resource/glyph-resource-manager.cpp \
 -  $(internal_src_dir)/event/text/resource/glyph-resource-request.cpp \
 -  $(internal_src_dir)/event/text/resource/debug/glyph-resource-debug.cpp \
 -  $(internal_src_dir)/event/text/generator/text-vertex-generator.cpp \
+   $(internal_src_dir)/event/size-negotiation/memory-pool-relayout-container.cpp \
+   $(internal_src_dir)/event/size-negotiation/relayout-controller-impl.cpp \
    \
    $(internal_src_dir)/render/common/culling-algorithms.cpp \
-   $(internal_src_dir)/render/common/performance-monitor.cpp \
    $(internal_src_dir)/render/common/render-algorithms.cpp \
    $(internal_src_dir)/render/common/render-debug.cpp \
    $(internal_src_dir)/render/common/render-instruction.cpp \

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

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

diff --cc dali/public-api/dali-core.h
index 74e34ab,032e4bc..f78220b
--- 1/dali/public-api/dali-core.h
--- 2/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@@ -149,6 -151,15 +149,8 @@@
  
  #include <dali/public-api/shader-effects/shader-effect.h>
  
 -#include <dali/public-api/text/font-parameters.h>
 -#include <dali/public-api/text/font.h>
 -#include <dali/public-api/text/text-actor-parameters.h>
 -#include <dali/public-api/text/text-style.h>
 -#include <dali/public-api/text/text.h>
 -#include <dali/public-api/text/utf8.h>
 -
+ #include <dali/public-api/size-negotiation/relayout-container.h>
+ 
  #include <dali/public-api/dali-core-version.h>
  
  #endif // __DALI_CORE_H__

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