Changeset 36755 in webkit for trunk/JavaScriptCore/kjs/StructureID.cpp

Timestamp:

Sep 21, 2008, 8:15:52 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-09-21 Maciej Stachowiak <​[email protected]>

Reviewed by Darin.

• introduce a TypeInfo class, for holding per-type (in the C++ class sense) date in StructureID ​https://bugs.webkit.org/show_bug.cgi?id=20981

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• VM/CTI.cpp: (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompilePutByIdTransition):
• VM/Machine.cpp: (JSC::jsIsObjectType): (JSC::Machine::Machine):
• kjs/AllInOneFile.cpp:
• kjs/JSCell.h: (JSC::JSCell::isObject): (JSC::JSCell::isString):
• kjs/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
• kjs/JSGlobalObject.cpp: (JSC::JSGlobalObject::reset):
• kjs/JSGlobalObject.h: (JSC::StructureID::prototypeForLookup):
• kjs/JSNumberCell.h: (JSC::JSNumberCell::createStructureID):
• kjs/JSObject.cpp: (JSC::JSObject::createInheritorID):
• kjs/JSObject.h: (JSC::JSObject::createStructureID):
• kjs/JSString.h: (JSC::JSString::createStructureID):
• kjs/NativeErrorConstructor.cpp: (JSC::NativeErrorConstructor::NativeErrorConstructor):
• kjs/RegExpConstructor.cpp:
• kjs/RegExpMatchesArray.h: Added. (JSC::RegExpMatchesArray::getOwnPropertySlot): (JSC::RegExpMatchesArray::put): (JSC::RegExpMatchesArray::deleteProperty): (JSC::RegExpMatchesArray::getPropertyNames):
• kjs/StructureID.cpp: (JSC::StructureID::StructureID): (JSC::StructureID::addPropertyTransition): (JSC::StructureID::toDictionaryTransition): (JSC::StructureID::changePrototypeTransition): (JSC::StructureID::getterSetterTransition):
• kjs/StructureID.h: (JSC::StructureID::create): (JSC::StructureID::typeInfo):
• kjs/TypeInfo.h: Added. (JSC::TypeInfo::TypeInfo): (JSC::TypeInfo::type):

WebCore:

2008-09-21 Maciej Stachowiak <​[email protected]>

Reviewed by Darin.

• introduce a TypeInfo class, for holding per-type (in the C++ class sense) date in StructureID ​https://bugs.webkit.org/show_bug.cgi?id=20981

• bindings/js/JSAudioConstructor.cpp: (WebCore::JSAudioConstructor::JSAudioConstructor):
• bindings/js/JSCSSStyleDeclarationCustom.cpp: (WebCore::JSCSSStyleDeclaration::nameGetter):
• bindings/js/JSDOMBinding.cpp: (WebCore::createDOMStructure):
• bindings/js/JSDOMBinding.h: (WebCore::getDOMStructure):
• bindings/js/JSDOMWindowShell.cpp: (WebCore::JSDOMWindowShell::JSDOMWindowShell): (WebCore::JSDOMWindowShell::setWindow):
• bindings/js/JSEventTargetNode.cpp: (WebCore::JSEventTargetNode::createPrototype):
• bindings/js/JSHTMLOptionElementConstructor.cpp: (WebCore::JSHTMLOptionElementConstructor::JSHTMLOptionElementConstructor):
• bindings/js/JSImageConstructor.cpp: (WebCore::JSImageConstructor::JSImageConstructor):
• bindings/js/JSXMLHttpRequestConstructor.cpp: (WebCore::JSXMLHttpRequestConstructor::JSXMLHttpRequestConstructor):
• bindings/js/JSXSLTProcessorConstructor.cpp: (WebCore::JSXSLTProcessorConstructor::JSXSLTProcessorConstructor):
• bindings/scripts/CodeGeneratorJS.pm:

File:

• trunk/JavaScriptCore/kjs/StructureID.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/StructureID.cpp

@@ -37 +37 @@
 namespace JSC {
 
-StructureID::StructureID(JSValue* prototype, JSType type)
-    : m_isDictionary(false)
-    , m_type(type)
+StructureID::StructureID(JSValue* prototype, const TypeInfo& typeInfo)
+    : m_typeInfo(typeInfo)
+    , m_isDictionary(false)
     , m_prototype(prototype)
     , m_cachedPrototypeChain(0)
@@ -142 +142 @@
     }
 
-    RefPtr<StructureID> transition = create(structureID->m_prototype);
+    RefPtr<StructureID> transition = create(structureID->m_prototype, structureID->typeInfo());
     transition->m_cachedPrototypeChain = structureID->m_cachedPrototypeChain;
     transition->m_previous = structureID;
@@ -160 +160 @@
     ASSERT(!structureID->m_isDictionary);
 
-    RefPtr<StructureID> transition = create(structureID->m_prototype);
+    RefPtr<StructureID> transition = create(structureID->m_prototype, structureID->typeInfo());
     transition->m_isDictionary = true;
     transition->m_propertyMap = structureID->m_propertyMap;
@@ -179 +179 @@
 PassRefPtr<StructureID> StructureID::changePrototypeTransition(StructureID* structureID, JSValue* prototype)
 {
-    RefPtr<StructureID> transition = create(prototype);
+    RefPtr<StructureID> transition = create(prototype, structureID->typeInfo());
     transition->m_transitionCount = structureID->m_transitionCount + 1;
     transition->m_propertyMap = structureID->m_propertyMap;
@@ -187 +187 @@
 PassRefPtr<StructureID> StructureID::getterSetterTransition(StructureID* structureID)
 {
-    RefPtr<StructureID> transition = create(structureID->storedPrototype());
+    RefPtr<StructureID> transition = create(structureID->storedPrototype(), structureID->typeInfo());
     transition->m_transitionCount = structureID->m_transitionCount + 1;
     transition->m_propertyMap = structureID->m_propertyMap;