[dali_1.4.26] 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 7cd6891..177360f 100644 (file)
--- a/plugins/dali-script-v8/src/utils/v8-utils.h
+++ b/plugins/dali-script-v8/src/utils/v8-utils.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_V8PLUGIN_V8_UTILS_H__
-#define __DALI_V8PLUGIN_V8_UTILS_H__
+#ifndef DALI_V8PLUGIN_V8_UTILS_H
+#define DALI_V8PLUGIN_V8_UTILS_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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
@@ -133,17 +142,14 @@ std::string GetJavaScriptFunctionName(  const char* functionName );
  std::string PropertyNameToJavaScriptName(const std::string& hyphenatedName);
 
 /**
- * Convert camelCase to hyphenated to (Wrapper property name to Dali property)
- * E.g. anchorPoint to "anchor-point"
- * @param[in] camelCase a std::string camelCase
- * @return a hyphenated std::string conversion
+ * Script error, throws an exception
  */
- std::string JavaScriptNameToPropertyName(const std::string& camelCase);
+void ScriptError( const char* function, v8::Isolate* isolate, std::string errorString );
 
 /**
- * Script error, throws an exception
+ * Script warning
  */
-void ScriptError( const char* function, v8::Isolate* isolate, std::string errorString );
+void ScriptWarning( const char* function, std::string warningString );
 
 /**
  * @return in the value is a boolean primitive or a boolean object
@@ -377,5 +383,5 @@ void ReadIntegerArguments( bool& foundAllArguments, int* data, int dataSize, con
 } // namespace Dali
 
 
-#endif // __DALI_V8PLUGIN_V8_UTILS_H__
+#endif // DALI_V8PLUGIN_V8_UTILS_H