Merge "UTC coverage for MathUtils,Matrix,Uint16Pair,PropertyTypes" into tizen

diff --git a/automated-tests/src/dali/utc-Dali-CustomActor.cpp b/automated-tests/src/dali/utc-Dali-CustomActor.cpp
index 579dba4..44b15c7 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-CustomActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-CustomActor.cpp
@@ -1931,8 +1931,20 @@ int UtcDaliCustomActorTypeRegistry(void)
   catch( DaliException& e )
   {
     exception = e.condition;
-    DALI_TEST_EQUALS( exception, "handle && \"BaseObject handle is empty\"", NULL );
+    DALI_TEST_EQUALS( exception, "handle && \"BaseObject handle is empty\"", TEST_LOCATION );
   }
 
   END_TEST;
 }
+
+
+int UtcDaliCustomActorGetExtensionP(void)
+{
+  TestApplication application;
+
+  TestCustomActor custom = TestCustomActor::NewVariant5();
+
+  DALI_TEST_CHECK( NULL == custom.GetImplementation().GetExtension() );
+
+  END_TEST;
+}

diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h
index e1873f2..c29d1cb 100644 (file)
--- a/dali/public-api/actors/custom-actor-impl.h
+++ b/dali/public-api/actors/custom-actor-impl.h
@@ -60,6 +60,8 @@ class DALI_IMPORT_API CustomActorImpl : public Dali::RefObject
 {
 public:
 
+  class Extension; ///< Forward declare future extension interface
+
   /**
    * @brief Virtual destructor.
    */
@@ -129,7 +131,7 @@ public:
    * @param[in] index The Property index that was set.
    * @param[in] propertyValue The value to set.
    */
-  virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) ;
+  virtual void OnPropertySet( Property::Index index, Property::Value propertyValue );
 
   /**
    * @brief Called when the owning actor's size is set e.g. using Actor::SetSize().
@@ -268,6 +270,16 @@ public:
    */
   virtual void OnLayoutNegotiated( float size, Dimension::Type dimension ) = 0;
 
+  /**
+   * Retrieve the extension for this control
+   *
+   * @return The extension if available, NULL otherwise
+   */
+  virtual Extension* GetExtension()
+  {
+    return NULL;
+  }
+
 protected: // For derived classes
 
   // Flags for the constructor