diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/JavaScriptCore/runtime/Structure.cpp | |
parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/JavaScriptCore/runtime/Structure.cpp')
-rw-r--r-- | Source/JavaScriptCore/runtime/Structure.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/runtime/Structure.cpp b/Source/JavaScriptCore/runtime/Structure.cpp index dc4239799..569126147 100644 --- a/Source/JavaScriptCore/runtime/Structure.cpp +++ b/Source/JavaScriptCore/runtime/Structure.cpp @@ -155,6 +155,7 @@ Structure::Structure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSV , m_globalObject(globalData, this, globalObject, WriteBarrier<JSGlobalObject>::MayBeNull) , m_prototype(globalData, this, prototype) , m_classInfo(classInfo) + , m_transitionWatchpointSet(InitializedWatching) , m_propertyStorageCapacity(typeInfo.isFinalObject() ? JSFinalObject_inlineStorageCapacity : JSNonFinalObject_inlineStorageCapacity) , m_offset(noOffset) , m_dictionaryKind(NoneDictionaryKind) @@ -177,6 +178,7 @@ Structure::Structure(JSGlobalData& globalData) , m_typeInfo(CompoundType, OverridesVisitChildren) , m_prototype(globalData, this, jsNull()) , m_classInfo(&s_info) + , m_transitionWatchpointSet(InitializedWatching) , m_propertyStorageCapacity(0) , m_offset(noOffset) , m_dictionaryKind(NoneDictionaryKind) @@ -197,6 +199,7 @@ Structure::Structure(JSGlobalData& globalData, const Structure* previous) , m_typeInfo(previous->typeInfo()) , m_prototype(globalData, this, previous->storedPrototype()) , m_classInfo(previous->m_classInfo) + , m_transitionWatchpointSet(InitializedWatching) , m_propertyStorageCapacity(previous->m_propertyStorageCapacity) , m_offset(noOffset) , m_dictionaryKind(previous->m_dictionaryKind) @@ -210,6 +213,7 @@ Structure::Structure(JSGlobalData& globalData, const Structure* previous) , m_didTransition(true) , m_staticFunctionReified(previous->m_staticFunctionReified) { + previous->notifyTransitionFromThisStructure(); if (previous->m_globalObject) m_globalObject.set(globalData, this, previous->m_globalObject.get()); } |