Moved Collector.* => Heap.*, since the file contains a class named "Heap".
authorggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Jan 2011 23:43:56 +0000 (23:43 +0000)
committerggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Jan 2011 23:43:56 +0000 (23:43 +0000)
Reviewed by Oliver Hunt.

Source/JavaScriptCore:

* API/JSCallbackObject.cpp:
* Android.mk:
* CMakeLists.txt:
* GNUmakefile.am:
* JavaScriptCore.gypi:
* JavaScriptCore.pro:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* interpreter/Interpreter.cpp:
* interpreter/RegisterFile.h:
* jit/JITStubs.cpp:
* runtime/Collector.cpp: Removed.
* runtime/Collector.h: Removed.
* runtime/CollectorHeapIterator.h:
* runtime/GCActivityCallbackCF.cpp:
* runtime/Heap.cpp: Copied from JavaScriptCore/runtime/Collector.cpp.
* runtime/Heap.h: Copied from JavaScriptCore/runtime/Collector.h.
* runtime/InitializeThreading.cpp:
* runtime/JSCell.h:
* runtime/JSGlobalData.cpp:
* runtime/JSGlobalData.h:
* runtime/JSLock.cpp:
* runtime/JSNumberCell.h:
* runtime/MachineStackMarker.cpp:
* runtime/MemoryStatistics.h:
* runtime/Protect.h:
* runtime/UString.cpp:
* runtime/WeakGCMap.h:
* runtime/WeakGCPtr.h:

Source/JavaScriptGlue:

* JSUtils.h:

Source/WebCore:

* ForwardingHeaders/runtime/Collector.h: Removed.
* ForwardingHeaders/runtime/Heap.h: Copied from WebCore/ForwardingHeaders/runtime/Collector.h.
* WebCore.vcproj/WebCore.vcproj:
* bindings/js/GCController.cpp:
* bindings/js/ScriptGCEvent.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@75443 268f45cc-cd09-0410-ab3c-d52691b4dbfc

36 files changed:
Source/JavaScriptCore/API/JSCallbackObject.cpp
Source/JavaScriptCore/Android.mk
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/GNUmakefile.am
Source/JavaScriptCore/JavaScriptCore.gypi
Source/JavaScriptCore/JavaScriptCore.pro
Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/JavaScriptCore/interpreter/Interpreter.cpp
Source/JavaScriptCore/interpreter/RegisterFile.h
Source/JavaScriptCore/jit/JITStubs.cpp
Source/JavaScriptCore/runtime/CollectorHeapIterator.h
Source/JavaScriptCore/runtime/GCActivityCallbackCF.cpp
Source/JavaScriptCore/runtime/Heap.cpp [moved from Source/JavaScriptCore/runtime/Collector.cpp with 99% similarity]
Source/JavaScriptCore/runtime/Heap.h [moved from Source/JavaScriptCore/runtime/Collector.h with 99% similarity]
Source/JavaScriptCore/runtime/InitializeThreading.cpp
Source/JavaScriptCore/runtime/JSCell.h
Source/JavaScriptCore/runtime/JSGlobalData.cpp
Source/JavaScriptCore/runtime/JSGlobalData.h
Source/JavaScriptCore/runtime/JSLock.cpp
Source/JavaScriptCore/runtime/JSNumberCell.h
Source/JavaScriptCore/runtime/MachineStackMarker.cpp
Source/JavaScriptCore/runtime/MemoryStatistics.h
Source/JavaScriptCore/runtime/Protect.h
Source/JavaScriptCore/runtime/UString.cpp
Source/JavaScriptCore/runtime/WeakGCMap.h
Source/JavaScriptCore/runtime/WeakGCPtr.h
Source/JavaScriptGlue/ChangeLog
Source/JavaScriptGlue/JSUtils.h
Source/WebCore/ChangeLog
Source/WebCore/ForwardingHeaders/runtime/Collector.h [deleted file]
Source/WebCore/ForwardingHeaders/runtime/Heap.h [new file with mode: 0644]
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/bindings/js/GCController.cpp
Source/WebCore/bindings/js/ScriptGCEvent.cpp

index abd2adc..b8e5843 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "JSCallbackObject.h"
 
