[dali_2.3.26] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / internal / event / size-negotiation / memory-pool-relayout-container.h

diff --git a/dali/internal/event/size-negotiation/memory-pool-relayout-container.h b/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
index 4a143c7..38e7601 100644 (file)
--- a/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
+++ b/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_MEMORY_POOL_RELAYOUT_CONTAINER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,15 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <memory> // for std::unique_ptr
+
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/size-negotiation/relayout-container.h>
 
+#include <dali/integration-api/ordered-set.h>
 #include <dali/internal/common/memory-pool-object-allocator.h>
 
 namespace Dali
@@ -44,6 +48,30 @@ public:
   {
     Dali::Actor actor; ///< The actor to relayout
     Vector2     size;  ///< The desired size of the actor
+#if defined(LOW_SPEC_MEMORY_MANAGEMENT_ENABLED)
+    struct RelayoutInfoCompareLess
+    {
+      bool operator()(const RelayoutInfo* lhs, const RelayoutInfo* rhs) const noexcept
+      {
+        return lhs->actor < rhs->actor;
+      }
+    };
+#else
+    struct RelayoutInfoHash
+    {
+      std::size_t operator()(const RelayoutInfo* x) const noexcept
+      {
+        return reinterpret_cast<std::size_t>(x->actor.GetObjectPtr());
+      }
+    };
+    struct RelayoutInfoCompare
+    {
+      bool operator()(const RelayoutInfo* lhs, const RelayoutInfo* rhs) const noexcept
+      {
+        return lhs->actor == rhs->actor;
+      }
+    };
+#endif
   };
 
   /**
@@ -72,11 +100,12 @@ public:
   void PopBack();
 
   /**
-   * @brief Retrieve relayout information for the given index
+   * @brief Retrieve relayout information for the latest added
    *
-   * @param index The index of the information to retrieve
+   * @param[out] actorOut Latest added actor
+   * @param[out] sizeOt Latest added size
    */
-  void Get(size_t index, Dali::Actor& actorOut, Vector2& sizeOut) const;
+  void GetBack(Dali::Actor& actorOut, Vector2& sizeOut) const;
 
   /**
    * @brief The count of information in the container
@@ -95,6 +124,7 @@ public:
    */
   void Clear();
 
+private:
   /**
    * @brief Returns if the container contains the actor or not
    *
@@ -104,11 +134,17 @@ public:
   bool Contains(const Dali::Actor& actor);
 
 private:
-  using RelayoutInfoContainer = Vector<RelayoutInfo*>;
+#if defined(LOW_SPEC_MEMORY_MANAGEMENT_ENABLED)
+  using RelayoutInfoContainer = Dali::Integration::OrderedSet<RelayoutInfo, false, RelayoutInfo::RelayoutInfoCompareLess>;
+#else
+  using RelayoutInfoContainer = Dali::Integration::OrderedSet<RelayoutInfo, false, RelayoutInfo::RelayoutInfoHash, RelayoutInfo::RelayoutInfoCompare>;
+#endif
 
   RelayoutInfoContainer mRelayoutInfos; ///< The list of relayout infos
 
   MemoryPoolObjectAllocator<RelayoutInfo>& mAllocator; ///< The memory pool from which the infos are allocated
+
+  std::unique_ptr<RelayoutInfo> mDummyRelayoutInfo; ///< Dummy pointer that will be used to compare relayout infors what we already holded.
 };
 
 } // namespace Internal