From 1dd41d642c77181d99375192708bf62b1d3d2c2d Mon Sep 17 00:00:00 2001
From: Paul Wisbey <p.wisbey@samsung.com>
Date: Fri, 8 Aug 2014 13:09:52 +0100
Subject: [PATCH] Removed invalid handle assignments from Builder/TextInput

[problem] Unsafe handle assignments.
[solution] Removed the code assigning a shader to actor handle etc.

Change-Id: I70c85135693751840e429fdffa17d6a90a2b27d2
---
 .../internal/builder/builder-animations.cpp   | 38 +++++++++++--------
 .../internal/builder/builder-impl.cpp         |  2 +-
 .../text-input/text-input-handles-impl.cpp    |  2 +-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/base/dali-toolkit/internal/builder/builder-animations.cpp b/base/dali-toolkit/internal/builder/builder-animations.cpp
index 9f8bc47680..b3a4bb462d 100644
--- a/base/dali-toolkit/internal/builder/builder-animations.cpp
+++ b/base/dali-toolkit/internal/builder/builder-animations.cpp
@@ -216,27 +216,33 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
       DALI_ASSERT_ALWAYS( actorName && "Animation must specify actor name" );
       DALI_ASSERT_ALWAYS( property  && "Animation must specify a property name" );
 
-      Actor targetActor = searchActor.FindChildByName( *actorName );
-      DALI_ASSERT_ALWAYS( targetActor && "Actor must exist for property" );
+      Handle targetHandle = searchActor.FindChildByName( *actorName );
+      DALI_ASSERT_ALWAYS( targetHandle && "Actor must exist for property" );
 
-      Property::Index idx( targetActor.GetPropertyIndex( *property ) );
+      Property::Index idx( targetHandle.GetPropertyIndex( *property ) );
 
-      // A limitation here is that its possible that between binding to the signal and
-      // the signal call that the ShaderEffect of the targetActor has been changed.
-      // However this is a unlikely use case especially when using scripts.
+      // if the property is not found from the (actor) handle, try to downcast it to renderable actor
+      // to allow animating shader uniforms
       if( idx == Property::INVALID_INDEX )
       {
-        if( ShaderEffect effect = targetActor.GetShaderEffect() )
+        RenderableActor renderable = RenderableActor::DownCast( targetHandle );
+        if( renderable )
         {
-          idx = effect.GetPropertyIndex( *property );
-          if(idx != Property::INVALID_INDEX)
+          // A limitation here is that its possible that between creation of animation
+          // and running it the ShaderEffect of the actor has been changed.
+          // However this is a unlikely use case especially when using scripts.
+          if( ShaderEffect effect = renderable.GetShaderEffect() )
           {
-            targetActor = effect;
-          }
-          else
-          {
-            DALI_SCRIPT_WARNING( "Cannot find property on object or ShaderEffect\n" );
-            continue;
+            idx = effect.GetPropertyIndex( *property );
+            if(idx != Property::INVALID_INDEX)
+            {
+              targetHandle = effect;
+            }
+            else
+            {
+              DALI_SCRIPT_WARNING( "Cannot find property on object or ShaderEffect\n" );
+              continue;
+            }
           }
         }
         else
@@ -252,7 +258,7 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
         continue;
       }
 
-      Property prop( Property( targetActor, idx ) );
+      Property prop( Property( targetHandle, idx ) );
       Property::Value propValue;
 
       // these are the defaults
diff --git a/base/dali-toolkit/internal/builder/builder-impl.cpp b/base/dali-toolkit/internal/builder/builder-impl.cpp
index dc59a7e375..5c6b2a3e1b 100644
--- a/base/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/base/dali-toolkit/internal/builder/builder-impl.cpp
@@ -725,7 +725,7 @@ FrameBufferImage Builder::GetFrameBufferImage( const std::string &name, const Re
         if( SetPropertyFromNode( *image, Property::MAP, propertyMap, constant ) )
         {
           propertyMap.SetValue(KEYNAME_TYPE, Property::Value(std::string("FrameBufferImage")));
-          ret = Dali::Scripting::NewImage( propertyMap );
+          ret = FrameBufferImage::DownCast( Dali::Scripting::NewImage( propertyMap ) );
           mFrameBufferImageLut[ name ] = ret;
         }
       }
diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
index 9743198fc3..32a4b8e96e 100644
--- a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
@@ -68,7 +68,7 @@ Actor CreateGrabArea( const std::string& name, const Vector3& relativeScale )
   return handleGrabArea;
 }
 
-Actor CreateHandle( const Vector3& anchorPoint, const Image& handleImage, const std::string& name )
+ImageActor CreateHandle( const Vector3& anchorPoint, const Image& handleImage, const std::string& name )
 {
   DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextInputHandles: CreateSelectionHandle\n" );
 
-- 
2.34.1