From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 3 Feb 2012 09:55:33 +0100 Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560) --- Source/JavaScriptCore/debugger/Debugger.h | 2 +- Source/JavaScriptCore/debugger/DebuggerActivation.cpp | 4 ++-- Source/JavaScriptCore/debugger/DebuggerActivation.h | 8 ++++---- Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp | 5 +++-- Source/JavaScriptCore/debugger/DebuggerCallFrame.h | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) (limited to 'Source/JavaScriptCore/debugger') diff --git a/Source/JavaScriptCore/debugger/Debugger.h b/Source/JavaScriptCore/debugger/Debugger.h index f48243c45..a23732918 100644 --- a/Source/JavaScriptCore/debugger/Debugger.h +++ b/Source/JavaScriptCore/debugger/Debugger.h @@ -58,7 +58,7 @@ namespace JSC { }; // This function exists only for backwards compatibility with existing WebScriptDebugger clients. - JSValue evaluateInGlobalCallFrame(const UString&, JSValue& exception, JSGlobalObject*); + JS_EXPORT_PRIVATE JSValue evaluateInGlobalCallFrame(const UString&, JSValue& exception, JSGlobalObject*); } // namespace JSC diff --git a/Source/JavaScriptCore/debugger/DebuggerActivation.cpp b/Source/JavaScriptCore/debugger/DebuggerActivation.cpp index 80be310b5..330476da2 100644 --- a/Source/JavaScriptCore/debugger/DebuggerActivation.cpp +++ b/Source/JavaScriptCore/debugger/DebuggerActivation.cpp @@ -77,10 +77,10 @@ void DebuggerActivation::put(JSCell* cell, ExecState* exec, const Identifier& pr thisObject->m_activation->methodTable()->put(thisObject->m_activation.get(), exec, propertyName, value, slot); } -void DebuggerActivation::putWithAttributes(JSObject* object, ExecState* exec, const Identifier& propertyName, JSValue value, unsigned attributes) +void DebuggerActivation::putDirectVirtual(JSObject* object, ExecState* exec, const Identifier& propertyName, JSValue value, unsigned attributes) { DebuggerActivation* thisObject = jsCast(object); - thisObject->m_activation->methodTable()->putWithAttributes(thisObject->m_activation.get(), exec, propertyName, value, attributes); + thisObject->m_activation->methodTable()->putDirectVirtual(thisObject->m_activation.get(), exec, propertyName, value, attributes); } bool DebuggerActivation::deleteProperty(JSCell* cell, ExecState* exec, const Identifier& propertyName) diff --git a/Source/JavaScriptCore/debugger/DebuggerActivation.h b/Source/JavaScriptCore/debugger/DebuggerActivation.h index c28d0b3a2..8dba70b80 100644 --- a/Source/JavaScriptCore/debugger/DebuggerActivation.h +++ b/Source/JavaScriptCore/debugger/DebuggerActivation.h @@ -45,14 +45,14 @@ namespace JSC { 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 putWithAttributes(JSObject*, ExecState*, const Identifier& propertyName, JSValue, unsigned attributes); + static void putDirectVirtual(JSObject*, ExecState*, const Identifier& propertyName, JSValue, unsigned attributes); static bool deleteProperty(JSCell*, ExecState*, const Identifier& propertyName); static void getOwnPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode); static bool getOwnPropertyDescriptor(JSObject*, ExecState*, const Identifier&, PropertyDescriptor&); static void defineGetter(JSObject*, ExecState*, const Identifier& propertyName, JSObject* getterFunction, unsigned attributes); static void defineSetter(JSObject*, ExecState*, const Identifier& propertyName, JSObject* setterFunction, unsigned attributes); - static const ClassInfo s_info; + JS_EXPORTDATA static const ClassInfo s_info; static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype) { @@ -62,10 +62,10 @@ namespace JSC { protected: static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | JSObject::StructureFlags; - void finishCreation(JSGlobalData&, JSObject* activation); + JS_EXPORT_PRIVATE void finishCreation(JSGlobalData&, JSObject* activation); private: - DebuggerActivation(JSGlobalData&); + JS_EXPORT_PRIVATE DebuggerActivation(JSGlobalData&); WriteBarrier m_activation; }; diff --git a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp index 08fba4a6b..6a8cdb2dc 100644 --- a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp +++ b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp @@ -56,10 +56,11 @@ UString DebuggerCallFrame::calculatedFunctionName() const return UString(); JSObject* function = m_callFrame->callee(); - if (!function || !function->inherits(&JSFunction::s_info)) + + if (!function) return UString(); - return asFunction(function)->calculatedDisplayName(m_callFrame); + return getCalculatedDisplayName(m_callFrame, function); } DebuggerCallFrame::Type DebuggerCallFrame::type() const diff --git a/Source/JavaScriptCore/debugger/DebuggerCallFrame.h b/Source/JavaScriptCore/debugger/DebuggerCallFrame.h index d8fb9dae5..8605af54d 100644 --- a/Source/JavaScriptCore/debugger/DebuggerCallFrame.h +++ b/Source/JavaScriptCore/debugger/DebuggerCallFrame.h @@ -50,7 +50,7 @@ namespace JSC { JSGlobalObject* dynamicGlobalObject() const { return m_callFrame->dynamicGlobalObject(); } ScopeChainNode* scopeChain() const { return m_callFrame->scopeChain(); } - const UString* functionName() const; + JS_EXPORT_PRIVATE const UString* functionName() const; JS_EXPORT_PRIVATE UString calculatedFunctionName() const; JS_EXPORT_PRIVATE Type type() const; JS_EXPORT_PRIVATE JSObject* thisObject() const; -- cgit v1.2.1