-#include "Collector.h"
+#include "Heap.h"
 #include <wtf/text/StringHash.h>
 
 namespace JSC {
index 865a751..5836c59 100644 (file)
@@ -80,7 +80,7 @@ LOCAL_SRC_FILES := \
        runtime/BooleanObject.cpp \
        runtime/BooleanPrototype.cpp \
        runtime/CallData.cpp \
-       runtime/Collector.cpp \
+       runtime/Heap.cpp \
        runtime/CommonIdentifiers.cpp \
        runtime/Completion.cpp \
        runtime/ConstructData.cpp \
index ef53adb..3203b8d 100644 (file)
@@ -87,7 +87,7 @@ SET(JavaScriptCore_SOURCES
     runtime/BooleanObject.cpp
     runtime/BooleanPrototype.cpp
     runtime/CallData.cpp
-    runtime/Collector.cpp
+    runtime/Heap.cpp
     runtime/CommonIdentifiers.cpp
     runtime/Completion.cpp
     runtime/ConstructData.cpp
index 6804f7a..1230fc5 100644 (file)
@@ -1,3 +1,39 @@
+2011-01-10  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Moved Collector.* => Heap.*, since the file contains a class named "Heap".
+
+        * API/JSCallbackObject.cpp:
+        * Android.mk:
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * JavaScriptCore.gypi:
+        * JavaScriptCore.pro:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * interpreter/Interpreter.cpp:
+        * interpreter/RegisterFile.h:
+        * jit/JITStubs.cpp:
+        * runtime/Collector.cpp: Removed.
+        * runtime/Collector.h: Removed.
+        * runtime/CollectorHeapIterator.h:
+        * runtime/GCActivityCallbackCF.cpp:
+        * runtime/Heap.cpp: Copied from JavaScriptCore/runtime/Collector.cpp.
+        * runtime/Heap.h: Copied from JavaScriptCore/runtime/Collector.h.
+        * runtime/InitializeThreading.cpp:
+        * runtime/JSCell.h:
+        * runtime/JSGlobalData.cpp:
+        * runtime/JSGlobalData.h:
+        * runtime/JSLock.cpp:
+        * runtime/JSNumberCell.h:
+        * runtime/MachineStackMarker.cpp:
+        * runtime/MemoryStatistics.h:
+        * runtime/Protect.h:
+        * runtime/UString.cpp:
+        * runtime/WeakGCMap.h:
+        * runtime/WeakGCPtr.h:
+
 2011-01-10  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Gavin Barraclough.
index bee8ed4..1dab30e 100644 (file)
@@ -236,8 +236,8 @@ javascriptcore_sources += \
        Source/JavaScriptCore/runtime/CallData.cpp \
        Source/JavaScriptCore/runtime/CallData.h \
        Source/JavaScriptCore/runtime/ClassInfo.h \
-       Source/JavaScriptCore/runtime/Collector.cpp \
-       Source/JavaScriptCore/runtime/Collector.h \
+       Source/JavaScriptCore/runtime/Heap.cpp \
+       Source/JavaScriptCore/runtime/Heap.h \
        Source/JavaScriptCore/runtime/CollectorHeapIterator.h \
        Source/JavaScriptCore/runtime/CommonIdentifiers.cpp \
        Source/JavaScriptCore/runtime/CommonIdentifiers.h \
index 8442884..a6c1db4 100644 (file)
             'runtime/CallData.cpp',
             'runtime/CallData.h',
             'runtime/ClassInfo.h',
-            'runtime/Collector.cpp',
-            'runtime/Collector.h',
+            'runtime/Heap.cpp',
+            'runtime/Heap.h',
             'runtime/CollectorHeapIterator.h',
             'runtime/CommonIdentifiers.cpp',
             'runtime/CommonIdentifiers.h',
index ab475b2..76cc8a8 100644 (file)
@@ -127,7 +127,7 @@ SOURCES += \
     runtime/BooleanObject.cpp \
     runtime/BooleanPrototype.cpp \
     runtime/CallData.cpp \
-    runtime/Collector.cpp \
+    runtime/Heap.cpp \
     runtime/CommonIdentifiers.cpp \
     runtime/Completion.cpp \
     runtime/ConstructData.cpp \
index deaba10..f00c18d 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\runtime\Collector.cpp"
+                               RelativePath="..\..\runtime\Heap.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\runtime\Collector.h"
+                               RelativePath="..\..\runtime\Heap.h"
                                >
                        </File>
                        <File
index f2e6d66..a778036 100644 (file)
                14F3488F0E95EF8A003648BC /* CollectorHeapIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F3488E0E95EF8A003648BC /* CollectorHeapIterator.h */; settings = {ATTRIBUTES = (); }; };
                14F8BA3E107EC886009892DC /* FastMalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */; };
                14F8BA43107EC88C009892DC /* TCSystemAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */; };
