蓝黄同步

Signed-off-by: eager1 <chenyige2@huawei.com>
Change-Id: I1ae2303680d1edb82d589ea611a4a4847f5dd953

.clang-format

@@ -45,7 +45,6 @@ BreakAfterJavaFieldAnnotations: true
 ColumnLimit: 120
 CommentPragmas:  '^ IWYU pragma:'
 QualifierAlignment: Leave
-ReflowComments: true
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
@@ -85,6 +84,7 @@ PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 80
 PointerAlignment: Left
+ReflowComments: true
 SortIncludes: true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false

frameworks/base/log/jank_frame_report.cpp

@@ -157,7 +157,7 @@ void JankFrameReport::RecordJankStatus(double jank)
         return;
     }
     // skip first frame
-    if (prevFrameUpdateCount_ == 0 && (currentFrameUpdateCount_ >= 0)) {
+    if (prevFrameUpdateCount_ == 0 && currentFrameUpdateCount_ >= 0) {
         return;
     };
     needReport_ = true;

frameworks/bridge/declarative_frontend/ark_node/src/frame_node.ts

@@ -693,7 +693,7 @@ const __creatorMap__ = new Map<string, (context: UIContext, options?: object) =>
     ['GridRow', (context: UIContext): FrameNode=> {
       let node = new TypedFrameNode(context, 'GridRow', (node: NodePtr, type: ModifierType): ArkGridRowComponent => {
         return new ArkGridRowComponent(node, type);
-      });
+      })
       node.initialize();
       return node;
     }],
@@ -705,7 +705,7 @@ const __creatorMap__ = new Map<string, (context: UIContext, options?: object) =>
     ['GridCol', (context: UIContext): FrameNode=> {
       let node = new TypedFrameNode(context, 'GridCol', (node: NodePtr, type: ModifierType): ArkGridColComponent => {
         return new ArkGridColComponent(node, type);
-      });
+      })
       node.initialize();
       return node;
     }],

frameworks/bridge/declarative_frontend/ark_theme/theme_manager/src/theme/ArkThemeScopeManager.ts

@@ -84,7 +84,7 @@ class ArkThemeScopeManager {
             return;
         }
 
-    
+
         let scope: ArkThemeScope = undefined;
 
         // we need to keep component to the theme scope before first render

frameworks/bridge/declarative_frontend/ark_theme/theme_manager/src/theme/ArkThemeWhiteList.ts

@@ -36,7 +36,7 @@ class ArkThemeWhiteList {
         'Progress',
         'QRCode',
         'Radio',
-        'Scroll',
+        "Scroll",
         'Search',
         'Select',
         'Slider',
@@ -72,4 +72,3 @@ class ArkThemeWhiteList {
         return false;
     }
 }
-

frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_api_bridge.h

@@ -99,8 +99,8 @@ private:
     static void RegisterXComponentAttributes(Local<panda::ObjectRef> object, EcmaVM* vm);
     static void RegisterTabContentAttributes(Local<panda::ObjectRef> object, EcmaVM* vm);
     static void RegisterRefreshAttributes(Local<panda::ObjectRef> object, EcmaVM* vm);
-    static void RegisterResourceAttributes(Local<panda::ObjectRef> object, EcmaVM* vm);
     static void RegisterFlexAttributes(Local<panda::ObjectRef> object, EcmaVM* vm);
+    static void RegisterResourceAttributes(Local<panda::ObjectRef> object, EcmaVM* vm);
 };
 } // namespace OHOS::Ace::NG
 #endif // FRAMEWORKS_BRIDGE_DECLARATIVE_FRONTEND_ENGINE_JSI_NATIVEMODULE_ARKTS_NATIVE_API_BRIDGE_H

frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_common_bridge.h

@@ -341,10 +341,10 @@ public:
     static ArkUINativeModuleValue ResetFocusScopeId(ArkUIRuntimeCallInfo* runtimeCallInfo);
     static ArkUINativeModuleValue SetFocusScopePriority(ArkUIRuntimeCallInfo* runtimeCallInfo);
     static ArkUINativeModuleValue ResetFocusScopePriority(ArkUIRuntimeCallInfo* runtimeCallInfo);
