diff --git a/frameworks/core/common/container.h b/frameworks/core/common/container.h index 80121ceeb7619584413ae5382129bb7a65eaa53e..1ec5bb9f35b28fd0bfb07e639cdccb824697b228 100755 --- a/frameworks/core/common/container.h +++ b/frameworks/core/common/container.h @@ -63,6 +63,8 @@ enum ContainerType { PLUGIN_SUBCONTAINER = 20, }; +constexpr int32_t INSTANCE_ID_UNDEFINED = -1; +constexpr int32_t INSTANCE_ID_PLATFORM = -2; constexpr int32_t CONTAINER_ID_DIVIDE_SIZE = 100000; constexpr int32_t MIN_PLUGIN_SUBCONTAINER_ID = PLUGIN_SUBCONTAINER * CONTAINER_ID_DIVIDE_SIZE; constexpr int32_t MIN_SUBCONTAINER_ID = COMPONENT_SUBWINDOW_CONTAINER * CONTAINER_ID_DIVIDE_SIZE; diff --git a/frameworks/core/common/container_scope.cpp b/frameworks/core/common/container_scope.cpp index 15daa87a94f5ff22cb164079639e2dfa3cc08564..614154538269292b212d83955dff088241091687 100644 --- a/frameworks/core/common/container_scope.cpp +++ b/frameworks/core/common/container_scope.cpp @@ -14,6 +14,7 @@ */ #include "core/common/container_scope.h" +#include "core/common/container.h" #include "base/utils/utils.h" namespace OHOS::Ace { diff --git a/frameworks/core/common/container_scope.h b/frameworks/core/common/container_scope.h index 0bf416e920f98d8825736e04bbf4f2b822d11f6d..9d001100841ba9617aae0e28cc6b4ca77b8d90a4 100644 --- a/frameworks/core/common/container_scope.h +++ b/frameworks/core/common/container_scope.h @@ -23,14 +23,10 @@ namespace OHOS::Ace { -constexpr int32_t INSTANCE_ID_UNDEFINED = -1; -constexpr int32_t INSTANCE_ID_PLATFORM = -2; - class ACE_EXPORT ContainerScope { public: explicit ContainerScope(int32_t id) { - restoreId_ = CurrentId(); UpdateCurrent(id); } @@ -44,7 +40,7 @@ public: static void UpdateCurrent(int32_t id); private: - int32_t restoreId_ = INSTANCE_ID_UNDEFINED; + int32_t restoreId_ = CurrentId(); ACE_DISALLOW_COPY_AND_MOVE(ContainerScope); };