diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /JavaScriptCore/debugger/DebuggerActivation.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'JavaScriptCore/debugger/DebuggerActivation.cpp')
| -rw-r--r-- | JavaScriptCore/debugger/DebuggerActivation.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/JavaScriptCore/debugger/DebuggerActivation.cpp b/JavaScriptCore/debugger/DebuggerActivation.cpp index 4b2568f..34d0447 100644 --- a/JavaScriptCore/debugger/DebuggerActivation.cpp +++ b/JavaScriptCore/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 @@ -38,11 +38,12 @@ DebuggerActivation::DebuggerActivation(JSObject* activation) m_activation = static_cast<JSActivation*>(activation); } -void DebuggerActivation::mark() +void DebuggerActivation::markChildren(MarkStack& markStack) { - JSObject::mark(); - if (m_activation && !m_activation->marked()) - m_activation->mark(); + JSObject::markChildren(markStack); + + if (m_activation) + markStack.append(m_activation); } UString DebuggerActivation::className() const |