-    static ArkUINativeModuleValue SetChainMode(ArkUIRuntimeCallInfo* runtimeCallInfo);
-    static ArkUINativeModuleValue ResetChainMode(ArkUIRuntimeCallInfo* runtimeCallInfo);
     static ArkUINativeModuleValue SetPixelRound(ArkUIRuntimeCallInfo* runtimeCallInfo);
     static ArkUINativeModuleValue ResetPixelRound(ArkUIRuntimeCallInfo *runtimeCallInfo);
+    static ArkUINativeModuleValue SetChainMode(ArkUIRuntimeCallInfo* runtimeCallInfo);
+    static ArkUINativeModuleValue ResetChainMode(ArkUIRuntimeCallInfo* runtimeCallInfo);
     static ArkUINativeModuleValue GreatOrEqualAPITargetVersion(ArkUIRuntimeCallInfo* runtimeCallInfo);
     static ArkUINativeModuleValue LessThanAPITargetVersion(ArkUIRuntimeCallInfo* runtimeCallInfo);
     static ArkUINativeModuleValue GetApiTargetVersion(ArkUIRuntimeCallInfo* runtimeCallInfo);
@@ -352,5 +352,4 @@ public:
     static ArkUINativeModuleValue ResetFocusBox(ArkUIRuntimeCallInfo* runtimeCallInfo);
 };
 } // namespace OHOS::Ace::NG
-
 #endif // FRAMEWORKS_BRIDGE_DECLARATIVE_FRONTEND_ENGINE_JSI_NATIVEMODULE_ARKTS_NATIVE_COMMON_BRIDGE_H

frameworks/bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_render_node_bridge.cpp

@@ -28,6 +28,8 @@
 #include "bridge/declarative_frontend/engine/jsi/nativeModule/arkts_native_utils_bridge.h"
 #include "bridge/declarative_frontend/jsview/js_utils.h"
 #include "core/components/common/layout/constants.h"
+#include "core/components_ng/pattern/render_node/render_node_properties.h"
+#include "core/pipeline/pipeline_base.h"
 #include "core/components_ng/base/frame_node.h"
 #include "core/components_ng/pattern/render_node/render_node_pattern.h"
 

frameworks/core/components/theme/theme_attributes.h

@@ -83,8 +83,8 @@ extern const char THEME_PATTERN_GAUGE[];
 extern const char THEME_PATTERN_SHEET[];
 extern const char THEME_BLUR_STYLE_COMMON[];
 extern const char THEME_PATTERN_SHADOW[];
-extern const char THEME_PATTERN_CONTAINER_MODAL[];
 extern const char THEME_PATTERN_AGING_ADAPATION_DIALOG[];
+extern const char THEME_PATTERN_CONTAINER_MODAL[];
 
 // pattern general attributes
 extern const char PATTERN_FG_COLOR[];

frameworks/core/components/theme/theme_manager_impl.cpp

@@ -146,9 +146,9 @@ const std::unordered_map<ThemeType, RefPtr<Theme>(*)(const RefPtr<ThemeConstants
     { NG::GaugeTheme::TypeId(), &ThemeBuildFunc<NG::GaugeTheme::Builder> },
     { NG::SheetTheme::TypeId(), &ThemeBuildFunc<NG::SheetTheme::Builder> },
     { BlurStyleTheme::TypeId(), &ThemeBuildFunc<BlurStyleTheme::Builder> },
+    { AgingAdapationDialogTheme::TypeId(), &ThemeBuildFunc<AgingAdapationDialogTheme::Builder> },
     { ShadowTheme::TypeId(), &ThemeBuildFunc<ShadowTheme::Builder> },
     { NG::ContainerModalTheme::TypeId(), &ThemeBuildFunc<NG::ContainerModalTheme::Builder> },
-    { AgingAdapationDialogTheme::TypeId(), &ThemeBuildFunc<AgingAdapationDialogTheme::Builder> },
 };
 } // namespace
 

frameworks/core/components_ng/render/adapter/rosen_window.h

@@ -114,10 +114,9 @@ public:
     {
         return rsUIDirector_->GetAnimateExpectedRate();
     }
+    void SetUiDvsyncSwitch(bool vsyncSwitch) override;
 
     void OnVsync(uint64_t nanoTimestamp, uint32_t frameCount) override;
