From ba844a024728f9085c04bc63ec9661b27da9e88b Mon Sep 17 00:00:00 2001 From: Rafal Galka Date: Wed, 8 Apr 2015 10:37:42 +0200 Subject: [PATCH] [common] minor cleanup Change-Id: I8cbaef9cbc53893cc5da74e8b4fe238b1258774a --- src/common/callback_user_data.cc | 100 ++------------- src/common/callback_user_data.h | 50 +++----- src/common/common.gyp | 2 - src/common/multi_callback_user_data.cc | 169 ------------------------- src/common/multi_callback_user_data.h | 58 --------- 5 files changed, 29 insertions(+), 350 deletions(-) delete mode 100755 src/common/multi_callback_user_data.cc delete mode 100755 src/common/multi_callback_user_data.h diff --git a/src/common/callback_user_data.cc b/src/common/callback_user_data.cc index 6480e879..68fa953c 100644 --- a/src/common/callback_user_data.cc +++ b/src/common/callback_user_data.cc @@ -16,109 +16,35 @@ // #include "common/callback_user_data.h" -//#include "common/multi_callback_user_data.h" -//#include -//namespace DeviceAPI { namespace common { namespace { const char* CALLBACK_SUCCESS = "success"; const char* CALLBACK_ERROR = "error"; -} //anonymous namespace +} // anonymous namespace -CallbackUserData::CallbackUserData(): -// m_context(global_ctx), -// m_impl(new MultiCallbackUserData()), - m_is_act(true) -{ +CallbackUserData::CallbackUserData() : + m_is_act(true) { } -CallbackUserData::~CallbackUserData() -{ -// delete m_impl; +CallbackUserData::~CallbackUserData() { } -//void CallbackUserData::setSuccessCallback(JSValueRef on_success) -//{ -// if(on_success && JSValueIsObject(m_context, on_success)) { -// JSObjectRef success = JSValueToObject(m_context, on_success, NULL); -// m_impl->setCallback(CALLBACK_SUCCESS, success); -// } -//} -// -//void CallbackUserData::setErrorCallback(JSValueRef on_error) -//{ -// if(on_error && JSValueIsObject(m_context, on_error)) { -// JSObjectRef error = JSValueToObject(m_context, on_error, NULL); -// m_impl->setCallback(CALLBACK_ERROR, error); -// } -//} -// -//void CallbackUserData::callSuccessCallback(int count, JSValueRef obj[]) -//{ -// if(!m_is_act) { -// return; -// } -// -// m_impl->invokeCallback(CALLBACK_SUCCESS, count, obj); -//} -// -//void CallbackUserData::callSuccessCallback(JSValueRef obj) -//{ -// JSValueRef args[1] = {obj}; -// callSuccessCallback(1, args); -//} -// -//void CallbackUserData::callSuccessCallback() -//{ -// callSuccessCallback(0, NULL); -//} -// -//void CallbackUserData::callErrorCallback(int count, JSValueRef obj[]) -//{ -// if(!m_is_act) { -// return; -// } -// -// m_impl->invokeCallback(CALLBACK_ERROR, count, obj); -//} -// -//void CallbackUserData::callErrorCallback(JSValueRef obj) -//{ -// JSValueRef args[1] = {obj}; -// callErrorCallback(1, args); -//} -// -//void CallbackUserData::callErrorCallback() -//{ -// callErrorCallback(0, NULL); -//} -// -//JSContextRef CallbackUserData::getContext() -//{ -// return m_context; -//} - -void CallbackUserData::setActive(bool act) -{ - m_is_act = act; +void CallbackUserData::setActive(bool act) { + m_is_act = act; } -bool CallbackUserData::isActive() const -{ - return m_is_act; +bool CallbackUserData::isActive() const { + return m_is_act; } -void CallbackUserData::setJson(std::shared_ptr json) -{ - m_json = json; +void CallbackUserData::setJson(std::shared_ptr json) { + m_json = json; } -std::shared_ptr CallbackUserData::getJson() const -{ - return m_json; +std::shared_ptr CallbackUserData::getJson() const { + return m_json; } -} // Common -//} // DeviceAPI +} // common diff --git a/src/common/callback_user_data.h b/src/common/callback_user_data.h index 6441f681..4d33fa32 100644 --- a/src/common/callback_user_data.h +++ b/src/common/callback_user_data.h @@ -16,57 +16,39 @@ // // Class added for backward compatibility with WRT plugins. -// To be cleaned/replaced in the future (TODO). +// TODO To be cleaned/replaced in the future. -#ifndef __TIZEN_COMMON_CALLBACK_USER_DATA_H__ -#define __TIZEN_COMMON_CALLBACK_USER_DATA_H__ +#ifndef COMMON_CALLBACK_USER_DATA_H_ +#define COMMON_CALLBACK_USER_DATA_H_ -//#include #include "common/picojson.h" #include -//namespace DeviceAPI { namespace common { -//class MultiCallbackUserData; - class CallbackUserData { public: - CallbackUserData(); - virtual ~CallbackUserData(); + CallbackUserData(); -// JSContextRef getContext(); -// void setSuccessCallback(JSValueRef on_success); -// void setErrorCallback(JSValueRef on_error); -// -// void callSuccessCallback(); -// void callSuccessCallback(JSValueRef obj); -// void callSuccessCallback(int count, JSValueRef obj[]); -// -// void callErrorCallback(); -// void callErrorCallback(JSValueRef obj); -// void callErrorCallback(int count, JSValueRef obj[]); + virtual ~CallbackUserData(); - void setActive(bool act); - bool isActive() const; - void setJson(std::shared_ptr json); - std::shared_ptr getJson() const; + void setActive(bool act); + bool isActive() const; - virtual void setError(const std::string& err_name, - const std::string& err_message) = 0; + void setJson(std::shared_ptr json); + std::shared_ptr getJson() const; + + virtual void setError(const std::string& err_name, + const std::string& err_message) = 0; protected: - std::shared_ptr m_json; + std::shared_ptr m_json; private: -// JSContextRef m_context; -// MultiCallbackUserData* m_impl; - bool m_is_act; + bool m_is_act; }; -} // Common -//} // DeviceAPI - -#endif //__TIZEN_COMMON_CALLBACK_USER_DATA_H__ +} // common +#endif // COMMON_CALLBACK_USER_DATA_H_ diff --git a/src/common/common.gyp b/src/common/common.gyp index 5431b063..dcdd7d9f 100644 --- a/src/common/common.gyp +++ b/src/common/common.gyp @@ -34,8 +34,6 @@ 'callback_user_data.cc', 'callback_user_data.h', 'optional.h', - #'multi_callback_user_data.cc', - #'multi_callback_user_data.h', 'platform_result.cc', 'platform_result.h', 'assert.h', diff --git a/src/common/multi_callback_user_data.cc b/src/common/multi_callback_user_data.cc deleted file mode 100755 index fd41f441..00000000 --- a/src/common/multi_callback_user_data.cc +++ /dev/null @@ -1,169 +0,0 @@ -// -// Tizen Web Device API -// Copyright (c) 2013 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. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -#include "common/multi_callback_user_data.h" -//#include "GlobalContextManager.h" -//#include "PlatformException.h" -//#include "WebKitProxy.h" -//#include "JSUtil.h" -#include "common/logger.h" - -//using namespace std; - -//namespace DeviceAPI { -namespace common { - -MultiCallbackUserData::MultiCallbackUserData() //: -// m_context(global_ctx), -// m_object(NULL) -{ -} - -//MultiCallbackUserData::MultiCallbackUserData(JSContextRef global_ctx, -// JSObjectRef object) : -// m_context(global_ctx), -// m_object(object) -//{ -// if(m_object) { -// JSValueProtect(m_context, m_object); -// } -//} -// -//MultiCallbackUserData::~MultiCallbackUserData() -//{ -// if(!GlobalContextManager::getInstance()->isAliveGlobalContext(m_context)) { -// //Remove Callback functions in Native Map -// CallbackMapT::iterator itr; -// for(itr = m_callbacks.begin(); itr != m_callbacks.end(); ++itr) { -// if(itr->second) { -// JSValueUnprotect(m_context, itr->second); -// } -// } -// -// //Remove Callback Object -// if(m_object) { -// JSValueUnprotect(m_context, m_object); -// } -// } -//} -// -//void MultiCallbackUserData::setCallback(const string &key, JSObjectRef callback) -//{ -// // Callback Object Case -// if(m_object) { -// JSUtil::setProperty(m_context, m_object, key.c_str(), callback, -// kJSPropertyAttributeNone); -// return; -// } -// -// // Callback function Case -// CallbackMapT::iterator itr = m_callbacks.find(key); -// if(itr != m_callbacks.end() && itr->second) { -// JSValueUnprotect(m_context, itr->second); -// } -// -// if(callback) { -// JSValueProtect(m_context, callback); -// } -// -// m_callbacks[key] = callback; -//} -// -// -//void MultiCallbackUserData::invokeCallback(const std::string &key, int count, -// JSValueRef obj[]) -//{ -// if(!GlobalContextManager::getInstance()->isAliveGlobalContext(m_context)) { -// LOGE("context was closed"); -// return; -// } -// -// // Callback Object case -// if(m_object) { -// try { -// // Getting callback value -// JSValueRef callbackValue = JSUtil::getProperty(m_context, m_object, -// key.c_str()); -// -// // Testing existing -// if(JSValueIsUndefined(m_context, callbackValue)) { -// LOGE("There is no such callback: [%s]", key.c_str()); -// return; -// } -// -// JSObjectRef callbackObject = JSUtil::JSValueToObject(m_context, callbackValue); -// -// // Testing type validation -// if(!JSObjectIsFunction(m_context, callbackObject)) { -// LOGE("[%s] is not function", key.c_str()); -// return; -// } -// -// JSValueRef exception = NULL; -// JSObjectCallAsFunction(m_context, callbackObject, NULL, count, obj, -// &exception); -// -// if(exception){ -// WebKitProxy::reportException(m_context, exception); -// } -// // check Exception in function call -// if(exception != NULL) { -// throw UnknownException(m_context, exception); -// } -// } catch(const BasePlatformException& err) { -// LOGE("Error in Callback invoke - %s:%s", err.getName().c_str(), -// err.getMessage().c_str()); -// } -// return; -// } -// -// // Callback function case -// CallbackMapT::iterator itr = m_callbacks.find(key); -// if(itr == m_callbacks.end()) { -// LOGE("There is no such callback: [%s]", key.c_str()); -// return; -// } -// -// if(itr->second) { -// JSValueRef exception = NULL; -// JSObjectCallAsFunction(m_context, itr->second , NULL, count, obj, &exception); -// if(exception) -// WebKitProxy::reportException(m_context, exception); -// } -// else { -// LOGE("The callback: [%s] is NULL", key.c_str()); -// } -//} -// -//void MultiCallbackUserData::invokeCallback(const std::string &key, JSValueRef obj) -//{ -// JSValueRef args[1] = {obj}; -// invokeCallback(key, 1, args); -//} -// -//void MultiCallbackUserData::invokeCallback(const std::string &key) -//{ -// invokeCallback(key, 0, NULL); -//} -// -//JSContextRef MultiCallbackUserData::getContext() const -//{ -// return m_context; -//} - -} // Common -//} // DeviceAPI diff --git a/src/common/multi_callback_user_data.h b/src/common/multi_callback_user_data.h deleted file mode 100755 index b75f164e..00000000 --- a/src/common/multi_callback_user_data.h +++ /dev/null @@ -1,58 +0,0 @@ -// -// Tizen Web Device API -// Copyright (c) 2013 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. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -// Class added for backward compatibility with WRT plugins. -// To be cleaned/replaced in the future (TODO). - -#ifndef __TIZEN_COMMON_MULTI_CALLBACK_USER_DATA_H__ -#define __TIZEN_COMMON_MULTI_CALLBACK_USER_DATA_H__ - -//#include -#include -#include -#include - -//namespace DeviceAPI { -namespace common { - -class MultiCallbackUserData; -typedef std::shared_ptr MultiCallbackUserDataPtr; - -class MultiCallbackUserData { -public: - MultiCallbackUserData(); -// MultiCallbackUserData(JSContextRef global_ctx, JSObjectRef object); - virtual ~MultiCallbackUserData(); - -// JSContextRef getContext() const; -// void setCallback(const std::string &key, JSObjectRef callback); -// -// void invokeCallback(const std::string &key); -// void invokeCallback(const std::string &key, JSValueRef obj); -// void invokeCallback(const std::string &key, int count, JSValueRef obj[]); - -//private: -// JSContextRef m_context; -// JSObjectRef m_object; -// typedef std::map CallbackMapT; -// CallbackMapT m_callbacks; -}; - -} // Common -//} // DeviceAPI - -#endif //__TIZEN_COMMON_MULTI_CALLBACK_USER_DATA_H__ -- 2.34.1