Selaa lähdekoodia

LibJS: Move WeakContainer into the Heap folder

While this is used in the implementation of Runtime objects itself, Heap
seems like a more appropriate home. This will also help in factoring out
the GC implementation into it's own library as the heap explicitly has
knowledge of WeakContainer.
Shannon Booth 8 kuukautta sitten
vanhempi
commit
cf27eef583

+ 1 - 1
Libraries/LibJS/CMakeLists.txt

@@ -27,6 +27,7 @@ set(SOURCES
     Heap/Heap.cpp
     Heap/HeapBlock.cpp
     Heap/MarkedVector.cpp
+    Heap/WeakContainer.cpp
     Lexer.cpp
     MarkupGenerator.cpp
     Module.cpp
@@ -253,7 +254,6 @@ set(SOURCES
     Runtime/Utf16String.cpp
     Runtime/Value.cpp
     Runtime/VM.cpp
-    Runtime/WeakContainer.cpp
     Runtime/WeakMap.cpp
     Runtime/WeakMapConstructor.cpp
     Runtime/WeakMapPrototype.cpp

+ 1 - 1
Libraries/LibJS/Heap/Heap.h

@@ -22,7 +22,7 @@
 #include <LibJS/Heap/HeapRoot.h>
 #include <LibJS/Heap/Internals.h>
 #include <LibJS/Heap/MarkedVector.h>
-#include <LibJS/Runtime/WeakContainer.h>
+#include <LibJS/Heap/WeakContainer.h>
 
 namespace JS {
 

+ 1 - 1
Libraries/LibJS/Runtime/WeakContainer.cpp → Libraries/LibJS/Heap/WeakContainer.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <LibJS/Heap/Heap.h>
-#include <LibJS/Runtime/WeakContainer.h>
+#include <LibJS/Heap/WeakContainer.h>
 
 namespace JS {
 

+ 0 - 0
Libraries/LibJS/Runtime/WeakContainer.h → Libraries/LibJS/Heap/WeakContainer.h


+ 1 - 1
Libraries/LibJS/Runtime/FinalizationRegistry.h

@@ -8,12 +8,12 @@
 
 #include <AK/SinglyLinkedList.h>
 #include <LibJS/Heap/GCPtr.h>
+#include <LibJS/Heap/WeakContainer.h>
 #include <LibJS/Runtime/FunctionObject.h>
 #include <LibJS/Runtime/GlobalObject.h>
 #include <LibJS/Runtime/JobCallback.h>
 #include <LibJS/Runtime/Object.h>
 #include <LibJS/Runtime/Value.h>
-#include <LibJS/Runtime/WeakContainer.h>
 
 namespace JS {
 

+ 1 - 1
Libraries/LibJS/Runtime/WeakMap.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/HashMap.h>
+#include <LibJS/Heap/WeakContainer.h>
 #include <LibJS/Runtime/GlobalObject.h>
 #include <LibJS/Runtime/Object.h>
-#include <LibJS/Runtime/WeakContainer.h>
 
 namespace JS {
 

+ 1 - 1
Libraries/LibJS/Runtime/WeakRef.h

@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include <LibJS/Heap/WeakContainer.h>
 #include <LibJS/Runtime/GlobalObject.h>
 #include <LibJS/Runtime/Object.h>
-#include <LibJS/Runtime/WeakContainer.h>
 
 namespace JS {
 

+ 1 - 1
Libraries/LibJS/Runtime/WeakSet.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/HashTable.h>
+#include <LibJS/Heap/WeakContainer.h>
 #include <LibJS/Runtime/GlobalObject.h>
 #include <LibJS/Runtime/Object.h>
-#include <LibJS/Runtime/WeakContainer.h>
 
 namespace JS {