-               14F8BA4F107EC899009892DC /* Collector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8520255597D01FF60F7 /* Collector.cpp */; };
+               14F8BA4F107EC899009892DC /* Heap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8520255597D01FF60F7 /* Heap.cpp */; };
                14FFF98C12BFFF7500795BB8 /* PageAllocationAligned.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14FFF98A12BFFF7500795BB8 /* PageAllocationAligned.cpp */; };
                14FFF98D12BFFF7500795BB8 /* PageAllocationAligned.h in Headers */ = {isa = PBXBuildFile; fileRef = 14FFF98B12BFFF7500795BB8 /* PageAllocationAligned.h */; settings = {ATTRIBUTES = (Private, ); }; };
                180B9B080F16D94F009BDBC5 /* CurrentTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 180B9AF00F16C569009BDBC5 /* CurrentTime.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3EC0E16F5CD00B34460 /* BooleanObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 704FD35305697E6D003DBED9 /* BooleanObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3ED0E16F5CD00B34460 /* CallData.h in Headers */ = {isa = PBXBuildFile; fileRef = 145C507F0D9DF63B0088F6B9 /* CallData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3F00E16F5CD00B34460 /* Collator.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A862AA0D7EBB7D001EC6AA /* Collator.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C3F10E16F5CD00B34460 /* Collector.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8530255597D01FF60F7 /* Collector.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C3F10E16F5CD00B34460 /* Heap.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8530255597D01FF60F7 /* Heap.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3F30E16F5CD00B34460 /* CommonIdentifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3F40E16F5CD00B34460 /* Completion.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BB2BC5030F772101FCFE1D /* Completion.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C3F50E16F5CD00B34460 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = F68EBB8C0255D4C601FF60F7 /* config.h */; settings = {ATTRIBUTES = (Private, ); }; };
                F692A84D0255597D01FF60F7 /* ArrayPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayPrototype.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A84E0255597D01FF60F7 /* ArrayPrototype.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ArrayPrototype.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8500255597D01FF60F7 /* BooleanObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BooleanObject.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8520255597D01FF60F7 /* Collector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Collector.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8530255597D01FF60F7 /* Collector.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Collector.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8520255597D01FF60F7 /* Heap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Heap.cpp; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8530255597D01FF60F7 /* Heap.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Heap.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8540255597D01FF60F7 /* create_hash_table */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = text.script.perl; path = create_hash_table; sourceTree = "<group>"; tabWidth = 8; };
                F692A8580255597D01FF60F7 /* Debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Debugger.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8590255597D01FF60F7 /* Debugger.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Debugger.h; sourceTree = "<group>"; tabWidth = 8; };
                                BCA62DFE0E2826230004F30D /* CallData.cpp */,
                                145C507F0D9DF63B0088F6B9 /* CallData.h */,
                                BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */,
-                               F692A8520255597D01FF60F7 /* Collector.cpp */,
-                               F692A8530255597D01FF60F7 /* Collector.h */,
                                14F3488E0E95EF8A003648BC /* CollectorHeapIterator.h */,
                                65EA73620BAE35D1001BB560 /* CommonIdentifiers.cpp */,
                                65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */,
                                BC337BDE0E1AF0B80076918A /* GetterSetter.h */,
                                BC257DED0E1F52ED0016B6C9 /* GlobalEvalFunction.cpp */,
                                BC257DEE0E1F52ED0016B6C9 /* GlobalEvalFunction.h */,
+                               F692A8520255597D01FF60F7 /* Heap.cpp */,
+                               F692A8530255597D01FF60F7 /* Heap.h */,
                                933A349D038AE80F008635CE /* Identifier.cpp */,
                                933A349A038AE7C6008635CE /* Identifier.h */,
                                E178636C0D9BEEC300D74E75 /* InitializeThreading.cpp */,
                                969A07970ED1D3AE00F1F681 /* CodeBlock.h in Headers */,
                                86E116B10FE75AC800B512BC /* CodeLocation.h in Headers */,
                                BC18C3F00E16F5CD00B34460 /* Collator.h in Headers */,
-                               BC18C3F10E16F5CD00B34460 /* Collector.h in Headers */,
+                               BC18C3F10E16F5CD00B34460 /* Heap.h in Headers */,
                                14F3488F0E95EF8A003648BC /* CollectorHeapIterator.h in Headers */,
                                BC18C3F30E16F5CD00B34460 /* CommonIdentifiers.h in Headers */,
                                BC18C3F40E16F5CD00B34460 /* Completion.h in Headers */,
                                969A07960ED1D3AE00F1F681 /* CodeBlock.cpp in Sources */,
                                E1A862D60D7F2B5C001EC6AA /* CollatorDefault.cpp in Sources */,
                                E1A862A90D7EBB76001EC6AA /* CollatorICU.cpp in Sources */,
