From: Taejeong Lee <taejeong.lee@samsung.com>
Date: Thu, 31 Jan 2013 13:10:04 +0000 (+0900)
Subject: Crash Fix when Creating SecurityOrigin DB.
X-Git-Tag: 2.1b_release~22^2~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d67a7c4ec3b774ce29822b381de1c4cd5d5c4aa;p=platform%2Fframework%2Fweb%2Fwrt.git

Crash Fix when Creating SecurityOrigin DB.

 * The SecurityOrigin DB was created using wrong path.
   Fixed to use tizen package id.
 * New 'TzPkgId' member was added to WidgetMoDel.

[Issue#] N/A
[Problem] Crash Fix when Creating SecurityOrigin DB.
[Cause] The SecurityOrigin DB was created using wrong path.
[Solution] Fixed to use tizen package id.

Change-Id: Ia95a07399c0563bfba0214f00f1d2502f960f4bb
---

diff --git a/src/domain/widget_model.cpp b/src/domain/widget_model.cpp
index 625899e..ae62983 100644
--- a/src/domain/widget_model.cpp
+++ b/src/domain/widget_model.cpp
@@ -53,6 +53,8 @@ struct BindToWidgetDAOStatic :
 
 WidgetModel::WidgetModel(const std::string &tizenId) :
     TizenId(DPL::FromASCIIString(tizenId)),
+    TzPkgId(this, &BindToWidgetDAO<WrtDB::TizenPkgId,
+                                   &WidgetDAOReadOnly::getTizenPkgId>::Get),
     Type(this, &BindToWidgetDAO<WidgetType,
          &WidgetDAOReadOnly::getWidgetType>::Get),
     ActualSize(this),
diff --git a/src/domain/widget_model.h b/src/domain/widget_model.h
index 51ff9fc..c261184 100644
--- a/src/domain/widget_model.h
+++ b/src/domain/widget_model.h
@@ -48,8 +48,18 @@ class WidgetModel : public DPL::Event::Model
 
     /**
      * @brief Tizen id
+     *
+     *  ex> "TizenIDabc.appname"
+     *
+     *  - TizenId / AppId : "TizenIDabc.appname"
+     *  - TzPkgId         : "TizenIDabc"
+     *  - App name        : "appname"
+     *
      */
     DPL::String TizenId;
+    DPL::Event::Property<WrtDB::TizenPkgId,
+                      DPL::Event::PropertyReadOnly,
+                      DPL::Event::PropertyStorageDynamicCached> TzPkgId;
 
     /**
      * @brief Widget type
diff --git a/src/view/common/view_logic_security_origin_support.cpp b/src/view/common/view_logic_security_origin_support.cpp
index bc2f8fa..31fe832 100644
--- a/src/view/common/view_logic_security_origin_support.cpp
+++ b/src/view/common/view_logic_security_origin_support.cpp
@@ -63,7 +63,7 @@ class SecurityOriginSupportImplementation
             LogDebug("initialize securityOriginDAO");
             m_securityOriginDAO =
                 SecurityOriginDB::SecurityOriginDAOPtr(
-                    new SecurityOriginDB::SecurityOriginDAO(m_model->TizenId));
+                    new SecurityOriginDB::SecurityOriginDAO(m_model->TzPkgId.Get()));
             // initialize security result data. Remove allow, deny for
             m_securityOriginDAO->removeSecurityOriginData(
                 SecurityOriginDB::RESULT_ALLOW_ONCE);