Merge "remove 58k unnecessary asserts from dali-demo startup" into tizen

diff --git a/dali/public-api/object/base-handle.cpp b/dali/public-api/object/base-handle.cpp
index 45473a3..9347aa8 100644 (file)
--- a/dali/public-api/object/base-handle.cpp
+++ b/dali/public-api/object/base-handle.cpp
@@ -74,15 +74,11 @@ bool BaseHandle::GetTypeInfo(Dali::TypeInfo& typeInfo) const
 
 BaseObject& BaseHandle::GetBaseObject()
 {
-  DALI_ASSERT_ALWAYS( mObjectHandle.Get() && "BaseHandle is empty" );
-
   return static_cast<BaseObject&>(*mObjectHandle);
 }
 
 const BaseObject& BaseHandle::GetBaseObject() const
 {
-  DALI_ASSERT_ALWAYS(mObjectHandle.Get() && "BaseHandle is empty" );
-
   return static_cast<const BaseObject&>(*mObjectHandle);
 }
 

diff --git a/dali/public-api/object/base-handle.h b/dali/public-api/object/base-handle.h
index 77bd59e..e726bcd 100644 (file)
--- a/dali/public-api/object/base-handle.h
+++ b/dali/public-api/object/base-handle.h
@@ -149,7 +149,7 @@ public:
    * @brief Retrieve the internal Dali resource.
    *
    * This is useful for checking the reference count of the internal resource.
-   * This method will assert, if the Dali::BaseHandle has not been initialized.
+   * This method will not check the validity of the handle so the caller is expected to check it by using if (handle)
    * @return The BaseObject which is referenced by the BaseHandle.
    */
   BaseObject& GetBaseObject();
@@ -158,7 +158,7 @@ public:
    * @brief Retrieve the internal Dali resource.
    *
    * This is useful for checking the reference count of the internal resource.
-   * This method will assert, if the Dali::BaseHandle has not been initialized.
+   * This method will not check the validity of the handle so the caller is expected to check it by using if (handle)
    * @return The BaseObject which is referenced by the BaseHandle.
    */
   const BaseObject& GetBaseObject() const;