Merge "Refactored ControlRenderer so that derived classes are responsible for the...

diff --cc dali-toolkit/internal/controls/image-view/image-view-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
index 1f2e178,8e0d094..43c6bde
--- 1/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
--- 2/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
+++ b/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
@@@ -141,23 -143,11 +143,11 @@@ void BorderRenderer::InitializeRenderer
    if( !shader )
    {
      shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
 -    mFactoryCache.SaveShader( RendererFactoryCache::COLOR_SHADER, shader );
 +    mFactoryCache.SaveShader( RendererFactoryCache::BORDER_SHADER, shader );
    }
  
-   if( !renderer )
-   {
-     Material material = Material::New( shader );
-     renderer = Renderer::New( geometry, material );
-   }
-   else
-   {
-     mImpl->mRenderer.SetGeometry( geometry );
-     Material material = mImpl->mRenderer.GetMaterial();
-     if( material )
-     {
-       material.SetShader( shader );
-     }
-   }
+   Material material = Material::New( shader );
+   mImpl->mRenderer = Renderer::New( geometry, material );
  }
  
  void BorderRenderer::SetBorderColor(const Vector4& color)

diff --cc dali-toolkit/public-api/controls/control-impl.cpp
Simple merge