Changeset 33038 in webkit for trunk/JavaScriptCore/kjs/internal.h

Timestamp:

May 12, 2008, 12:12:31 AM (17 years ago)

Author:

[email protected]

Message:

Roll out recent threading changes (r32807, r32810, r32819, r32822) to simplify
SquirrelFish merging.

File:

• trunk/JavaScriptCore/kjs/internal.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/internal.h

@@ -46 +46 @@
   class StringImp : public JSCell {
   public:
-    StringImp(const UString& v) : val(v) { Heap::heap(this)->reportExtraMemoryCost(v.cost()); }
+    StringImp(const UString& v) : val(v) { Collector::reportExtraMemoryCost(v.cost()); }
     enum HasOtherOwnerType { HasOtherOwner };
     StringImp(const UString& value, HasOtherOwnerType) : val(value) { }
@@ -66 +66 @@
   class NumberImp : public JSCell {
     friend class ConstantValues;
-    friend JSValue* jsNumberCell(ExecState*, double);
+    friend JSValue *jsNumberCell(double);
   public:
     double value() const { return val; }
@@ -79 +79 @@
     virtual JSObject *toObject(ExecState *exec) const;
     
-    void* operator new(size_t size, ExecState* exec)
+    void* operator new(size_t size)
     {
-        return exec->heap()->allocateNumber(size);
+        return Collector::allocateNumber(size);
     }
-
   private:
     NumberImp(double v) : val(v) { }