-                               14F8BA4F107EC899009892DC /* Collector.cpp in Sources */,
+                               14F8BA4F107EC899009892DC /* Heap.cpp in Sources */,
                                147F39C1107EC37600427A48 /* CommonIdentifiers.cpp in Sources */,
                                147F39C2107EC37600427A48 /* Completion.cpp in Sources */,
                                1428082E107EC0570013E7B2 /* ConstructData.cpp in Sources */,
index 99bc81a..cf9f8a1 100644 (file)
@@ -35,7 +35,7 @@
 #include "CallFrame.h"
 #include "CallFrameClosure.h"
 #include "CodeBlock.h"
-#include "Collector.h"
+#include "Heap.h"
 #include "Debugger.h"
 #include "DebuggerCallFrame.h"
 #include "ErrorInstance.h"
index 51a5bdf..f2e6553 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef RegisterFile_h
 #define RegisterFile_h
 
-#include "Collector.h"
+#include "Heap.h"
 #include "ExecutableAllocator.h"
 #include "Register.h"
 #include "WeakGCPtr.h"
index f2901b7..81c4189 100644 (file)
@@ -36,7 +36,7 @@
 #include "Arguments.h"
 #include "CallFrame.h"
 #include "CodeBlock.h"
-#include "Collector.h"
+#include "Heap.h"
 #include "Debugger.h"
 #include "ExceptionHelpers.h"
 #include "GetterSetter.h"
index 9d107b7..7229d77 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "Collector.h"
+#include "Heap.h"
 
 #ifndef CollectorHeapIterator_h
 #define CollectorHeapIterator_h
index 7168a05..414a0ad 100644 (file)
@@ -30,7 +30,7 @@
 #include "GCActivityCallback.h"
 
 #include "APIShims.h"
-#include "Collector.h"
+#include "Heap.h"
 #include "JSGlobalData.h"
 #include "JSLock.h"
 #include <wtf/RetainPtr.h>
similarity index 99%
rename from Source/JavaScriptCore/runtime/Collector.cpp
rename to Source/JavaScriptCore/runtime/Heap.cpp
index e72938a..f0153fc 100644 (file)
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "Collector.h"
+#include "Heap.h"
 
 #include "ArgList.h"
 #include "CallFrame.h"
similarity index 99%
rename from Source/JavaScriptCore/runtime/Collector.h
rename to Source/JavaScriptCore/runtime/Heap.h
index 349fc4c..c7c040e 100644 (file)
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef Collector_h
-#define Collector_h
+#ifndef Heap_h
+#define Heap_h
 
 #include "GCHandle.h"
 #include "JSValue.h"
@@ -314,4 +314,4 @@ namespace JSC {
     }
 } // namespace JSC
 
-#endif /* Collector_h */
+#endif /* Heap_h */
index 08dddc1..27611b7 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "InitializeThreading.h"
 
-#include "Collector.h"
+#include "Heap.h"
 #include "dtoa.h"
 #include "Identifier.h"
 #include "JSGlobalObject.h"
index 7d4929d..cee781d 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "CallData.h"
 #include "ConstructData.h"
-#include "Collector.h"
+#include "Heap.h"
 #include "JSImmediate.h"
 #include "JSValue.h"
 #include "MarkStack.h"
index aca995a..f20a9a4 100644 (file)
@@ -30,7 +30,7 @@
 #include "JSGlobalData.h"
 
 #include "ArgList.h"
-#include "Collector.h"
+#include "Heap.h"
 #include "CollectorHeapIterator.h"
 #include "CommonIdentifiers.h"
 #include "FunctionConstructor.h"
index 6fb202f..a24732a 100644 (file)
@@ -30,7 +30,7 @@
 #define JSGlobalData_h
 
 #include "CachedTranscendentalFunction.h"
-#include "Collector.h"
+#include "Heap.h"
 #include "DateInstanceCache.h"
 #include "ExecutableAllocator.h"
 #include "JITStubs.h"
index 10f4f3f..918141f 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "JSLock.h"
 
-#include "Collector.h"
+#include "Heap.h"
 #include "CallFrame.h"
 
 #if ENABLE(JSC_MULTIPLE_THREADS)
index 0040067..1ccdf50 100644 (file)
@@ -26,7 +26,7 @@
 #include "CallFrame.h"
 #include "JSCell.h"
 #include "JSImmediate.h"
