diff --git a/frameworks/ims/input_event_client_proxy.h b/frameworks/ims/input_event_client_proxy.h index 21fb3becd965065d84471dce604ddf6a6da0814a..b2d86f41bc164048c88897db7c88d7462d0ffedf 100755 --- a/frameworks/ims/input_event_client_proxy.h +++ b/frameworks/ims/input_event_client_proxy.h @@ -17,7 +17,7 @@ #define GRAPHIC_LITE_IMS_LISTERNER_PROXY_H #include "input_event_distributer.h" -#include "input_event_info.h" +#include "gfx_utils/input_event_info.h" #include "input_manager_service.h" #include "liteipc_adapter.h" #include "serializer.h" diff --git a/frameworks/ims/input_event_listener_proxy.cpp b/frameworks/ims/input_event_listener_proxy.cpp index 55c752e152eb6835f2ebf7187fb73f0698ae1e55..7d396502a55cdb9dcfaa887a50f2277f73259cf7 100755 --- a/frameworks/ims/input_event_listener_proxy.cpp +++ b/frameworks/ims/input_event_listener_proxy.cpp @@ -14,7 +14,7 @@ */ #include "input_event_listener_proxy.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "samgr_lite.h" namespace OHOS { diff --git a/frameworks/wms/lite_proxy_surface.cpp b/frameworks/wms/lite_proxy_surface.cpp index a4b44fb3cb61c39da4f985b46dbe3ff370f3b970..7b26da821c176ac604b225824b9712b8de60b24e 100755 --- a/frameworks/wms/lite_proxy_surface.cpp +++ b/frameworks/wms/lite_proxy_surface.cpp @@ -14,7 +14,7 @@ */ #include "lite_proxy_surface.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" namespace OHOS { LiteProxySurface::LiteProxySurface(Surface* surface) diff --git a/frameworks/wms/lite_proxy_window.cpp b/frameworks/wms/lite_proxy_window.cpp index 1a7d069a3d3c6315094aca472d6814478c7191d3..98e186ef299722b5536c7a30387034a72f9bb32b 100755 --- a/frameworks/wms/lite_proxy_window.cpp +++ b/frameworks/wms/lite_proxy_window.cpp @@ -14,7 +14,7 @@ */ #include "lite_proxy_window.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "surface.h" namespace OHOS { diff --git a/frameworks/wms/lite_proxy_windows_manager.cpp b/frameworks/wms/lite_proxy_windows_manager.cpp index fb02234302029212fea7a9a5ce788f916ad302f6..7e1fe2ed6622bfd6fc9541c66672d9f4b8b3d5fa 100755 --- a/frameworks/wms/lite_proxy_windows_manager.cpp +++ b/frameworks/wms/lite_proxy_windows_manager.cpp @@ -15,8 +15,8 @@ #include "lite_proxy_windows_manager.h" -#include "color.h" -#include "graphic_log.h" +#include "gfx_utils/color.h" +#include "gfx_utils/graphic_log.h" #include "lite_wm_requestor.h" #include "lite_wms_client.h" diff --git a/frameworks/wms/lite_win_requestor.cpp b/frameworks/wms/lite_win_requestor.cpp index 1d823056252e04dd06c071ceebf28083af982d61..e5a732f18c3cea43984616ba0d870d3e52f8113d 100755 --- a/frameworks/wms/lite_win_requestor.cpp +++ b/frameworks/wms/lite_win_requestor.cpp @@ -14,7 +14,7 @@ */ #include "lite_win_requestor.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "lite_wm_type.h" #include "lite_wms_client.h" #include "surface_impl.h" diff --git a/frameworks/wms/lite_win_requestor.h b/frameworks/wms/lite_win_requestor.h index ade103200bde35b184f1cd810e2e041f7c08f901..bdbcb83c6ebcf7b6391377882428e1683bff81dc 100755 --- a/frameworks/wms/lite_win_requestor.h +++ b/frameworks/wms/lite_win_requestor.h @@ -16,8 +16,8 @@ #ifndef GRAPHIC_LITE_LITE_WIN_REQUESTOR_H #define GRAPHIC_LITE_LITE_WIN_REQUESTOR_H -#include "geometry2d.h" #include +#include "gfx_utils/geometry2d.h" #include "surface.h" namespace OHOS { diff --git a/frameworks/wms/lite_wm_requestor.cpp b/frameworks/wms/lite_wm_requestor.cpp index 6d4c8109d645f63ce174ea6109923b3a844cd3a9..66560e198cc5dfd1d99e4b2915be9aab46b6b39a 100755 --- a/frameworks/wms/lite_wm_requestor.cpp +++ b/frameworks/wms/lite_wm_requestor.cpp @@ -14,10 +14,10 @@ */ #include "lite_wm_requestor.h" -#include "graphic_log.h" -#include "input_event_info.h" +#include "gfx_utils/graphic_log.h" +#include "gfx_utils/input_event_info.h" +#include "gfx_utils/pixel_format_utils.h" #include "lite_wms_client.h" -#include "pixel_format_utils.h" #include "surface_impl.h" namespace OHOS { diff --git a/frameworks/wms/lite_wm_requestor.h b/frameworks/wms/lite_wm_requestor.h index 410c15a8b455fecc3cee09d04ae6331db6bb4487..4f88e8ca546888d8cd8cd638400807c036418dee 100755 --- a/frameworks/wms/lite_wm_requestor.h +++ b/frameworks/wms/lite_wm_requestor.h @@ -16,7 +16,7 @@ #ifndef GRAPHIC_LITE_LITE_WM_REQUESTOR_H #define GRAPHIC_LITE_LITE_WM_REQUESTOR_H -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" #include "iproxy_client.h" #include "iwindows_manager.h" #include "lite_win_requestor.h" diff --git a/frameworks/wms/lite_wms_client.cpp b/frameworks/wms/lite_wms_client.cpp index 38da9828868ef4f5788992724ea5fae4777fc195..05498d688b215f00acb98ca1503fee3b20482fa7 100755 --- a/frameworks/wms/lite_wms_client.cpp +++ b/frameworks/wms/lite_wms_client.cpp @@ -14,7 +14,7 @@ */ #include "lite_wms_client.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "lite_wm_type.h" #include "samgr_lite.h" diff --git a/interfaces/innerkits/input_event_listener_proxy.h b/interfaces/innerkits/input_event_listener_proxy.h index 56bd73292da6caece70bcec7f11e3d6b5385cad2..66e5eb486e72ee2ffe33c6f536b4ae2a67218a33 100755 --- a/interfaces/innerkits/input_event_listener_proxy.h +++ b/interfaces/innerkits/input_event_listener_proxy.h @@ -18,7 +18,7 @@ #include #include "liteipc_adapter.h" -#include "input_event_info.h" +#include "gfx_utils/input_event_info.h" namespace OHOS { class InputEventListenerProxy { diff --git a/interfaces/innerkits/isurface.h b/interfaces/innerkits/isurface.h index 1f963bda6fc2afcc3fec1dca005b8b5febb5725e..fff4a8cb6edea3cb1b8b31ccd1e8e88f6f87665a 100755 --- a/interfaces/innerkits/isurface.h +++ b/interfaces/innerkits/isurface.h @@ -16,7 +16,7 @@ #ifndef GRAPHIC_LITE_ISURFACE_H #define GRAPHIC_LITE_ISURFACE_H -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" namespace OHOS { /** diff --git a/interfaces/innerkits/iwindow.h b/interfaces/innerkits/iwindow.h index 1202b69af454af718b545562991726ef5af02710..cd51b02de3d41472bfcf2a8c1072a3a9c7346823 100755 --- a/interfaces/innerkits/iwindow.h +++ b/interfaces/innerkits/iwindow.h @@ -18,7 +18,7 @@ #include "isurface.h" #include "lite_wm_type.h" -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" namespace OHOS { /** diff --git a/interfaces/innerkits/iwindows_manager.h b/interfaces/innerkits/iwindows_manager.h index 48e8eb5d9abf0ef67bd278028da16de1103276c9..873fb452c41e54fb1d8b80470ad04573bc5e96d1 100755 --- a/interfaces/innerkits/iwindows_manager.h +++ b/interfaces/innerkits/iwindows_manager.h @@ -17,9 +17,9 @@ #define GRAPHIC_LITE_IWINDOWS_MANAGER_H #include "iwindow.h" -#include "geometry2d.h" -#include "input_event_info.h" -#include "list.h" +#include "gfx_utils/geometry2d.h" +#include "gfx_utils/input_event_info.h" +#include "gfx_utils/list.h" namespace OHOS { /** diff --git a/interfaces/innerkits/lite_wm_type.h b/interfaces/innerkits/lite_wm_type.h index 3019a47485cda96192e44813d04dae9d5deffc2d..33bba79b0a05d315b6c0595c113002f5958d4d75 100755 --- a/interfaces/innerkits/lite_wm_type.h +++ b/interfaces/innerkits/lite_wm_type.h @@ -16,8 +16,8 @@ #ifndef GRAPHIC_LITE_LITE_WM_TYPE_H #define GRAPHIC_LITE_LITE_WM_TYPE_H -#include "geometry2d.h" -#include "pixel_format_utils.h" +#include "gfx_utils/geometry2d.h" +#include "gfx_utils/pixel_format_utils.h" namespace OHOS { struct LiteWinConfig { diff --git a/services/ims/input_event_client_proxy.cpp b/services/ims/input_event_client_proxy.cpp index 0a5fa4ab28d11442e53ba71b452e33683404ab8b..81f9b639373768b3142fd4f6d06e2e3ae1c1a081 100755 --- a/services/ims/input_event_client_proxy.cpp +++ b/services/ims/input_event_client_proxy.cpp @@ -14,7 +14,7 @@ */ #include "input_event_client_proxy.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "samgr_lite.h" namespace OHOS { diff --git a/services/ims/input_event_distributer.cpp b/services/ims/input_event_distributer.cpp index a4e09427fd36edf04f1ce2d30005be7990eac129..544aaaaa870e00561cce5e5b914f8e0a14a6eee8 100755 --- a/services/ims/input_event_distributer.cpp +++ b/services/ims/input_event_distributer.cpp @@ -14,7 +14,7 @@ */ #include "input_event_distributer.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" namespace OHOS { void InputEventDistributer::Distribute(const RawEvent* events, int32_t size) diff --git a/services/ims/input_event_distributer.h b/services/ims/input_event_distributer.h index c642f14115b67aa226ccc16a701174ff98b5710c..1bb659626492ad179286e540feade1b487e407ea 100755 --- a/services/ims/input_event_distributer.h +++ b/services/ims/input_event_distributer.h @@ -17,7 +17,7 @@ #define GRAPHIC_LITE_INPUT_EVENT_DISTRIBUTER_H #include -#include "input_event_info.h" +#include "gfx_utils/input_event_info.h" namespace OHOS { /** diff --git a/services/ims/input_event_hub.cpp b/services/ims/input_event_hub.cpp index e3daed53c343c988074b02411851b4ae53bb7dcd..9b61747695e963539aeb76b174e97c89a63d4435 100755 --- a/services/ims/input_event_hub.cpp +++ b/services/ims/input_event_hub.cpp @@ -14,7 +14,7 @@ */ #include "input_event_hub.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" namespace OHOS { namespace { diff --git a/services/ims/input_event_hub.h b/services/ims/input_event_hub.h index 364360d5969e911522b379a6ccdee8d0c34b0a8a..f9c5312caedb695fb212e45103330ae6ccf7d522 100755 --- a/services/ims/input_event_hub.h +++ b/services/ims/input_event_hub.h @@ -17,8 +17,8 @@ #define GRAPHIC_LITE_INPUT_EVENT_HUB_H #include +#include "gfx_utils/input_event_info.h" #include "input-event-codes.h" -#include "input_event_info.h" #include "input_manager.h" #include "securec.h" diff --git a/services/ims/input_manager_service.cpp b/services/ims/input_manager_service.cpp index 5c8d1e0be2ff6c222c5f0f4c706c0b95c28aeb3c..f6e4e33b7b062efadb309a978945634f174f7564 100755 --- a/services/ims/input_manager_service.cpp +++ b/services/ims/input_manager_service.cpp @@ -15,7 +15,7 @@ #include "input_manager_service.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" namespace OHOS { InputEventHub* InputManagerService::hub_ = nullptr; diff --git a/services/ims/samgr_ims.cpp b/services/ims/samgr_ims.cpp index be0acd07450ff38d9d6160dd688fa5d1b90367a1..3995aad663fb5164533c56efbe3acf44bfb72d02 100755 --- a/services/ims/samgr_ims.cpp +++ b/services/ims/samgr_ims.cpp @@ -17,7 +17,7 @@ #include #include "feature.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "input_event_client_proxy.h" #include "iproxy_client.h" #include "iproxy_server.h" diff --git a/services/wms/lite_win.cpp b/services/wms/lite_win.cpp index 590a865da2011957bb4392114f4903ae6348e637..d8b842c7a293615642436ae01baf8f99bc9a4bbb 100644 --- a/services/wms/lite_win.cpp +++ b/services/wms/lite_win.cpp @@ -15,11 +15,11 @@ #include "lite_win.h" +#include "gfx_utils/graphic_log.h" +#include "gfx_utils/pixel_format_utils.h" #include "graphic_locker.h" -#include "graphic_log.h" #include "graphic_performance.h" #include "hals/gfx_engines.h" -#include "pixel_format_utils.h" #include "securec.h" #include "lite_wm.h" diff --git a/services/wms/lite_win.h b/services/wms/lite_win.h index 6cb48511e443022b8e698e2059bda18b71a7e3e7..4cce079363fb74e3635d319726b1d8db2f7ae8ba 100755 --- a/services/wms/lite_win.h +++ b/services/wms/lite_win.h @@ -17,12 +17,13 @@ #define GRAPHIC_LITE_LITE_WIN_H #include -#include "liteipc_adapter.h" -#include "serializer.h" -#include "color.h" -#include "geometry2d.h" + +#include "gfx_utils/color.h" +#include "gfx_utils/geometry2d.h" #include "isurface.h" #include "lite_wm_type.h" +#include "liteipc_adapter.h" +#include "serializer.h" #include "surface.h" namespace OHOS { diff --git a/services/wms/lite_wm.cpp b/services/wms/lite_wm.cpp index a7e9f64059df8f924aa44babac31eaa9c2111f78..977f5b39be738507dfd68747569f53ee2ddcaf26 100755 --- a/services/wms/lite_wm.cpp +++ b/services/wms/lite_wm.cpp @@ -15,9 +15,9 @@ #include "lite_wm.h" -#include "color.h" -#include "graphic_log.h" -#include "pixel_format_utils.h" +#include "gfx_utils/color.h" +#include "gfx_utils/graphic_log.h" +#include "gfx_utils/pixel_format_utils.h" namespace OHOS { namespace { diff --git a/services/wms/lite_wm.h b/services/wms/lite_wm.h index a850e9fcbd1ad1703617e13e5d23a629f9a0799c..a666c8ba46b6f187bc948ed3e9f0f1cb517a5992 100755 --- a/services/wms/lite_wm.h +++ b/services/wms/lite_wm.h @@ -20,11 +20,11 @@ #include "surface.h" -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" +#include "gfx_utils/list.h" #include "graphic_locker.h" #include "hals/hi_fbdev.h" #include "input_manager_service.h" -#include "list.h" #include "lite_win.h" diff --git a/services/wms/lite_wms.cpp b/services/wms/lite_wms.cpp index 25d785675eda64684685c4b651320fdecdb47dac..0feac13e44d7d689a36fccc4a97cd87c2ce78981 100755 --- a/services/wms/lite_wms.cpp +++ b/services/wms/lite_wms.cpp @@ -14,7 +14,7 @@ */ #include "lite_wms.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "lite_wm.h" #include "lite_wm_type.h" #include "surface.h" diff --git a/services/wms/lite_wms.h b/services/wms/lite_wms.h index f3e467688b7fe68b9e4f4186217a44fadf10812a..52a4882e201663aabe03ed244a8403738113805c 100755 --- a/services/wms/lite_wms.h +++ b/services/wms/lite_wms.h @@ -16,7 +16,7 @@ #ifndef GRAPHIC_LITE_LITE_WMS_H #define GRAPHIC_LITE_LITE_WMS_H -#include "geometry2d.h" +#include "gfx_utils/geometry2d.h" #include "lite_wm_type.h" #include "liteipc_adapter.h" #include "serializer.h" diff --git a/services/wms/samgr_wms.cpp b/services/wms/samgr_wms.cpp index bcc54c8629271b29aa568c021dfaf374e484c5c8..cdbf7f01e7b29aaa5ea75d71d3445495f36b49a3 100755 --- a/services/wms/samgr_wms.cpp +++ b/services/wms/samgr_wms.cpp @@ -17,7 +17,7 @@ #include #include "feature.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "iproxy_client.h" #include "iproxy_server.h" #include "iunknown.h" diff --git a/services/wms/wms.cpp b/services/wms/wms.cpp index acb885ae4e92f6069beca5602068a9b21c3acdc1..7309cbfe090da0b518915d65ed33a75a9f74b61f 100644 --- a/services/wms/wms.cpp +++ b/services/wms/wms.cpp @@ -14,7 +14,7 @@ */ #include "hals/gfx_engines.h" -#include "graphic_log.h" +#include "gfx_utils/graphic_log.h" #include "graphic_performance.h" #include "hals/hi_fbdev.h" #include "input_manager_service.h" diff --git a/test/sample_ui.cpp b/test/sample_ui.cpp index facc4c48ddf838bec8e02494f7cab23c9976f165..8e722b55efc4d0127b895970e691fa9e63ba6698 100755 --- a/test/sample_ui.cpp +++ b/test/sample_ui.cpp @@ -15,13 +15,13 @@ #include -#include "font/ui_font_vector.h" #include "common/graphic_startup.h" #include "common/screen.h" #include "common/task_manager.h" #include "dock/screen_device_proxy.h" +#include "font/ui_font_vector.h" +#include "gfx_utils/graphic_log.h" #include "graphic_config.h" -#include "graphic_log.h" #include "window/window.h" extern void RunApp(); diff --git a/test/sample_window.cpp b/test/sample_window.cpp index e1a9ae6f99c7df5c890214069d1f55e16f925385..54bdfef0d05d283410fbb24e646fc7f38dd590c3 100755 --- a/test/sample_window.cpp +++ b/test/sample_window.cpp @@ -23,8 +23,8 @@ #include "dock/screen_device_proxy.h" #include "font/ui_font.h" #include "font/ui_font_vector.h" +#include "gfx_utils/graphic_log.h" #include "graphic_config.h" -#include "graphic_log.h" #include "window/window.h" #include