Update wm_layer

Change-Id: Id4b9fe2ec6603e8ab0ad5cfa9b0af6dce3b1d149
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/wm_layer.hpp b/src/wm_layer.hpp
index 6cfd9c2..001134a 100644
--- a/src/wm_layer.hpp
+++ b/src/wm_layer.hpp
@@ -28,15 +28,20 @@ struct json_object;
 namespace wm
 {
 
+class WMClient;
 class LayerState
 {
   public:
     LayerState();
     ~LayerState() = default;
+    void attachIdToArea(const std::string& area, const WMClient&);
+    const std::unordered_map<std::string, std::string> popCurrentState();
+    const std::unordered_map<std::string, std::string> getCurrentState();
+    const std::vector<unsigned> getIviIdList();
+
   private:
-    std::vector<unsigned> _ivi_layer_id_list;
-    std::unordered_map<std::string, unsigned> area2ivi_layer_id;
-    // std::map<std::string, unsigned> _render_order;
+    std::vector<unsigned> render_order;
+    std::unordered_map<std::string, std::string> area2appid;
 };
 
 class LayerSetting
@@ -53,7 +58,7 @@ class LayerSetting
 
     const std::string& layerName() { return this->name; }
     MANAGEMENT_TYPE layerType() { return this->type; };
-    void appendRole(const std::string& role);
+    void setRoleList(const std::string& role);
     void appendArea(const std::string& area);
     unsigned idBegin() { return this->id_begin; }
     unsigned idEnd()   { return this->id_end; }
@@ -70,7 +75,7 @@ class LayerSetting
   private:
     std::string name = ""; // Layer name
     MANAGEMENT_TYPE type;
-    std::vector<std::string> role_list;
+    std::string role_list;
     std::vector<std::string> area_list;
     std::vector<unsigned>    id_list;
     unsigned id_begin;