Merge "TextVisual implementation." into devel/master

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

diff --cc dali-toolkit/internal/visuals/visual-base-impl.cpp
index 4156d1a,b5d5037..86d2114
--- 1/dali-toolkit/internal/visuals/visual-base-impl.cpp
--- 2/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@@ -152,17 -167,7 +167,7 @@@ void Visual::Base::DoSetOffStage( Actor
    mImpl->mRenderer.Reset();
  }
  
- void Visual::Base::CreatePropertyMap( Property::Map& map ) const
- {
-   DoCreatePropertyMap( map );
- 
-   if( mImpl->mCustomShader )
-   {
-     mImpl->mCustomShader->CreatePropertyMap( map );
-   }
- }
- 
 -bool Visual::Base::GetIsOnStage() const
 +bool Visual::Base::IsOnStage() const
  {
    return mImpl->mFlags & Impl::IS_ON_STAGE;
  }

diff --cc dali-toolkit/internal/visuals/visual-base-impl.h
Simple merge

diff --cc dali-toolkit/internal/visuals/visual-factory-impl.cpp
Simple merge