From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Tue, 27 Oct 2015 14:29:07 +0000 (-0700)
Subject: Merge "Refactored ControlRenderer so that derived classes are responsible for the... 
X-Git-Tag: dali_1.1.8~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6da8438e9ac7350d9cc6f69b35cbcc4ab3987da1

Merge "Refactored ControlRenderer so that derived classes are responsible for the creation of the renderer." into devel/master
---

6da8438e9ac7350d9cc6f69b35cbcc4ab3987da1
diff --cc dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
index 1f2e178,8e0d094..43c6bde
--- a/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)