JavaScriptCore-1218.0.1.tar.gz

[apple/javascriptcore.git] / debugger / DebuggerActivation.h

diff --git a/debugger/DebuggerActivation.h b/debugger/DebuggerActivation.h
index 6560c3d1110628caff03f96ed199ad606022d642..a33d6ddb2a750c7337d5bd64c8b65329b889ac8d 100644 (file)
--- a/debugger/DebuggerActivation.h
+++ b/debugger/DebuggerActivation.h
@@ -34,37 +34,37 @@ namespace JSC {
     public:
         typedef JSNonFinalObject Base;
 
     public:
         typedef JSNonFinalObject Base;
 

-        static DebuggerActivation* create(JSGlobalData& globalData, JSObject* object)
+        static DebuggerActivation* create(VM& vm, JSObject* object)

         {
         {

-            DebuggerActivation* activation = new (NotNull, allocateCell<DebuggerActivation>(globalData.heap)) DebuggerActivation(globalData);
-            activation->finishCreation(globalData, object);
+            DebuggerActivation* activation = new (NotNull, allocateCell<DebuggerActivation>(vm.heap)) DebuggerActivation(vm);
+            activation->finishCreation(vm, object);

             return activation;
         }
 
         static void visitChildren(JSCell*, SlotVisitor&);
             return activation;
         }
 
         static void visitChildren(JSCell*, SlotVisitor&);

-        static UString className(const JSObject*);
-        static bool getOwnPropertySlot(JSCell*, ExecState*, const Identifier& propertyName, PropertySlot&);
-        static void put(JSCell*, ExecState*, const Identifier& propertyName, JSValue, PutPropertySlot&);
-        static void putDirectVirtual(JSObject*, ExecState*, const Identifier& propertyName, JSValue, unsigned attributes);
-        static bool deleteProperty(JSCell*, ExecState*, const Identifier& propertyName);
+        static String className(const JSObject*);
+        static bool getOwnPropertySlot(JSCell*, ExecState*, PropertyName, PropertySlot&);
+        static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);
+        static void putDirectVirtual(JSObject*, ExecState*, PropertyName, JSValue, unsigned attributes);
+        static bool deleteProperty(JSCell*, ExecState*, PropertyName);

         static void getOwnPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
         static void getOwnPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);

-        static bool getOwnPropertyDescriptor(JSObject*, ExecState*, const Identifier&, PropertyDescriptor&);
-        static bool defineOwnProperty(JSObject*, ExecState*, const Identifier& propertyName, PropertyDescriptor&, bool shouldThrow);
+        static bool getOwnPropertyDescriptor(JSObject*, ExecState*, PropertyName, PropertyDescriptor&);
+        static bool defineOwnProperty(JSObject*, ExecState*, PropertyName, PropertyDescriptor&, bool shouldThrow);

 
         JS_EXPORTDATA static const ClassInfo s_info;
 
 
         JS_EXPORTDATA static const ClassInfo s_info;
 

-        static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype) 
+        static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype) 

         {
         {

-            return Structure::create(globalData, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info); 
+            return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info); 

         }
 
     protected:
         static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | JSObject::StructureFlags;
 
         }
 
     protected:
         static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | JSObject::StructureFlags;
 

-        JS_EXPORT_PRIVATE void finishCreation(JSGlobalData&, JSObject* activation);
+        JS_EXPORT_PRIVATE void finishCreation(VM&, JSObject* activation);

 
     private:
 
     private:

-        JS_EXPORT_PRIVATE DebuggerActivation(JSGlobalData&);
+        JS_EXPORT_PRIVATE DebuggerActivation(VM&);

         WriteBarrier<JSActivation> m_activation;
     };
 
         WriteBarrier<JSActivation> m_activation;
     };