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/runtime/Structure.h | |
| 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/runtime/Structure.h')
| -rw-r--r-- | JavaScriptCore/runtime/Structure.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/JavaScriptCore/runtime/Structure.h b/JavaScriptCore/runtime/Structure.h index 866999d..f3a0c7c 100644 --- a/JavaScriptCore/runtime/Structure.h +++ b/JavaScriptCore/runtime/Structure.h @@ -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 @@ -29,6 +29,7 @@ #include "Identifier.h" #include "JSType.h" #include "JSValue.h" +#include "MarkStack.h" #include "PropertyMapHashTable.h" #include "StructureChain.h" #include "StructureTransitionTable.h" @@ -72,10 +73,9 @@ namespace JSC { ~Structure(); - void mark() + void markAggregate(MarkStack& markStack) { - if (!m_prototype.marked()) - m_prototype.mark(); + markStack.append(m_prototype); } // These should be used with caution. |