-    
-    void SetUiDvsyncSwitch(bool vsyncSwitch) override;
 
 private:
     OHOS::sptr<OHOS::Rosen::Window> rsWindow_;

frameworks/core/components_ng/render/render_context.cpp

@@ -154,8 +154,7 @@ void RenderContext::ToJsonValue(std::unique_ptr<JsonValue>& json, const Inspecto
     if (propClickEffectLevel_.has_value()) {
         auto clickEffectJsonValue = JsonUtil::Create(true);
         clickEffectJsonValue->Put("level", std::to_string((int)propClickEffectLevel_.value().level).c_str());
-        clickEffectJsonValue->Put("scale",
+        clickEffectJsonValue->Put("scale", std::to_string((float)propClickEffectLevel_.value().scaleNumber).c_str());
-            std::to_string((float)propClickEffectLevel_.value().scaleNumber).c_str());
         json->PutExtAttr("clickEffect", clickEffectJsonValue, filter);
     }
     ObscuredToJsonValue(json, filter);

frameworks/core/interfaces/native/node/node_modifiers.cpp

@@ -37,6 +37,7 @@
 #include "core/interfaces/native/node/line_modifier.h"
 #include "core/interfaces/native/node/node_list_item_modifier.h"
 #include "core/interfaces/native/node/marquee_modifier.h"
+#include "core/interfaces/native/node/node_relative_container_modifier.h"
 #include "core/interfaces/native/node/menu_item_modifier.h"
 #include "core/interfaces/native/node/menu_modifier.h"
 #include "core/interfaces/native/node/nav_destination_modifier.h"
@@ -55,7 +56,6 @@
 #include "core/interfaces/native/node/node_list_modifier.h"
 #include "core/interfaces/native/node/node_loading_progress_modifier.h"
 #include "core/interfaces/native/node/node_refresh_modifier.h"
-#include "core/interfaces/native/node/node_relative_container_modifier.h"
 #include "core/interfaces/native/node/node_scroll_modifier.h"
 #include "core/interfaces/native/node/node_slider_modifier.h"
 #include "core/interfaces/native/node/node_span_modifier.h"

frameworks/core/interfaces/native/node/view_model.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "core/interfaces/native/node/node_api.h"
+
 #include "core/interfaces/native/node/extension_companion_node.h"
 
 namespace OHOS::Ace::NG::ViewModel {
@@ -56,11 +57,10 @@ ArkUI_Int32 LayoutNode(ArkUIVMContext context, ArkUINodeHandle nodePtr, ArkUI_Fl
 
 ArkUI_Int32 DrawNode(ArkUIVMContext context, ArkUINodeHandle nodePtr, ArkUI_Float32* data);
 
-ArkUI_Bool IsBuilderNode(void* nodePtr);
-
 void SetAttachNodePtr(ArkUINodeHandle nodePtr, void* attachNode);
 
 void* GetAttachNodePtr(ArkUINodeHandle nodePtr);
 
+ArkUI_Bool IsBuilderNode(void* nodePtr);
 } // namespace OHOS::Ace::NG::ViewModel
 #endif

interfaces/native/node/native_compatible.h

@@ -224,7 +224,8 @@ typedef struct {
     /** Whether to prevent propagation of the event to the parent node. */
     bool stopPropagation;
 
-    /** Whether to prevent the default event processing behavior of the current node and allow propagation of the event. */
+    /** Whether to prevent the default event processing behavior of
+    * the current node and allow propagation of the event. */
     bool preventDefault;
 } ArkUI_NodeTouchEvent;
 

test/mock/base/mock_event_report.cpp

@@ -69,6 +69,6 @@ void EventReport::ReportPageDepthOverflow(const std::string& pageUrl, int32_t de
 void EventReport::ReportFunctionTimeout(const std::string& functionName, int64_t time, int32_t threshold) {}
 
 void EventReport::ReportHoverStatusChange(
-    int32_t foldStatus, int32_t time, bool isHoverMode, int32_t appRotation, int32_t windowMode)
+    int32_t foldStatus, int32_t time, bool isHoverMode, int32_t appRotation, int32_t windowMode) {}
-{}
+
 } // namespace OHOS::Ace