From: Jihoon Chung Date: Thu, 9 May 2013 04:49:24 +0000 (+0900) Subject: Support tizen:metadata X-Git-Tag: submit/tizen_2.2/20130927.091100^2~98 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2404ac2041c378eef11f8dd671e3a84a575d7a1a;p=platform%2Fframework%2Fweb%2Fwrt-commons.git Support tizen:metadata [Issue#] N/A [Problem] N/A [Cause] N/A [Solution] Support tizen:metadata This key & value is written in the manifest.xml to be used by other application. Verification : pkginfo --metadata [SCMRequest] N/A Change-Id: Iec6368d9c9c5ef71122309937537699d84581a5b --- diff --git a/modules/widget_dao/dao/config_parser_data.cpp b/modules/widget_dao/dao/config_parser_data.cpp index 4477344..4bf4857 100644 --- a/modules/widget_dao/dao/config_parser_data.cpp +++ b/modules/widget_dao/dao/config_parser_data.cpp @@ -413,4 +413,14 @@ bool ConfigParserData::LiveboxInfo::operator!=(const LiveboxInfo& other) const m_label != other.m_label && m_icon != other.m_icon; } + +bool ConfigParserData::Metadata::operator== (const Metadata& other) const +{ + return key == other.key && value == other.value; +} + +bool ConfigParserData::Metadata::operator!= (const Metadata& other) const +{ + return key != other.key || value != other.value; +} } // namespace WrtDB 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 2a85422..bc78fe4 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 @@ -254,6 +254,21 @@ class ConfigParserData }; typedef std::list AllowNavigationInfoList; + struct Metadata + { + Metadata(const DPL::String& _key, + const DPL::String& _value) : + key(_key), + value(_value) + {} + DPL::String key; + DPL::String value; + + bool operator==(const Metadata&) const; + bool operator!=(const Metadata&) const; + }; + typedef std::list MetadataList; + enum class SecurityModelVersion { SECURITY_MODEL_V1 = 0, // WARP SECURITY_MODEL_V2 // CSP, allow-navigation @@ -327,6 +342,8 @@ class ConfigParserData AccountProvider accountProvider; // security model version SecurityModelVersion securityModelVersion; + // security model version + MetadataList metadataList; ConfigParserData() : flashNeeded(false),