-#include "Collector.h"
+#include "Heap.h"
 #include "UString.h"
 #include <stddef.h> // for size_t
 
index 22c2a87..b4a1936 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "MachineStackMarker.h"
 
-#include "Collector.h"
+#include "Heap.h"
 #include "JSArray.h"
 #include "JSGlobalData.h"
 #include <setjmp.h>
index 1b92eb9..e801916 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef MemoryStatistics_h
 #define MemoryStatistics_h
 
-#include "Collector.h"
+#include "Heap.h"
 
 class JSGlobalData;
 
index 06cf97f..0c1b5e8 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef Protect_h
 #define Protect_h
 
-#include "Collector.h"
+#include "Heap.h"
 #include "JSValue.h"
 
 namespace JSC {
index b3cd40c..b70d505 100644 (file)
@@ -25,7 +25,7 @@
 #include "UString.h"
 
 #include "JSGlobalObjectFunctions.h"
-#include "Collector.h"
+#include "Heap.h"
 #include "Identifier.h"
 #include "Operations.h"
 #include <ctype.h>
index 6b96a74..2d4e59d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WeakGCMap_h
 #define WeakGCMap_h
 
-#include "Collector.h"
+#include "Heap.h"
 #include <wtf/HashMap.h>
 
 namespace JSC {
index ac77cf3..6cc75a5 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WeakGCPtr_h
 #define WeakGCPtr_h
 
-#include "Collector.h"
+#include "Heap.h"
 #include "GCHandle.h"
 #include <wtf/Noncopyable.h>
 
index 792075a..46cfba8 100644 (file)
@@ -1,3 +1,11 @@
+2011-01-10  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Moved Collector.* => Heap.*, since the file contains a class named "Heap".
+
+        * JSUtils.h:
+
 2011-01-02  Dan Bernstein  <mitz@apple.com>
 
         Rubber-stamped by Simon Fraser.
index cbd9912..ec55254 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "JavaScriptGlue.h"
 
-#include <JavaScriptCore/Collector.h>
+#include <JavaScriptCore/Heap.h>
 #include <JavaScriptCore/JSValue.h>
 #include <JavaScriptCore/Completion.h>
 #include <JavaScriptCore/Identifier.h>
index 1489ce7..5d0dbfb 100644 (file)
@@ -1,3 +1,15 @@
+2011-01-10  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Moved Collector.* => Heap.*, since the file contains a class named "Heap".
+
+        * ForwardingHeaders/runtime/Collector.h: Removed.
+        * ForwardingHeaders/runtime/Heap.h: Copied from WebCore/ForwardingHeaders/runtime/Collector.h.
+        * WebCore.vcproj/WebCore.vcproj:
+        * bindings/js/GCController.cpp:
+        * bindings/js/ScriptGCEvent.cpp:
+
 2011-01-10  Leonid Ebril  <leonid.ebril@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/Source/WebCore/ForwardingHeaders/runtime/Collector.h b/Source/WebCore/ForwardingHeaders/runtime/Collector.h
deleted file mode 100644 (file)
index d133a27..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_Collector_h
-#define WebCore_FWD_Collector_h
-#include <JavaScriptCore/Collector.h>
-#endif
diff --git a/Source/WebCore/ForwardingHeaders/runtime/Heap.h b/Source/WebCore/ForwardingHeaders/runtime/Heap.h
new file mode 100644 (file)
index 0000000..810fa3c
--- /dev/null
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_Heap_h
+#define WebCore_FWD_Heap_h
+#include <JavaScriptCore/Heap.h>
+#endif
index d49bf2a..bffc6d6 100755 (executable)
                                        >
                                </File>
                                <File
-                                       RelativePath="..\ForwardingHeaders\runtime\Collector.h"
+                                       RelativePath="..\ForwardingHeaders\runtime\Heap.h"
                                        >
                                </File>
                                <File
index f193b2e..fe0e36f 100644 (file)
@@ -29,7 +29,7 @@
 #include "JSDOMWindow.h"
 #include <runtime/JSGlobalData.h>
 #include <runtime/JSLock.h>
-#include <runtime/Collector.h>
+#include <runtime/Heap.h>
 #include <wtf/StdLibExtras.h>
 
 #if USE(PTHREADS)
index 4b39799..b7fc7b3 100644 (file)
@@ -34,7 +34,7 @@
 #if ENABLE(INSPECTOR)
 
 #include "JSDOMWindow.h"
-#include <runtime/Collector.h>
+#include <runtime/Heap.h>
 #include <runtime/JSGlobalData.h>
 #include <wtf/CurrentTime.h>