X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.hpp;h=6cbd355c51a902d1f161ea18c3f5192c2e0c9321;hb=c1d85371b1eb693128cf9553c356ea77e609d9a3;hp=ebdf495f76755bc82dbf544276c5bb8653a6c738;hpb=6bc7a273350721be300423b1509527f336dce50e;p=apps%2Fagl-service-windowmanager-2017.git

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index ebdf495..6cbd355 100644
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -25,6 +25,7 @@
 #include "layers.hpp"
 #include "layout.hpp"
 #include "wayland_ivi_wm.hpp"
+#include "pm_wrapper.hpp"
 #include "hmi-debug.h"
 #include "request.hpp"
 #include "wm_error.hpp"
@@ -65,6 +66,7 @@ extern const char kKeyWidthPixel[];
 extern const char kKeyHeightPixel[];
 extern const char kKeyWidthMm[];
 extern const char kKeyHeightMm[];
+extern const char kKeyScale[];
 extern const char kKeyIds[];
 
 struct id_allocator
@@ -226,8 +228,11 @@ class WindowManager
     void removeClient(const std::string &appid);
     void exceptionProcessForTransition();
     const char* convertRoleOldToNew(char const *role);
+
     // Do not use this function
     void timerHandler();
+    void startTransitionWrapper(std::vector<WMAction> &actions);
+    void processError(WMError error);
 
   private:
     bool pop_pending_events();
@@ -254,13 +259,11 @@ class WindowManager
     WMError doTransition(unsigned sequence_number);
     WMError checkPolicy(unsigned req_num);
     WMError startTransition(unsigned req_num);
-    WMError setInvisibleTask(const std::string &role, bool split);
 
     WMError doEndDraw(unsigned req_num);
     WMError layoutChange(const WMAction &action);
     WMError visibilityChange(const WMAction &action);
     WMError setSurfaceSize(unsigned surface, const std::string& area);
-    WMError changeCurrentState(unsigned req_num);
     void    emitScreenUpdated(unsigned req_num);
 
     void setTimer();
@@ -271,13 +274,13 @@ class WindowManager
 
     const char *check_surface_exist(const char *role);
 
-    bool can_split(struct LayoutState const &state, int new_id);
-
   private:
     std::unordered_map<std::string, struct compositor::rect> area2size;
     std::unordered_map<std::string, std::string> roleold2new;
     std::unordered_map<std::string, std::string> rolenew2old;
 
+    PMWrapper pmw;
+
     static const char* kDefaultOldRoleDb;
 };