From 56777c6d7b7803abf7ef3b1f7720c08011b9454e Mon Sep 17 00:00:00 2001 From: leerang song Date: Thu, 21 Mar 2013 11:13:39 +0900 Subject: [PATCH] [Release] wrt-commons_0.2.107 Change-Id: Ida34aa7af228983f502ceb69d846821548b6746c --- debian/changelog | 7 +++ .../dao/security_origin_dao.cpp | 1 + .../dao/security_origin_dao_types.cpp | 5 -- .../security-origin-dao/security_origin_dao.h | 3 +- .../security_origin_dao_types.h | 16 ++----- modules/widget_dao/CMakeLists.txt | 2 + .../widget_dao/dao/widget_dao_read_only.cpp | 13 ++++++ modules/widget_dao/dao/widget_dao_types.cpp | 36 +++++++++++++++ .../include/dpl/wrt-dao-ro/common_dao_types.h | 2 + .../dpl/wrt-dao-ro/config_parser_data.h | 25 ++++++++++ .../dpl/wrt-dao-ro/widget_dao_read_only.h | 1 + .../include/dpl/wrt-dao-ro/widget_dao_types.h | 46 +++++++++++++++++++ packaging/wrt-commons.spec | 4 +- 13 files changed, 140 insertions(+), 21 deletions(-) mode change 100644 => 100755 modules/security_origin_dao/dao/security_origin_dao.cpp mode change 100644 => 100755 modules/security_origin_dao/dao/security_origin_dao_types.cpp mode change 100644 => 100755 modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao.h mode change 100644 => 100755 modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao_types.h mode change 100644 => 100755 modules/widget_dao/CMakeLists.txt mode change 100644 => 100755 modules/widget_dao/dao/widget_dao_read_only.cpp create mode 100755 modules/widget_dao/dao/widget_dao_types.cpp mode change 100644 => 100755 modules/widget_dao/include/dpl/wrt-dao-ro/common_dao_types.h mode change 100644 => 100755 modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h create mode 100755 modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_types.h diff --git a/debian/changelog b/debian/changelog index 6f7aaea..e427917 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +wrt-commons (0.2.107) unstable; urgency=low + + * Add Account parser + * Get plivilege feature for auto W3C fullsceen mode + + -- leerang Thu, 21 Mar 2013 10:56:01 +0900 + wrt-commons (0.2.106) unstable; urgency=low * Add one field for new attribute 'touch-effect' of diff --git a/modules/security_origin_dao/dao/security_origin_dao.cpp b/modules/security_origin_dao/dao/security_origin_dao.cpp old mode 100644 new mode 100755 index 9840665..746e61c --- a/modules/security_origin_dao/dao/security_origin_dao.cpp +++ b/modules/security_origin_dao/dao/security_origin_dao.cpp @@ -37,6 +37,7 @@ using namespace DPL::DB::ORM; using namespace DPL::DB::ORM::security_origin; namespace SecurityOriginDB { +using namespace WrtDB; #define SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN Try #define SQL_CONNECTION_EXCEPTION_HANDLER_END(message) \ diff --git a/modules/security_origin_dao/dao/security_origin_dao_types.cpp b/modules/security_origin_dao/dao/security_origin_dao_types.cpp old mode 100644 new mode 100755 index 23ea30c..8d2a9f8 --- a/modules/security_origin_dao/dao/security_origin_dao_types.cpp +++ b/modules/security_origin_dao/dao/security_origin_dao_types.cpp @@ -26,9 +26,4 @@ #include namespace SecurityOriginDB { -const std::map g_W3CPrivilegeTextMap = { - {"http://tizen.org/privilege/location", FEATURE_GEOLOCATION}, - {"http://tizen.org/privilege/notification", FEATURE_WEB_NOTIFICATION}, - {"http://tizen.org/privilege/mediacapture", FEATURE_USER_MEDIA} -}; } // namespace SecurityOriginDB diff --git a/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao.h b/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao.h old mode 100644 new mode 100755 index 964715e..146ea6d --- a/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao.h +++ b/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao.h @@ -25,6 +25,7 @@ #include #include #include +#include namespace SecurityOriginDB { class SecurityOriginDAO @@ -47,7 +48,7 @@ class SecurityOriginDAO void setSecurityOriginData(const SecurityOriginData &securityOriginData, const Result result, const bool readOnly = false); - void setPrivilegeSecurityOriginData(const Feature feature, + void setPrivilegeSecurityOriginData(const WrtDB::Feature feature, bool isOnlyAllowedLocalOrigin = true); void removeSecurityOriginData(const SecurityOriginData &securityOriginData); void removeSecurityOriginData(const Result result); diff --git a/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao_types.h b/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao_types.h old mode 100644 new mode 100755 index 582de0f..feaaf89 --- a/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao_types.h +++ b/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao_types.h @@ -28,17 +28,9 @@ #include #include #include +#include namespace SecurityOriginDB { -enum Feature -{ - FEATURE_START = 0, - FEATURE_GEOLOCATION = 0, - FEATURE_WEB_NOTIFICATION, - FEATURE_USER_MEDIA, - FEATURE_END = FEATURE_USER_MEDIA -}; - enum Result { RESULT_UNKNOWN = 0, @@ -48,8 +40,6 @@ enum Result RESULT_DENY_ALWAYS }; -extern const std::map g_W3CPrivilegeTextMap; - struct Origin { DPL::String scheme; @@ -79,10 +69,10 @@ struct Origin struct SecurityOriginData { - Feature feature; + WrtDB::Feature feature; Origin origin; - SecurityOriginData(const Feature features, const Origin& ori) : + SecurityOriginData(const WrtDB::Feature features, const Origin& ori) : feature(features), origin(ori) {} diff --git a/modules/widget_dao/CMakeLists.txt b/modules/widget_dao/CMakeLists.txt old mode 100644 new mode 100755 index cf1034f..1c58aa9 --- a/modules/widget_dao/CMakeLists.txt +++ b/modules/widget_dao/CMakeLists.txt @@ -52,6 +52,7 @@ set(WRT_DAO_RO_SOURCES dao/widget_dao_read_only.cpp dao/webruntime_database.cpp dao/WrtDatabase.cpp + dao/widget_dao_types.cpp ) set(WRT_DAO_RW_SOURCES @@ -130,6 +131,7 @@ INSTALL(FILES include/dpl/wrt-dao-ro/widget_dao_read_only.h include/dpl/wrt-dao-ro/wrt_db_types.h include/dpl/wrt-dao-ro/WrtDatabase.h + include/dpl/wrt-dao-ro/widget_dao_types.h DESTINATION include/dpl-efl/dpl/wrt-dao-ro ) diff --git a/modules/widget_dao/dao/widget_dao_read_only.cpp b/modules/widget_dao/dao/widget_dao_read_only.cpp old mode 100644 new mode 100755 index b52a2b0..d97416e --- a/modules/widget_dao/dao/widget_dao_read_only.cpp +++ b/modules/widget_dao/dao/widget_dao_read_only.cpp @@ -1268,6 +1268,19 @@ TizenPkgId WidgetDAOReadOnly::getTizenPkgId() const return row.Get_tizen_pkgid(); } +PrivilegeList WidgetDAOReadOnly::getWidgetPrivilege() const +{ + //TODO check widget existance + SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN + { + WRT_DB_SELECT(select, WidgetPrivilege, &WrtDatabase::interface()) + select->Where(Equals(m_widgetHandle)); + + return select->GetValueList(); + } + SQL_CONNECTION_EXCEPTION_HANDLER_END("Failed to get PrivilegeList") +} + #undef SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN #undef SQL_CONNECTION_EXCEPTION_HANDLER_END #undef CHECK_WIDGET_EXISTENCE diff --git a/modules/widget_dao/dao/widget_dao_types.cpp b/modules/widget_dao/dao/widget_dao_types.cpp new file mode 100755 index 0000000..50976e2 --- /dev/null +++ b/modules/widget_dao/dao/widget_dao_types.cpp @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + */ +/** + * + * @file widget_dao_types.cpp + * @author Leerang Song (leerang.song@samsung.com) + * @version 1.0 + * @brief This file contains the declaration of + * common data types forwidget database. + */ + +#include +#include + +namespace WrtDB { + +const std::map g_W3CPrivilegeTextMap = { + {"http://tizen.org/privilege/location", FEATURE_GEOLOCATION}, + {"http://tizen.org/privilege/notification", FEATURE_WEB_NOTIFICATION}, + {"http://tizen.org/privilege/mediacapture", FEATURE_USER_MEDIA}, + {"http://tizen.org/privilege/fullscreen", FEATURE_FULLSCREEN_MODE} +}; +} // namespace SecurityOriginDB diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/common_dao_types.h b/modules/widget_dao/include/dpl/wrt-dao-ro/common_dao_types.h old mode 100644 new mode 100755 index 234ef6e..5866b20 --- a/modules/widget_dao/include/dpl/wrt-dao-ro/common_dao_types.h +++ b/modules/widget_dao/include/dpl/wrt-dao-ro/common_dao_types.h @@ -157,6 +157,8 @@ typedef std::list WidgetAccessInfoList; typedef std::list WindowModeList; +typedef std::list PrivilegeList; + typedef std::set EncryptedFileList; /** diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h b/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h index 27f9855..77a633e 100644 --- a/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h +++ b/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h @@ -260,6 +260,29 @@ class ConfigParserData bool operator<=(const LiveboxInfo&) const; }; typedef std::list > LiveboxList; + + enum IconSectionType + { + DefaultIcon =0, + SmallIcon, + }; + + typedef std::set> IconSet; + typedef std::list CapabilityList; + typedef std::set> DisplayNameSet; + + struct AccountProvider + { + AccountProvider() : + m_multiAccountSupport(false) + { } + + bool m_multiAccountSupport; + IconSet m_iconSet; + DisplayNameSet m_displayNameSet; + CapabilityList m_capabilityList; + }; + LiveboxList m_livebox; typedef std::list DependsPkgList; @@ -327,6 +350,8 @@ class ConfigParserData DPL::OptionalString backgroundPage; // For category CategoryList categoryList; + // For Account + AccountProvider accountProvider; ConfigParserData() : flashNeeded(false), diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h old mode 100644 new mode 100755 index 95f0365..738434d --- a/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h +++ b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_read_only.h @@ -827,6 +827,7 @@ class WidgetDAOReadOnly * @return tizen package id */ TizenPkgId getTizenPkgId() const; + PrivilegeList getWidgetPrivilege() const; }; } // namespace WrtDB diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_types.h b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_types.h new file mode 100755 index 0000000..d170f3b --- /dev/null +++ b/modules/widget_dao/include/dpl/wrt-dao-ro/widget_dao_types.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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. + */ +/** + * + * @file widget_dao_types.h + * @author Leerang Song (leerang.song@samsung.com) + * @version 1.0 + * @brief This file contains the declaration of + * common data types forwidget database. + */ +#ifndef _WIDGET_DAO_TYPES_H_ +#define _WIDGET_DAO_TYPES_H_ + +#include +#include +#include +#include + +namespace WrtDB { + +enum Feature +{ + FEATURE_START = 0, + FEATURE_GEOLOCATION = 0, + FEATURE_WEB_NOTIFICATION, + FEATURE_USER_MEDIA, + FEATURE_FULLSCREEN_MODE, + FEATURE_END = FEATURE_FULLSCREEN_MODE +}; +extern const std::map g_W3CPrivilegeTextMap; +} // namespace WrtDB + +#endif // _WIDGET_DAO_TYPES_H_ diff --git a/packaging/wrt-commons.spec b/packaging/wrt-commons.spec index 45775fe..a0e65fe 100644 --- a/packaging/wrt-commons.spec +++ b/packaging/wrt-commons.spec @@ -1,7 +1,7 @@ -#git:framework/web/wrt-commons wrt-commons 0.2.106 +#git:framework/web/wrt-commons wrt-commons 0.2.107 Name: wrt-commons Summary: Wrt common library -Version: 0.2.106 +Version: 0.2.107 Release: 1 Group: Development/Libraries License: Apache License, Version 2.0 -- 2.34.1