[dali_1.1.35] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / plugins / dali-script-v8 / src / utils / v8-utils.h

diff --git a/plugins/dali-script-v8/src/utils/v8-utils.h b/plugins/dali-script-v8/src/utils/v8-utils.h
index 1551868..63ff2c6 100644 (file)
--- a/plugins/dali-script-v8/src/utils/v8-utils.h
+++ b/plugins/dali-script-v8/src/utils/v8-utils.h
@@ -50,6 +50,7 @@ enum
 };
 
 #define DALI_SCRIPT_EXCEPTION( isolate, message ) V8Utils::ScriptError( __FUNCTION__ , isolate, message );
+#define DALI_SCRIPT_WARNING( message ) V8Utils::ScriptWarning( __FUNCTION__ , message );
 
 namespace V8Utils
 {
@@ -96,6 +97,14 @@ void GetFileName( const std::string& fullPathName, std::string& fileName);
 void GetModuleName( const std::string& fileName, std::string& moduleName );
 
 /**
+ * Compare whether two DALi property maps are identical
+ * @param[in] map1 The first property map to be compared
+ * @param[in] map2 The second property map to be compared
+ * @return true if the two specified property maps are identical or false if not.
+ */
+bool IsPropertyMapIdentical(Property::Map map1, Property::Map map2);
+
+/**
  * Report an exception by writing as a warning to the Dali Log
  *
  * @param[in] try_catch The v8 TryCatch exception object
@@ -138,6 +147,11 @@ std::string GetJavaScriptFunctionName(  const char* functionName );
 void ScriptError( const char* function, v8::Isolate* isolate, std::string errorString );
 
 /**
+ * Script warning
+ */
+void ScriptWarning( const char* function, std::string warningString );
+
+/**
  * @return in the value is a boolean primitive or a boolean object
  */
 bool IsBooleanPrimitiveOrObject( const v8::Local<v8::Value>& value );