Merge "Wrap mode support for AnimatedImageVisual" into devel/master

diff --combined dali-toolkit/internal/visuals/text/text-visual.cpp
index 9e91e3b,5f15294..6977eb5
--- 1/dali-toolkit/internal/visuals/text/text-visual.cpp
--- 2/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@@ -50,8 -50,6 +50,6 @@@ const char * const VERTICAL_ALIGNMENT_P
  const char * const TEXT_COLOR_PROPERTY( "textColor" );
  const char * const ENABLE_MARKUP_PROPERTY( "enableMarkup" );
  
- const std::string PIXEL_AREA_UNIFORM_NAME = "pixelArea";
- 
  const Scripting::StringEnum HORIZONTAL_ALIGNMENT_STRING_TABLE[] =
  {
    { "BEGIN",  Toolkit::Text::Layout::HORIZONTAL_ALIGN_BEGIN  },
@@@ -282,7 -280,7 +280,7 @@@ void TextVisual::DoSetOnStage( Actor& a
    mImpl->mRenderer = Renderer::New( geometry, shader );
    mImpl->mRenderer.SetProperty( Dali::Renderer::Property::DEPTH_INDEX, Toolkit::DepthIndex::TEXT );
  
 -  UpdateRenderer();
 +  UpdateRenderer( true ); // Renderer needs textures and to be added to control
  }
  
  void TextVisual::DoSetOffStage( Actor& actor )
@@@ -304,7 -302,7 +302,7 @@@
  
  void TextVisual::OnSetTransform()
  {
 -  UpdateRenderer();
 +  UpdateRenderer( false );
  }
  
  void TextVisual::DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue )
@@@ -382,7 -380,7 +380,7 @@@
    }
  }
  
 -void TextVisual::UpdateRenderer()
 +void TextVisual::UpdateRenderer( bool initializeRendererAndTexture )
  {
    Actor control = mControl.GetHandle();
    if( !control )
@@@ -418,7 -416,7 +416,7 @@@
  
    const Text::Controller::UpdateTextType updateTextType = mController->Relayout( relayoutSize );
  
 -  if( Text::Controller::NONE_UPDATED != ( Text::Controller::MODEL_UPDATED & updateTextType ) )
 +  if( Text::Controller::NONE_UPDATED != ( Text::Controller::MODEL_UPDATED & updateTextType ) || initializeRendererAndTexture )
    {
      // Removes the texture set.
      RemoveTextureSet();