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

Timestamp:

Apr 22, 2004, 9:53:36 AM (21 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

Preliminary change for conservative GC. Create "protected"
subclasses to GC-protect objects when on heap, since we will soon
remove the built-in refcounting of the normal wrapper classes. Use
them where needed.

• JavaScriptCore.pbproj/project.pbxproj:
• kjs/context.h:
• kjs/internal.h: (KJS::InterpreterImp::globalObject):
• kjs/interpreter.h:
• kjs/property_map.cpp:
• kjs/reference.h:
• kjs/reference_list.cpp:

WebCore:

Reviewed by Darin.

Preliminary change for conservative GC. Use new "protected"
subclasses to GC-protect objects when on heap, since we will soon
remove the built-in refcounting of the normal wrapper classes.

• ForwardingHeaders/kjs/protect.h: Added.
• khtml/ecma/kjs_binding.h:
• khtml/ecma/kjs_events.h:
• khtml/ecma/kjs_traversal.h:
• khtml/ecma/kjs_window.h:

File:

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

trunk/JavaScriptCore/kjs/internal.h

@@ -215 +215 @@
     friend class InterpreterImp;
   private:
-    Object b_Object;
-    Object b_Function;
-    Object b_Array;
-    Object b_Boolean;
-    Object b_String;
-    Object b_Number;
-    Object b_Date;
-    Object b_RegExp;
-    Object b_Error;
-
-    Object b_ObjectPrototype;
-    Object b_FunctionPrototype;
-    Object b_ArrayPrototype;
-    Object b_BooleanPrototype;
-    Object b_StringPrototype;
-    Object b_NumberPrototype;
-    Object b_DatePrototype;
-    Object b_RegExpPrototype;
-    Object b_ErrorPrototype;
-
-    Object b_evalError;
-    Object b_rangeError;
-    Object b_referenceError;
-    Object b_syntaxError;
-    Object b_typeError;
-    Object b_uriError;
-
-    Object b_evalErrorPrototype;
-    Object b_rangeErrorPrototype;
-    Object b_referenceErrorPrototype;
-    Object b_syntaxErrorPrototype;
-    Object b_typeErrorPrototype;
-    Object b_uriErrorPrototype;
+    ProtectedObject b_Object;
+    ProtectedObject b_Function;
+    ProtectedObject b_Array;
+    ProtectedObject b_Boolean;
+    ProtectedObject b_String;
+    ProtectedObject b_Number;
+    ProtectedObject b_Date;
+    ProtectedObject b_RegExp;
+    ProtectedObject b_Error;
+
+    ProtectedObject b_ObjectPrototype;
+    ProtectedObject b_FunctionPrototype;
+    ProtectedObject b_ArrayPrototype;
+    ProtectedObject b_BooleanPrototype;
+    ProtectedObject b_StringPrototype;
+    ProtectedObject b_NumberPrototype;
+    ProtectedObject b_DatePrototype;
+    ProtectedObject b_RegExpPrototype;
+    ProtectedObject b_ErrorPrototype;
+
+    ProtectedObject b_evalError;
+    ProtectedObject b_rangeError;
+    ProtectedObject b_referenceError;
+    ProtectedObject b_syntaxError;
+    ProtectedObject b_typeError;
+    ProtectedObject b_uriError;
+
+    ProtectedObject b_evalErrorPrototype;
+    ProtectedObject b_rangeErrorPrototype;
+    ProtectedObject b_referenceErrorPrototype;
+    ProtectedObject b_syntaxErrorPrototype;
+    ProtectedObject b_typeErrorPrototype;
+    ProtectedObject b_uriErrorPrototype;
   };
 
@@ -259 +259 @@
     ~InterpreterImp();
 
-    Object &globalObject() const { return const_cast<Object &>(global); }
+    ProtectedObject &globalObject() const { return const_cast<ProtectedObject &>(global); }
     Interpreter* interpreter() const { return m_interpreter; }
 
@@ -327 +327 @@
     void clear();
     Interpreter *m_interpreter;
-    Object global;
+    ProtectedObject global;
     Debugger *dbg;
 
@@ -334 +334 @@
     // Array.prototype)
 
-    Object b_Object;
-    Object b_Function;
-    Object b_Array;
-    Object b_Boolean;
-    Object b_String;
-    Object b_Number;
-    Object b_Date;
-    Object b_RegExp;
-    Object b_Error;
-
-    Object b_ObjectPrototype;
-    Object b_FunctionPrototype;
-    Object b_ArrayPrototype;
-    Object b_BooleanPrototype;
-    Object b_StringPrototype;
-    Object b_NumberPrototype;
-    Object b_DatePrototype;
-    Object b_RegExpPrototype;
-    Object b_ErrorPrototype;
-
-    Object b_evalError;
-    Object b_rangeError;
-    Object b_referenceError;
-    Object b_syntaxError;
-    Object b_typeError;
-    Object b_uriError;
-
-    Object b_evalErrorPrototype;
-    Object b_rangeErrorPrototype;
-    Object b_referenceErrorPrototype;
-    Object b_syntaxErrorPrototype;
-    Object b_typeErrorPrototype;
-    Object b_uriErrorPrototype;
+    ProtectedObject b_Object;
+    ProtectedObject b_Function;
+    ProtectedObject b_Array;
+    ProtectedObject b_Boolean;
+    ProtectedObject b_String;
+    ProtectedObject b_Number;
+    ProtectedObject b_Date;
+    ProtectedObject b_RegExp;
+    ProtectedObject b_Error;
+
+    ProtectedObject b_ObjectPrototype;
+    ProtectedObject b_FunctionPrototype;
+    ProtectedObject b_ArrayPrototype;
+    ProtectedObject b_BooleanPrototype;
+    ProtectedObject b_StringPrototype;
+    ProtectedObject b_NumberPrototype;
+    ProtectedObject b_DatePrototype;
+    ProtectedObject b_RegExpPrototype;
+    ProtectedObject b_ErrorPrototype;
+
+    ProtectedObject b_evalError;
+    ProtectedObject b_rangeError;
+    ProtectedObject b_referenceError;
+    ProtectedObject b_syntaxError;
+    ProtectedObject b_typeError;
+    ProtectedObject b_uriError;
+
+    ProtectedObject b_evalErrorPrototype;
+    ProtectedObject b_rangeErrorPrototype;
+    ProtectedObject b_referenceErrorPrototype;
+    ProtectedObject b_syntaxErrorPrototype;
+    ProtectedObject b_typeErrorPrototype;
+    ProtectedObject b_uriErrorPrototype;
 
     ExecState *globExec;