diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/JavaScriptCore/debugger | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/JavaScriptCore/debugger')
5 files changed, 9 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/debugger/Debugger.cpp b/Source/JavaScriptCore/debugger/Debugger.cpp index 20a8485..b999446 100644 --- a/Source/JavaScriptCore/debugger/Debugger.cpp +++ b/Source/JavaScriptCore/debugger/Debugger.cpp @@ -62,7 +62,7 @@ inline Recompiler::~Recompiler() inline void Recompiler::operator()(JSCell* cell) { - if (!cell->inherits(&JSFunction::info)) + if (!cell->inherits(&JSFunction::s_info)) return; JSFunction* function = asFunction(cell); @@ -76,9 +76,9 @@ inline void Recompiler::operator()(JSCell* cell) if (!m_functionExecutables.add(executable).second) return; - ExecState* exec = function->scope().globalObject()->JSGlobalObject::globalExec(); + ExecState* exec = function->scope()->globalObject->JSGlobalObject::globalExec(); executable->discardCode(); - if (m_debugger == function->scope().globalObject()->debugger()) + if (m_debugger == function->scope()->globalObject->debugger()) m_sourceProviders.add(executable->source().provider(), exec); } diff --git a/Source/JavaScriptCore/debugger/DebuggerActivation.cpp b/Source/JavaScriptCore/debugger/DebuggerActivation.cpp index fcd257c..62a2e54 100644 --- a/Source/JavaScriptCore/debugger/DebuggerActivation.cpp +++ b/Source/JavaScriptCore/debugger/DebuggerActivation.cpp @@ -31,7 +31,7 @@ namespace JSC { DebuggerActivation::DebuggerActivation(JSGlobalData& globalData, JSObject* activation) - : JSObject(DebuggerActivation::createStructure(jsNull())) + : JSNonFinalObject(DebuggerActivation::createStructure(jsNull())) { ASSERT(activation); ASSERT(activation->isActivationObject()); diff --git a/Source/JavaScriptCore/debugger/DebuggerActivation.h b/Source/JavaScriptCore/debugger/DebuggerActivation.h index b64060d..01a4907 100644 --- a/Source/JavaScriptCore/debugger/DebuggerActivation.h +++ b/Source/JavaScriptCore/debugger/DebuggerActivation.h @@ -32,7 +32,7 @@ namespace JSC { class JSActivation; - class DebuggerActivation : public JSObject { + class DebuggerActivation : public JSNonFinalObject { public: DebuggerActivation(JSGlobalData&, JSObject*); @@ -51,7 +51,7 @@ namespace JSC { static PassRefPtr<Structure> createStructure(JSValue prototype) { - return Structure::create(prototype, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount); + return Structure::create(prototype, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount, &s_info); } protected: diff --git a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp index cb4592c..d778bd5 100644 --- a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp +++ b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp @@ -45,7 +45,7 @@ const UString* DebuggerCallFrame::functionName() const return 0; JSObject* function = m_callFrame->callee(); - if (!function || !function->inherits(&JSFunction::info)) + if (!function || !function->inherits(&JSFunction::s_info)) return 0; return &asFunction(function)->name(m_callFrame); } @@ -56,7 +56,7 @@ UString DebuggerCallFrame::calculatedFunctionName() const return UString(); JSObject* function = m_callFrame->callee(); - if (!function || !function->inherits(&JSFunction::info)) + if (!function || !function->inherits(&JSFunction::s_info)) return UString(); return asFunction(function)->calculatedDisplayName(m_callFrame); diff --git a/Source/JavaScriptCore/debugger/DebuggerCallFrame.h b/Source/JavaScriptCore/debugger/DebuggerCallFrame.h index 9d377ef..f6b415c 100644 --- a/Source/JavaScriptCore/debugger/DebuggerCallFrame.h +++ b/Source/JavaScriptCore/debugger/DebuggerCallFrame.h @@ -49,7 +49,7 @@ namespace JSC { } JSGlobalObject* dynamicGlobalObject() const { return m_callFrame->dynamicGlobalObject(); } - const ScopeChainNode* scopeChain() const { return m_callFrame->scopeChain(); } + ScopeChainNode* scopeChain() const { return m_callFrame->scopeChain(); } const UString* functionName() const; UString calculatedFunctionName() const; Type type() const; |