Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 59 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/heap/GCIncomingRefCountedSet.h b/Source/JavaScriptCore/heap/GCIncomingRefCountedSet.h
new file mode 100644
index 000000000..5e7254a2c
--- /dev/null
+++ b/Source/JavaScriptCore/heap/GCIncomingRefCountedSet.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef GCIncomingRefCountedSet_h
+#define GCIncomingRefCountedSet_h
+
+#include "GCIncomingRefCounted.h"
+
+namespace JSC {
+
+// T = some subtype of GCIncomingRefCounted, must support a gcSizeEstimateInBytes()
+// method.
+template<typename T>
+class GCIncomingRefCountedSet {
+public:
+    GCIncomingRefCountedSet();
+    ~GCIncomingRefCountedSet();
+    
+    // Returns true if the native object is new to this set.
+    bool addReference(JSCell*, T*);
+    
+    void sweep();
+    
+    size_t size() const { return m_bytes; };
+    
+private:
+    static bool removeAll(JSCell*);
+    static bool removeDead(JSCell*);
+    
+    Vector<T*> m_vector;
+    size_t m_bytes;
+};
+
+} // namespace JSC
+
+#endif // GCIncomingRefCountedSet_h
+