JavaScriptCore-1218.0.1.tar.gz

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

diff --git a/debugger/DebuggerCallFrame.h b/debugger/DebuggerCallFrame.h
index cdf49651dfaa3a8fdbb393f504721dc8a7878952..66585a6371ef586642b39fc23e6a7c88c7671cf3 100644 (file)
--- a/debugger/DebuggerCallFrame.h
+++ b/debugger/DebuggerCallFrame.h
@@ -39,27 +39,28 @@ namespace JSC {
 
         DebuggerCallFrame(CallFrame* callFrame)
             : m_callFrame(callFrame)
 
         DebuggerCallFrame(CallFrame* callFrame)
             : m_callFrame(callFrame)

-            , m_exception(noValue())

         {
         }
 
         {
         }
 

-        DebuggerCallFrame(CallFrame* callFrame, JSValuePtr exception)
+        DebuggerCallFrame(CallFrame* callFrame, JSValue exception)

             : m_callFrame(callFrame)
             , m_exception(exception)
         {
         }
 
             : m_callFrame(callFrame)
             , m_exception(exception)
         {
         }
 

+        CallFrame* callFrame() const { return m_callFrame; }

         JSGlobalObject* dynamicGlobalObject() const { return m_callFrame->dynamicGlobalObject(); }
         JSGlobalObject* dynamicGlobalObject() const { return m_callFrame->dynamicGlobalObject(); }

-        const ScopeChainNode* scopeChain() const { return m_callFrame->scopeChain(); }
-        const UString* functionName() const;
-        Type type() const;
-        JSObject* thisObject() const;
-        JSValuePtr evaluate(const UString&, JSValuePtr& exception) const;
-        JSValuePtr exception() const { return m_exception; }
+        JSScope* scope() const { return m_callFrame->scope(); }
+        JS_EXPORT_PRIVATE String functionName() const;
+        JS_EXPORT_PRIVATE String calculatedFunctionName() const;
+        JS_EXPORT_PRIVATE Type type() const;
+        JS_EXPORT_PRIVATE JSObject* thisObject() const;
+        JS_EXPORT_PRIVATE JSValue evaluate(const String&, JSValue& exception) const;
+        JSValue exception() const { return m_exception; }

 
     private:
         CallFrame* m_callFrame;
 
     private:
         CallFrame* m_callFrame;

-        JSValuePtr m_exception;
+        JSValue m_exception;

     };
 
 } // namespace JSC
     };
 
 } // namespace JSC