JavaScriptCore-903.tar.gz

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

diff --git a/debugger/DebuggerActivation.cpp b/debugger/DebuggerActivation.cpp
index 9d4dcbf9ff187cedee5736534b1ed7b18c9aa7f1..8711b5ce93df9204118cd780c59219e1f1c5ce84 100644 (file)
--- a/debugger/DebuggerActivation.cpp
+++ b/debugger/DebuggerActivation.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -30,19 +30,23 @@
 
 namespace JSC {
 
 
 namespace JSC {
 

-DebuggerActivation::DebuggerActivation(JSObject* activation)
-    : JSObject(DebuggerActivation::createStructure(jsNull()))
+DebuggerActivation::DebuggerActivation(JSGlobalData& globalData, JSObject* activation)
+    : JSNonFinalObject(globalData, globalData.debuggerActivationStructure.get())

 {
     ASSERT(activation);
     ASSERT(activation->isActivationObject());
 {
     ASSERT(activation);
     ASSERT(activation->isActivationObject());

-    m_activation = static_cast<JSActivation*>(activation);
+    m_activation.set(globalData, this, static_cast<JSActivation*>(activation));

 }
 
 }
 

-void DebuggerActivation::mark()
+void DebuggerActivation::visitChildren(SlotVisitor& visitor)

 {
 {

-    JSObject::mark();
-    if (m_activation && !m_activation->marked())
-        m_activation->mark();
+    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
+    COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
+    ASSERT(structure()->typeInfo().overridesVisitChildren());
+    JSObject::visitChildren(visitor);
+
+    if (m_activation)
+        visitor.append(&m_activation);

 }
 
 UString DebuggerActivation::className() const
 }
 
 UString DebuggerActivation::className() const


@@ -55,12 +59,12 @@ bool DebuggerActivation::getOwnPropertySlot(ExecState* exec, const Identifier& p
     return m_activation->getOwnPropertySlot(exec, propertyName, slot);
 }
 
     return m_activation->getOwnPropertySlot(exec, propertyName, slot);
 }
 

-void DebuggerActivation::put(ExecState* exec, const Identifier& propertyName, JSValuePtr value, PutPropertySlot& slot)
+void DebuggerActivation::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)

 {
     m_activation->put(exec, propertyName, value, slot);
 }
 
 {
     m_activation->put(exec, propertyName, value, slot);
 }
 

-void DebuggerActivation::putWithAttributes(ExecState* exec, const Identifier& propertyName, JSValuePtr value, unsigned attributes)
+void DebuggerActivation::putWithAttributes(ExecState* exec, const Identifier& propertyName, JSValue value, unsigned attributes)

 {
     m_activation->putWithAttributes(exec, propertyName, value, attributes);
 }
 {
     m_activation->putWithAttributes(exec, propertyName, value, attributes);
 }


@@ -70,32 +74,32 @@ bool DebuggerActivation::deleteProperty(ExecState* exec, const Identifier& prope
     return m_activation->deleteProperty(exec, propertyName);
 }
 
     return m_activation->deleteProperty(exec, propertyName);
 }
 

-void DebuggerActivation::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
+void DebuggerActivation::getOwnPropertyNames(ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)

 {
 {

-    m_activation->getPropertyNames(exec, propertyNames);
+    m_activation->getPropertyNames(exec, propertyNames, mode);

 }
 
 }
 

-bool DebuggerActivation::getPropertyAttributes(JSC::ExecState* exec, const Identifier& propertyName, unsigned& attributes) const
+bool DebuggerActivation::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)

 {
 {

-    return m_activation->getPropertyAttributes(exec, propertyName, attributes);
+    return m_activation->getOwnPropertyDescriptor(exec, propertyName, descriptor);

 }
 
 }
 

-void DebuggerActivation::defineGetter(ExecState* exec, const Identifier& propertyName, JSObject* getterFunction)
+void DebuggerActivation::defineGetter(ExecState* exec, const Identifier& propertyName, JSObject* getterFunction, unsigned attributes)

 {
 {

-    m_activation->defineGetter(exec, propertyName, getterFunction);
+    m_activation->defineGetter(exec, propertyName, getterFunction, attributes);

 }
 
 }
 

-void DebuggerActivation::defineSetter(ExecState* exec, const Identifier& propertyName, JSObject* setterFunction)
+void DebuggerActivation::defineSetter(ExecState* exec, const Identifier& propertyName, JSObject* setterFunction, unsigned attributes)

 {
 {

-    m_activation->defineSetter(exec, propertyName, setterFunction);
+    m_activation->defineSetter(exec, propertyName, setterFunction, attributes);

 }
 
 }
 

-JSValuePtr DebuggerActivation::lookupGetter(ExecState* exec, const Identifier& propertyName)
+JSValue DebuggerActivation::lookupGetter(ExecState* exec, const Identifier& propertyName)

 {
     return m_activation->lookupGetter(exec, propertyName);
 }
 
 {
     return m_activation->lookupGetter(exec, propertyName);
 }
 

-JSValuePtr DebuggerActivation::lookupSetter(ExecState* exec, const Identifier& propertyName)
+JSValue DebuggerActivation::lookupSetter(ExecState* exec, const Identifier& propertyName)

 {
     return m_activation->lookupSetter(exec, propertyName);
 }
 {
     return m_activation->lookupSetter(exec, propertyName);
 }