From 1374a886f76b03bcfeab13dd1bbca8bcd96f3436 Mon Sep 17 00:00:00 2001 From: kangchongtao Date: Tue, 27 Aug 2024 08:44:44 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangchongtao --- component_ext/ext_common/ext_napi_utils.cpp | 4 ---- .../movingphoto_layout_algorithm.cpp | 3 --- .../movingphoto/movingphoto_model_ng.cpp | 3 --- .../movingphoto/movingphoto_napi.cpp | 5 ----- .../movingphoto/movingphoto_pattern.cpp | 7 ------- .../bridge/card_frontend/card_frontend.cpp | 8 -------- .../card_frontend_declarative.cpp | 8 -------- .../card_frontend/card_frontend_delegate.cpp | 6 ------ .../card_frontend_delegate_declarative.cpp | 7 ------- .../form_frontend_declarative.cpp | 6 ------ .../form_frontend_delegate_declarative.cpp | 5 ----- .../bridge/card_frontend/js_card_parser.cpp | 6 ------ .../cj_frontend/cppview/canvas_gradient.cpp | 2 -- .../cj_frontend/cppview/canvas_path.cpp | 4 ---- .../cj_frontend/cppview/canvas_renderer.cpp | 6 ------ .../cppview/data_change_listener.cpp | 2 -- .../bridge/cj_frontend/cppview/gesture.cpp | 5 ----- .../cj_frontend/cppview/interactable_view.cpp | 1 - .../cj_frontend/cppview/lazy_foreach.cpp | 8 -------- .../cj_frontend/cppview/native_view.cpp | 4 ---- .../cj_frontend/cppview/search_controller.cpp | 6 ------ .../cj_frontend/cppview/shape_abstract.cpp | 2 -- .../cj_frontend/cppview/swiper_controller.cpp | 2 -- .../cj_frontend/cppview/view_abstract.cpp | 20 ------------------- .../cppview/view_stack_processor.cpp | 3 --- .../cj_frontend/frontend/cj_frontend.cpp | 4 ---- .../frontend/cj_frontend_abstract.cpp | 6 ------ .../frontend/cj_frontend_loader.cpp | 5 ----- .../cj_frontend/frontend/cj_frontend_ng.cpp | 3 --- .../frontend/cj_page_router_ng.cpp | 5 ----- .../runtime/cj_runtime_delegate.cpp | 5 ----- .../plugin_frontend/plugin_frontend.cpp | 5 ----- .../plugin_frontend_delegate.cpp | 16 --------------- .../syntax/for_each_model_ng.cpp | 2 -- .../components_ng/syntax/for_each_node.cpp | 3 --- .../components_ng/syntax/if_else_model_ng.cpp | 3 --- .../components_ng/syntax/if_else_node.cpp | 7 ------- .../syntax/lazy_for_each_node.cpp | 10 ---------- .../syntax/lazy_layout_wrapper_builder.cpp | 16 --------------- .../components_ng/syntax/repeat_model_ng.cpp | 2 -- .../core/components_ng/syntax/repeat_node.cpp | 4 ---- .../syntax/repeat_virtual_scroll_caches.cpp | 9 --------- .../syntax/repeat_virtual_scroll_model_ng.cpp | 3 --- .../syntax/repeat_virtual_scroll_node.cpp | 8 -------- .../foreach/foreach_element.cpp | 4 ---- frameworks/core/focus/focus_node.cpp | 9 --------- 46 files changed, 262 deletions(-) diff --git a/component_ext/ext_common/ext_napi_utils.cpp b/component_ext/ext_common/ext_napi_utils.cpp index 151b8e3c2d0..617b820e884 100644 --- a/component_ext/ext_common/ext_napi_utils.cpp +++ b/component_ext/ext_common/ext_napi_utils.cpp @@ -15,10 +15,6 @@ #include "ext_napi_utils.h" -#include - -#include "napi/native_api.h" -#include "napi/native_node_api.h" #include "securec.h" namespace OHOS::Ace { diff --git a/component_ext/movingphoto/movingphoto_layout_algorithm.cpp b/component_ext/movingphoto/movingphoto_layout_algorithm.cpp index 570b75c3000..c159f0cedca 100644 --- a/component_ext/movingphoto/movingphoto_layout_algorithm.cpp +++ b/component_ext/movingphoto/movingphoto_layout_algorithm.cpp @@ -14,11 +14,8 @@ */ #include "movingphoto_layout_algorithm.h" -#include "movingphoto_layout_property.h" #include "movingphoto_pattern.h" -#include "base/geometry/ng/size_t.h" - namespace OHOS::Ace::NG { void MovingPhotoLayoutAlgorithm::Layout(LayoutWrapper* layoutWrapper) diff --git a/component_ext/movingphoto/movingphoto_model_ng.cpp b/component_ext/movingphoto/movingphoto_model_ng.cpp index f2fc15a4da0..f838a7f454b 100644 --- a/component_ext/movingphoto/movingphoto_model_ng.cpp +++ b/component_ext/movingphoto/movingphoto_model_ng.cpp @@ -15,10 +15,7 @@ #include "movingphoto_model_ng.h" #include "movingphoto_node.h" -#include "movingphoto_layout_property.h" -#include "movingphoto_pattern.h" -#include "core/components_ng/base/view_stack_processor.h" #include "core/components_ng/pattern/image/image_pattern.h" #include "core/components_ng/pattern/linear_layout/linear_layout_pattern.h" diff --git a/component_ext/movingphoto/movingphoto_napi.cpp b/component_ext/movingphoto/movingphoto_napi.cpp index 4542ba2dca7..1e149c94261 100644 --- a/component_ext/movingphoto/movingphoto_napi.cpp +++ b/component_ext/movingphoto/movingphoto_napi.cpp @@ -16,13 +16,8 @@ #include "movingphoto_napi.h" #include "ext_napi_utils.h" -#include "movingphoto_controller.h" #include "movingphoto_model_ng.h" -#include "base/utils/utils.h" -#include "core/pipeline/pipeline_base.h" -#include "base/resource/data_provider_manager.h" - extern const char _binary_multimedia_movingphotoview_js_start[]; extern const char _binary_multimedia_movingphotoview_abc_start[]; #if !defined(IOS_PLATFORM) diff --git a/component_ext/movingphoto/movingphoto_pattern.cpp b/component_ext/movingphoto/movingphoto_pattern.cpp index 5fd50c57de2..af70ab0f323 100644 --- a/component_ext/movingphoto/movingphoto_pattern.cpp +++ b/component_ext/movingphoto/movingphoto_pattern.cpp @@ -16,17 +16,10 @@ #include #include "movingphoto_pattern.h" -#include "movingphoto_layout_property.h" #include "movingphoto_node.h" #include "movingphoto_utils.h" -#include "base/geometry/ng/size_t.h" -#include "base/log/ace_trace.h" -#include "base/utils/system_properties.h" -#include "core/components_ng/pattern/image/image_layout_property.h" #include "core/components_ng/pattern/image/image_pattern.h" -#include "core/components_ng/property/property.h" -#include "core/pipeline_ng/pipeline_context.h" namespace OHOS::Ace::NG { namespace { diff --git a/frameworks/bridge/card_frontend/card_frontend.cpp b/frameworks/bridge/card_frontend/card_frontend.cpp index f3dc1e01f81..f613b01add3 100644 --- a/frameworks/bridge/card_frontend/card_frontend.cpp +++ b/frameworks/bridge/card_frontend/card_frontend.cpp @@ -15,14 +15,6 @@ #include "frameworks/bridge/card_frontend/card_frontend.h" -#include -#include - -#include "base/log/event_report.h" -#include "base/utils/utils.h" -#include "core/common/thread_checker.h" -#include "frameworks/bridge/common/utils/utils.h" - namespace OHOS::Ace { namespace { diff --git a/frameworks/bridge/card_frontend/card_frontend_declarative.cpp b/frameworks/bridge/card_frontend/card_frontend_declarative.cpp index 767e1105295..e0ca7b1f5d8 100644 --- a/frameworks/bridge/card_frontend/card_frontend_declarative.cpp +++ b/frameworks/bridge/card_frontend/card_frontend_declarative.cpp @@ -15,14 +15,6 @@ #include "frameworks/bridge/card_frontend/card_frontend_declarative.h" -#include -#include - -#include "base/log/event_report.h" -#include "base/log/log_wrapper.h" -#include "base/utils/utils.h" -#include "core/common/thread_checker.h" -#include "frameworks/bridge/common/utils/utils.h" #include "frameworks/bridge/declarative_frontend/ng/page_router_manager_factory.h" #include "frameworks/core/pipeline_ng/pipeline_context.h" diff --git a/frameworks/bridge/card_frontend/card_frontend_delegate.cpp b/frameworks/bridge/card_frontend/card_frontend_delegate.cpp index 11fe7351a67..426c3f3a1d1 100644 --- a/frameworks/bridge/card_frontend/card_frontend_delegate.cpp +++ b/frameworks/bridge/card_frontend/card_frontend_delegate.cpp @@ -15,12 +15,6 @@ #include "frameworks/bridge/card_frontend/card_frontend_delegate.h" -#include - -#include "base/log/event_report.h" -#include "base/utils/utils.h" -#include "core/common/thread_checker.h" - namespace OHOS::Ace::Framework { CardFrontendDelegate::CardFrontendDelegate() : jsAccessibilityManager_(AccessibilityNodeManager::Create()) {} diff --git a/frameworks/bridge/card_frontend/card_frontend_delegate_declarative.cpp b/frameworks/bridge/card_frontend/card_frontend_delegate_declarative.cpp index 53455df66e4..5ba6a4ab8fa 100644 --- a/frameworks/bridge/card_frontend/card_frontend_delegate_declarative.cpp +++ b/frameworks/bridge/card_frontend/card_frontend_delegate_declarative.cpp @@ -15,13 +15,6 @@ #include "frameworks/bridge/card_frontend/card_frontend_delegate_declarative.h" -#include - -#include "base/log/event_report.h" -#include "base/utils/utils.h" -#include "base/utils/measure_util.h" -#include "core/common/thread_checker.h" - namespace OHOS::Ace::Framework { CardFrontendDelegateDeclarative::~CardFrontendDelegateDeclarative() diff --git a/frameworks/bridge/card_frontend/form_frontend_declarative.cpp b/frameworks/bridge/card_frontend/form_frontend_declarative.cpp index 44f40ed8f76..7aa76524808 100644 --- a/frameworks/bridge/card_frontend/form_frontend_declarative.cpp +++ b/frameworks/bridge/card_frontend/form_frontend_declarative.cpp @@ -15,12 +15,6 @@ #include "frameworks/bridge/card_frontend/form_frontend_declarative.h" -#include "base/log/event_report.h" -#include "base/utils/utils.h" -#include "core/common/thread_checker.h" -#include "frameworks/bridge/common/utils/utils.h" -#include "frameworks/core/pipeline_ng/pipeline_context.h" - namespace OHOS::Ace { namespace { const char FILE_TYPE_BIN[] = ".abc"; diff --git a/frameworks/bridge/card_frontend/form_frontend_delegate_declarative.cpp b/frameworks/bridge/card_frontend/form_frontend_delegate_declarative.cpp index ea8a359ef6c..9df67f9bfe1 100644 --- a/frameworks/bridge/card_frontend/form_frontend_delegate_declarative.cpp +++ b/frameworks/bridge/card_frontend/form_frontend_delegate_declarative.cpp @@ -15,11 +15,6 @@ #include "frameworks/bridge/card_frontend/form_frontend_delegate_declarative.h" -#include "base/log/event_report.h" -#include "base/utils/utils.h" -#include "base/utils/measure_util.h" -#include "core/common/thread_checker.h" - #ifndef PREVIEW #include "form_mgr.h" #endif diff --git a/frameworks/bridge/card_frontend/js_card_parser.cpp b/frameworks/bridge/card_frontend/js_card_parser.cpp index 23924767f1e..fabed938b4c 100644 --- a/frameworks/bridge/card_frontend/js_card_parser.cpp +++ b/frameworks/bridge/card_frontend/js_card_parser.cpp @@ -15,14 +15,8 @@ #include "frameworks/bridge/card_frontend/js_card_parser.h" -#include - #include "base/i18n/localization.h" #include "base/resource/ace_res_config.h" -#include "base/utils/utils.h" -#include "core/common/ace_application_info.h" -#include "frameworks/base/log/event_report.h" -#include "frameworks/bridge/common/utils/utils.h" namespace OHOS::Ace::Framework { namespace { diff --git a/frameworks/bridge/cj_frontend/cppview/canvas_gradient.cpp b/frameworks/bridge/cj_frontend/cppview/canvas_gradient.cpp index 593e7294161..4e71c7b62e6 100644 --- a/frameworks/bridge/cj_frontend/cppview/canvas_gradient.cpp +++ b/frameworks/bridge/cj_frontend/cppview/canvas_gradient.cpp @@ -15,8 +15,6 @@ #include "bridge/cj_frontend/cppview/canvas_gradient.h" -#include - namespace OHOS::Ace::Framework { NativeCanvasGradient::NativeCanvasGradient(const Gradient& gradient) : FFIData() { diff --git a/frameworks/bridge/cj_frontend/cppview/canvas_path.cpp b/frameworks/bridge/cj_frontend/cppview/canvas_path.cpp index bd4f6718b6e..bcd4e7a0498 100644 --- a/frameworks/bridge/cj_frontend/cppview/canvas_path.cpp +++ b/frameworks/bridge/cj_frontend/cppview/canvas_path.cpp @@ -15,10 +15,6 @@ #include "bridge/cj_frontend/cppview/canvas_path.h" -#include - -#include "base/log/log_wrapper.h" - namespace OHOS::Ace::Framework { NativeCanvasPath::NativeCanvasPath() : FFIData() diff --git a/frameworks/bridge/cj_frontend/cppview/canvas_renderer.cpp b/frameworks/bridge/cj_frontend/cppview/canvas_renderer.cpp index 139fbb9c1a1..f4ec684d4ba 100644 --- a/frameworks/bridge/cj_frontend/cppview/canvas_renderer.cpp +++ b/frameworks/bridge/cj_frontend/cppview/canvas_renderer.cpp @@ -15,12 +15,6 @@ #include "bridge/cj_frontend/cppview/canvas_renderer.h" -#include -#include - -#include "base/log/log_wrapper.h" -#include "core/common/container.h" - using namespace OHOS; namespace OHOS::Ace::Framework { diff --git a/frameworks/bridge/cj_frontend/cppview/data_change_listener.cpp b/frameworks/bridge/cj_frontend/cppview/data_change_listener.cpp index 472bcb2e772..42f5a9c86c9 100644 --- a/frameworks/bridge/cj_frontend/cppview/data_change_listener.cpp +++ b/frameworks/bridge/cj_frontend/cppview/data_change_listener.cpp @@ -15,8 +15,6 @@ #include "bridge/cj_frontend/cppview/data_change_listener.h" -#include "core/common/container_scope.h" - using namespace OHOS::Ace; using namespace OHOS::Ace::Framework; diff --git a/frameworks/bridge/cj_frontend/cppview/gesture.cpp b/frameworks/bridge/cj_frontend/cppview/gesture.cpp index 9e4c97ac952..2d5ac13c721 100644 --- a/frameworks/bridge/cj_frontend/cppview/gesture.cpp +++ b/frameworks/bridge/cj_frontend/cppview/gesture.cpp @@ -15,17 +15,12 @@ #include "bridge/cj_frontend/cppview/gesture.h" -#include - #include "bridge/declarative_frontend/view_stack_processor.h" -#include "core/gestures/gesture_group.h" #include "core/gestures/long_press_gesture.h" #include "core/gestures/pan_gesture.h" -#include "core/gestures/parallel_recognizer.h" #include "core/gestures/pinch_gesture.h" #include "core/gestures/rotation_gesture.h" #include "core/gestures/slide_gesture.h" -#include "core/gestures/tap_gesture.h" namespace OHOS::Ace::Framework { diff --git a/frameworks/bridge/cj_frontend/cppview/interactable_view.cpp b/frameworks/bridge/cj_frontend/cppview/interactable_view.cpp index 71f0d1d363a..6c66363ca41 100644 --- a/frameworks/bridge/cj_frontend/cppview/interactable_view.cpp +++ b/frameworks/bridge/cj_frontend/cppview/interactable_view.cpp @@ -16,7 +16,6 @@ #include "bridge/cj_frontend/cppview/interactable_view.h" #include "core/components_ng/base/view_abstract_model.h" -#include "core/event/ace_event_handler.h" namespace OHOS::Ace::Framework { diff --git a/frameworks/bridge/cj_frontend/cppview/lazy_foreach.cpp b/frameworks/bridge/cj_frontend/cppview/lazy_foreach.cpp index edd37a001a4..b563b5869eb 100644 --- a/frameworks/bridge/cj_frontend/cppview/lazy_foreach.cpp +++ b/frameworks/bridge/cj_frontend/cppview/lazy_foreach.cpp @@ -15,15 +15,7 @@ #include "bridge/cj_frontend/cppview/lazy_foreach.h" -#include -#include -#include - -#include "base/utils/utils.h" #include "bridge/cj_frontend/cppview/data_change_listener.h" -#include "bridge/cj_frontend/cppview/native_view.h" -#include "core/common/container_scope.h" -#include "core/components_v2/foreach/lazy_foreach_component.h" #include "core/components_ng/base/view_stack_model.h" using namespace OHOS::Ace; diff --git a/frameworks/bridge/cj_frontend/cppview/native_view.cpp b/frameworks/bridge/cj_frontend/cppview/native_view.cpp index 2706d7cdc43..7c82be5cb0b 100644 --- a/frameworks/bridge/cj_frontend/cppview/native_view.cpp +++ b/frameworks/bridge/cj_frontend/cppview/native_view.cpp @@ -15,10 +15,6 @@ #include "bridge/cj_frontend/cppview/native_view.h" -#include -#include - -#include "base/log/ace_trace.h" #include "bridge/cj_frontend/runtime/cj_runtime_delegate.h" #include "core/components_ng/base/view_partial_update_model.h" #include "core/components_ng/base/view_stack_model.h" diff --git a/frameworks/bridge/cj_frontend/cppview/search_controller.cpp b/frameworks/bridge/cj_frontend/cppview/search_controller.cpp index 05b5662aa26..3dd9725add7 100644 --- a/frameworks/bridge/cj_frontend/cppview/search_controller.cpp +++ b/frameworks/bridge/cj_frontend/cppview/search_controller.cpp @@ -14,12 +14,6 @@ */ #include "bridge/cj_frontend/cppview/search_controller.h" -#include "bridge/common/utils/utils.h" -#include "core/components/search/search_component.h" -#include "core/components/search/search_theme.h" -#include "core/components/text_field/text_field_component.h" -#include "frameworks/bridge/declarative_frontend/view_stack_processor.h" - namespace OHOS::Ace::Framework { void SearchController::CaretPosition(int32_t caretPosition) diff --git a/frameworks/bridge/cj_frontend/cppview/shape_abstract.cpp b/frameworks/bridge/cj_frontend/cppview/shape_abstract.cpp index c18ea5788ed..a69586b8063 100644 --- a/frameworks/bridge/cj_frontend/cppview/shape_abstract.cpp +++ b/frameworks/bridge/cj_frontend/cppview/shape_abstract.cpp @@ -15,8 +15,6 @@ #include "bridge/cj_frontend/cppview/shape_abstract.h" -#include - namespace OHOS::Ace::Framework { NativeShapeAbstract::NativeShapeAbstract() : FFIData() diff --git a/frameworks/bridge/cj_frontend/cppview/swiper_controller.cpp b/frameworks/bridge/cj_frontend/cppview/swiper_controller.cpp index da8c92e370d..b5030ea09df 100644 --- a/frameworks/bridge/cj_frontend/cppview/swiper_controller.cpp +++ b/frameworks/bridge/cj_frontend/cppview/swiper_controller.cpp @@ -15,8 +15,6 @@ #include "bridge/cj_frontend/cppview/swiper_controller.h" -#include - namespace OHOS::Ace::Framework { NativeSwiperController::NativeSwiperController() : FFIData() diff --git a/frameworks/bridge/cj_frontend/cppview/view_abstract.cpp b/frameworks/bridge/cj_frontend/cppview/view_abstract.cpp index 48768d9c2b6..83290fa2eb2 100644 --- a/frameworks/bridge/cj_frontend/cppview/view_abstract.cpp +++ b/frameworks/bridge/cj_frontend/cppview/view_abstract.cpp @@ -14,26 +14,6 @@ */ #include "view_abstract.h" -#include - -#include "base/geometry/animatable_dimension.h" -#include "base/json/json_util.h" -#include "base/memory/referenced.h" -#include "bridge/common/utils/utils.h" -#include "bridge/declarative_frontend/view_stack_processor.h" -#include "core/common/ace_application_info.h" -#include "core/common/container.h" -#include "core/components/box/box_component_helper.h" -#include "core/components/common/layout/align_declaration.h" -#include "core/components/common/layout/position_param.h" -#include "core/components/common/properties/motion_path_option.h" -#include "core/components/display/display_component.h" -#include "core/components/option/option_component.h" -#include "core/components/split_container/column_split_component.h" -#include "core/components/split_container/row_split_component.h" -#include "core/components/split_container/split_container_component.h" -#include "core/components/text/text_component.h" -#include "core/components/theme/theme_manager.h" #include "core/components_ng/base/view_abstract.h" #include "core/components_ng/base/view_abstract_model.h" #include "core/components_ng/base/view_stack_processor.h" diff --git a/frameworks/bridge/cj_frontend/cppview/view_stack_processor.cpp b/frameworks/bridge/cj_frontend/cppview/view_stack_processor.cpp index 31a4e51700b..9957c89c0b5 100644 --- a/frameworks/bridge/cj_frontend/cppview/view_stack_processor.cpp +++ b/frameworks/bridge/cj_frontend/cppview/view_stack_processor.cpp @@ -14,9 +14,6 @@ */ #include "bridge/cj_frontend/cppview/view_stack_processor.h" - -#include "base/geometry/dimension.h" -#include "bridge/common/utils/utils.h" #include "core/components_ng/base/view_stack_model.h" namespace OHOS::Ace::Framework { diff --git a/frameworks/bridge/cj_frontend/frontend/cj_frontend.cpp b/frameworks/bridge/cj_frontend/frontend/cj_frontend.cpp index e737214e1e0..a4037355f27 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_frontend.cpp +++ b/frameworks/bridge/cj_frontend/frontend/cj_frontend.cpp @@ -16,10 +16,6 @@ #include "bridge/cj_frontend/frontend/cj_frontend.h" #include "bridge/cj_frontend/frontend/cj_page_router.h" -#include "bridge/js_frontend/js_ace_page.h" -#include "core/components_ng/pattern/stage/page_pattern.h" -#include "core/gestures/swipe_recognizer.h" -#include "core/components/navigator/navigator_component.h" namespace OHOS::Ace::Framework { void CJFrontend::InternalInitialize() diff --git a/frameworks/bridge/cj_frontend/frontend/cj_frontend_abstract.cpp b/frameworks/bridge/cj_frontend/frontend/cj_frontend_abstract.cpp index 2b07d6a8b28..1a464ba740c 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_frontend_abstract.cpp +++ b/frameworks/bridge/cj_frontend/frontend/cj_frontend_abstract.cpp @@ -17,15 +17,9 @@ #include "base/i18n/localization.h" #include "base/subwindow/subwindow_manager.h" -#include "base/utils/measure_util.h" -#include "core/common/container.h" -#include "core/common/container_scope.h" #include "bridge/cj_frontend/frontend/cj_frontend_loader.h" #include "bridge/cj_frontend/runtime/cj_runtime_delegate.h" #include "bridge/common/accessibility/accessibility_node_manager.h" -#include "core/components/page/page_target.h" -#include "core/components/navigator/navigator_component.h" -#include "core/components_ng/pattern/overlay/overlay_manager.h" #include "core/pipeline_ng/pipeline_context.h" #include "core/common/font_manager.h" diff --git a/frameworks/bridge/cj_frontend/frontend/cj_frontend_loader.cpp b/frameworks/bridge/cj_frontend/frontend/cj_frontend_loader.cpp index 6563837cb61..06ef50d8d6d 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_frontend_loader.cpp +++ b/frameworks/bridge/cj_frontend/frontend/cj_frontend_loader.cpp @@ -15,13 +15,8 @@ #include "bridge/cj_frontend/frontend/cj_frontend_loader.h" -#include "bridge/cj_frontend/cppview/native_view.h" -#include "bridge/cj_frontend/frontend/cj_frontend_abstract.h" #include "bridge/cj_frontend/frontend/cj_frontend_ng.h" -#include "bridge/cj_frontend/frontend/cj_frontend.h" #include "bridge/cj_frontend/frontend/cj_page_loader.h" -#include "bridge/cj_frontend/frontend/cj_page_router.h" -#include "core/components_ng/pattern/stage/page_pattern.h" namespace OHOS::Ace { namespace Framework { diff --git a/frameworks/bridge/cj_frontend/frontend/cj_frontend_ng.cpp b/frameworks/bridge/cj_frontend/frontend/cj_frontend_ng.cpp index 72d4f92d041..7126f21ef2a 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_frontend_ng.cpp +++ b/frameworks/bridge/cj_frontend/frontend/cj_frontend_ng.cpp @@ -15,9 +15,6 @@ #include "bridge/cj_frontend/frontend/cj_frontend_ng.h" -#include "core/components/page/page_target.h" -#include "core/components_ng/pattern/stage/page_pattern.h" - namespace OHOS::Ace::Framework { void CJFrontendNG::InternalInitialize() { diff --git a/frameworks/bridge/cj_frontend/frontend/cj_page_router_ng.cpp b/frameworks/bridge/cj_frontend/frontend/cj_page_router_ng.cpp index 17e699c81e8..bb49eae7087 100644 --- a/frameworks/bridge/cj_frontend/frontend/cj_page_router_ng.cpp +++ b/frameworks/bridge/cj_frontend/frontend/cj_page_router_ng.cpp @@ -19,12 +19,7 @@ #include "bridge/cj_frontend/runtime/cj_runtime_delegate.h" #include "bridge/cj_frontend/frontend/cj_frontend_abstract.h" #include "bridge/cj_frontend/frontend/cj_page_loader.h" -#include "bridge/declarative_frontend/ng/entry_page_info.h" -#include "bridge/js_frontend/frontend_delegate.h" -#include "core/common/container.h" #include "core/components_ng/pattern/stage/page_pattern.h" -#include "core/components_v2/inspector/inspector_constants.h" -#include "core/pipeline_ng/pipeline_context.h" using namespace OHOS::Ace::NG; diff --git a/frameworks/bridge/cj_frontend/runtime/cj_runtime_delegate.cpp b/frameworks/bridge/cj_frontend/runtime/cj_runtime_delegate.cpp index 298dfbe8068..a073820726c 100644 --- a/frameworks/bridge/cj_frontend/runtime/cj_runtime_delegate.cpp +++ b/frameworks/bridge/cj_frontend/runtime/cj_runtime_delegate.cpp @@ -15,11 +15,6 @@ #include "bridge/cj_frontend/runtime/cj_runtime_delegate.h" -#include -#include - -#include "base/log/log.h" -#include "ffi_remote_data.h" #include "cj_environment.h" using namespace OHOS::Ace::Framework; diff --git a/frameworks/bridge/plugin_frontend/plugin_frontend.cpp b/frameworks/bridge/plugin_frontend/plugin_frontend.cpp index 375cde45ef6..b3b4813e815 100644 --- a/frameworks/bridge/plugin_frontend/plugin_frontend.cpp +++ b/frameworks/bridge/plugin_frontend/plugin_frontend.cpp @@ -15,13 +15,8 @@ #include "frameworks/bridge/plugin_frontend/plugin_frontend.h" -#include - #include "base/log/dump_log.h" #include "base/log/event_report.h" -#include "base/utils/utils.h" -#include "core/common/thread_checker.h" -#include "core/components/navigator/navigator_component.h" namespace OHOS::Ace { namespace { diff --git a/frameworks/bridge/plugin_frontend/plugin_frontend_delegate.cpp b/frameworks/bridge/plugin_frontend/plugin_frontend_delegate.cpp index 093b32e1de9..caaae0ef862 100644 --- a/frameworks/bridge/plugin_frontend/plugin_frontend_delegate.cpp +++ b/frameworks/bridge/plugin_frontend/plugin_frontend_delegate.cpp @@ -15,25 +15,9 @@ #include "frameworks/bridge/plugin_frontend/plugin_frontend_delegate.h" -#include -#include -#include - -#include "base/log/ace_trace.h" #include "base/log/event_report.h" #include "base/resource/ace_res_config.h" -#include "base/thread/background_task_executor.h" -#include "base/utils/measure_util.h" -#include "base/utils/utils.h" -#include "core/common/ace_application_info.h" -#include "core/common/container.h" -#include "core/common/platform_bridge.h" -#include "core/common/thread_checker.h" -#include "core/components/dialog/dialog_component.h" #include "core/components/toast/toast_component.h" -#include "frameworks/bridge/common/manifest/manifest_parser.h" -#include "frameworks/bridge/common/utils/utils.h" -#include "frameworks/bridge/js_frontend/js_ace_page.h" namespace OHOS::Ace::Framework { namespace { diff --git a/frameworks/core/components_ng/syntax/for_each_model_ng.cpp b/frameworks/core/components_ng/syntax/for_each_model_ng.cpp index cb7aa80746d..19a5963fe95 100644 --- a/frameworks/core/components_ng/syntax/for_each_model_ng.cpp +++ b/frameworks/core/components_ng/syntax/for_each_model_ng.cpp @@ -15,8 +15,6 @@ #include "core/components_ng/syntax/for_each_model_ng.h" -#include "base/utils/utils.h" -#include "core/common/container.h" #include "core/components_ng/base/view_stack_processor.h" #include "core/components_ng/syntax/for_each_node.h" #include "core/components_ng/syntax/syntax_item.h" diff --git a/frameworks/core/components_ng/syntax/for_each_node.cpp b/frameworks/core/components_ng/syntax/for_each_node.cpp index 428ec680c05..422c725fe18 100644 --- a/frameworks/core/components_ng/syntax/for_each_node.cpp +++ b/frameworks/core/components_ng/syntax/for_each_node.cpp @@ -15,10 +15,7 @@ #include "core/components_ng/syntax/for_each_node.h" -#include "base/log/ace_trace.h" -#include "core/components_ng/base/frame_node.h" #include "core/components_ng/pattern/list/list_item_pattern.h" -#include "core/pipeline/base/element_register.h" #include "core/pipeline_ng/pipeline_context.h" namespace OHOS::Ace::NG { diff --git a/frameworks/core/components_ng/syntax/if_else_model_ng.cpp b/frameworks/core/components_ng/syntax/if_else_model_ng.cpp index 0c53a60689f..750534fac21 100644 --- a/frameworks/core/components_ng/syntax/if_else_model_ng.cpp +++ b/frameworks/core/components_ng/syntax/if_else_model_ng.cpp @@ -15,11 +15,8 @@ #include "core/components_ng/syntax/if_else_model_ng.h" -#include "base/utils/utils.h" -#include "core/common/container.h" #include "core/components_ng/base/view_stack_processor.h" #include "core/components_ng/syntax/if_else_node.h" -#include "core/components_ng/syntax/syntax_item.h" namespace OHOS::Ace::NG { diff --git a/frameworks/core/components_ng/syntax/if_else_node.cpp b/frameworks/core/components_ng/syntax/if_else_node.cpp index 11df6db3244..ed189cc367f 100644 --- a/frameworks/core/components_ng/syntax/if_else_node.cpp +++ b/frameworks/core/components_ng/syntax/if_else_node.cpp @@ -15,14 +15,7 @@ #include "core/components_ng/syntax/if_else_node.h" -#include -#include - -#include "base/log/ace_trace.h" #include "core/components_ng/base/frame_node.h" -#include "core/components_ng/layout/layout_property.h" -#include "core/components_ng/property/property.h" -#include "core/pipeline/base/element_register.h" namespace OHOS::Ace::NG { diff --git a/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp b/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp index d8ebef65905..5f5294de6e9 100644 --- a/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp +++ b/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp @@ -15,16 +15,6 @@ #include "core/components_ng/syntax/lazy_for_each_node.h" -#include - -#include "base/log/ace_trace.h" -#include "base/log/dump_log.h" -#include "base/memory/referenced.h" -#include "base/utils/time_util.h" -#include "base/utils/utils.h" -#include "core/components_ng/base/view_stack_processor.h" -#include "core/components_ng/pattern/list/list_item_pattern.h" -#include "core/components_ng/property/property.h" #include "core/components_ng/syntax/lazy_layout_wrapper_builder.h" #include "core/components_v2/inspector/inspector_constants.h" #include "core/pipeline/base/element_register.h" diff --git a/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.cpp b/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.cpp index e5e1a1ee692..87100850b66 100644 --- a/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.cpp +++ b/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.cpp @@ -15,22 +15,6 @@ #include "core/components_ng/syntax/lazy_layout_wrapper_builder.h" -#include -#include -#include -#include -#include -#include -#include - -#include "base/log/ace_trace.h" -#include "base/memory/referenced.h" -#include "base/utils/utils.h" -#include "core/components_ng/base/frame_node.h" -#include "core/components_ng/base/ui_node.h" -#include "core/components_ng/layout/layout_wrapper.h" -#include "core/components_ng/syntax/lazy_for_each_node.h" - namespace OHOS::Ace::NG { LazyLayoutWrapperBuilder::LazyLayoutWrapperBuilder( diff --git a/frameworks/core/components_ng/syntax/repeat_model_ng.cpp b/frameworks/core/components_ng/syntax/repeat_model_ng.cpp index 371045575e8..57cc8acd634 100644 --- a/frameworks/core/components_ng/syntax/repeat_model_ng.cpp +++ b/frameworks/core/components_ng/syntax/repeat_model_ng.cpp @@ -15,8 +15,6 @@ #include "core/components_ng/syntax/repeat_model_ng.h" -#include "base/utils/utils.h" -#include "core/common/container.h" #include "core/components_ng/base/view_stack_processor.h" #include "core/components_ng/syntax/repeat_node.h" #include "core/components_ng/syntax/syntax_item.h" diff --git a/frameworks/core/components_ng/syntax/repeat_node.cpp b/frameworks/core/components_ng/syntax/repeat_node.cpp index f5b44cabbc1..f7b0d4c9a68 100644 --- a/frameworks/core/components_ng/syntax/repeat_node.cpp +++ b/frameworks/core/components_ng/syntax/repeat_node.cpp @@ -15,10 +15,6 @@ #include "core/components_ng/syntax/repeat_node.h" -#include "base/log/ace_trace.h" -#include "core/components_ng/base/frame_node.h" -#include "core/components_ng/pattern/list/list_item_pattern.h" -#include "core/pipeline/base/element_register.h" #include "core/pipeline_ng/pipeline_context.h" namespace OHOS::Ace::NG { diff --git a/frameworks/core/components_ng/syntax/repeat_virtual_scroll_caches.cpp b/frameworks/core/components_ng/syntax/repeat_virtual_scroll_caches.cpp index 51aaffa012e..355bf1d00a9 100644 --- a/frameworks/core/components_ng/syntax/repeat_virtual_scroll_caches.cpp +++ b/frameworks/core/components_ng/syntax/repeat_virtual_scroll_caches.cpp @@ -15,16 +15,7 @@ #include "core/components_ng/syntax/repeat_virtual_scroll_caches.h" -#include -#include -#include -#include - -#include "base/log/log_wrapper.h" -#include "base/memory/referenced.h" -#include "core/components_ng/base/frame_node.h" #include "core/components_ng/base/view_stack_processor.h" -#include "core/pipeline/base/element_register.h" namespace OHOS::Ace::NG { diff --git a/frameworks/core/components_ng/syntax/repeat_virtual_scroll_model_ng.cpp b/frameworks/core/components_ng/syntax/repeat_virtual_scroll_model_ng.cpp index 51467b6bdbd..c88a51479d7 100644 --- a/frameworks/core/components_ng/syntax/repeat_virtual_scroll_model_ng.cpp +++ b/frameworks/core/components_ng/syntax/repeat_virtual_scroll_model_ng.cpp @@ -15,11 +15,8 @@ #include "core/components_ng/syntax/repeat_virtual_scroll_model_ng.h" -#include "base/utils/utils.h" -#include "core/common/container.h" #include "core/components_ng/base/view_stack_processor.h" #include "core/components_ng/syntax/repeat_virtual_scroll_node.h" -#include "core/components_ng/syntax/syntax_item.h" namespace OHOS::Ace::NG { diff --git a/frameworks/core/components_ng/syntax/repeat_virtual_scroll_node.cpp b/frameworks/core/components_ng/syntax/repeat_virtual_scroll_node.cpp index f39c44476e5..ed9bbeeddf5 100644 --- a/frameworks/core/components_ng/syntax/repeat_virtual_scroll_node.cpp +++ b/frameworks/core/components_ng/syntax/repeat_virtual_scroll_node.cpp @@ -15,14 +15,6 @@ #include "core/components_ng/syntax/repeat_virtual_scroll_node.h" -#include -#include -#include - -#include "base/log/ace_trace.h" -#include "base/log/log_wrapper.h" -#include "core/components_ng/base/frame_node.h" -#include "core/pipeline/base/element_register.h" #include "core/pipeline_ng/pipeline_context.h" namespace OHOS::Ace::NG { diff --git a/frameworks/core/components_part_upd/foreach/foreach_element.cpp b/frameworks/core/components_part_upd/foreach/foreach_element.cpp index 7c591a9e29e..8f17c640635 100644 --- a/frameworks/core/components_part_upd/foreach/foreach_element.cpp +++ b/frameworks/core/components_part_upd/foreach/foreach_element.cpp @@ -15,10 +15,6 @@ #include "frameworks/core/components_part_upd/foreach/foreach_element.h" -#include -#include -#include - #include "frameworks/core/components_part_upd/foreach/foreach_component.h" namespace OHOS::Ace::PartUpd { diff --git a/frameworks/core/focus/focus_node.cpp b/frameworks/core/focus/focus_node.cpp index 7ed70ff3454..71ba514abc1 100644 --- a/frameworks/core/focus/focus_node.cpp +++ b/frameworks/core/focus/focus_node.cpp @@ -15,18 +15,9 @@ #include "core/focus/focus_node.h" -#include -#include -#include - #include "base/log/dump_log.h" -#include "base/log/log.h" -#include "core/common/ace_application_info.h" #include "core/components/flex/flex_element.h" -#include "core/event/ace_event_handler.h" -#include "core/gestures/click_recognizer.h" #include "core/pipeline/base/composed_element.h" -#include "core/pipeline/base/render_element.h" namespace OHOS::Ace { namespace { From 146fa33494496c3b610a42e0201700ff214edbbe Mon Sep 17 00:00:00 2001 From: kangchongtao Date: Tue, 27 Aug 2024 09:24:24 +0000 Subject: [PATCH 2/2] update frameworks/core/components_ng/syntax/lazy_for_each_node.cpp. Signed-off-by: kangchongtao --- frameworks/core/components_ng/syntax/lazy_for_each_node.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp b/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp index 5f5294de6e9..6774d6825e6 100644 --- a/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp +++ b/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp @@ -15,6 +15,7 @@ #include "core/components_ng/syntax/lazy_for_each_node.h" +#include "core/components_ng/pattern/list/list_item_pattern.h" #include "core/components_ng/syntax/lazy_layout_wrapper_builder.h" #include "core/components_v2/inspector/inspector_constants.h" #include "core/pipeline/base/element_register.h"