Changeset 192935 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
- Timestamp:
- Dec 1, 2015, 5:37:19 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
r192914 r192935 51 51 #include "FunctionConstructor.h" 52 52 #include "FunctionPrototype.h" 53 #include "GeneratorFunctionConstructor.h"54 #include "GeneratorFunctionPrototype.h"55 #include "GeneratorPrototype.h"56 53 #include "GetterSetter.h" 57 54 #include "HeapIterationScope.h" … … 76 73 #include "JSDollarVMPrototype.h" 77 74 #include "JSFunction.h" 78 #include "JSGeneratorFunction.h"79 75 #include "JSGenericTypedArrayViewConstructorInlines.h" 80 76 #include "JSGenericTypedArrayViewInlines.h" … … 389 385 FOR_EACH_BUILTIN_DERIVED_ITERATOR_TYPE(CREATE_PROTOTYPE_FOR_DERIVED_ITERATOR_TYPE) 390 386 m_propertyNameIteratorStructure.set(vm, this, JSPropertyNameIterator::createStructure(vm, this, m_iteratorPrototype.get())); 391 m_generatorPrototype.set(vm, this, GeneratorPrototype::create(vm, this, GeneratorPrototype::createStructure(vm, this, m_iteratorPrototype.get())));392 387 393 388 #undef CREATE_PROTOTYPE_FOR_DERIVED_ITERATOR_TYPE … … 426 421 m_typeErrorConstructor.set(vm, this, NativeErrorConstructor::create(vm, this, nativeErrorStructure, nativeErrorPrototypeStructure, ASCIILiteral("TypeError"))); 427 422 m_URIErrorConstructor.set(vm, this, NativeErrorConstructor::create(vm, this, nativeErrorStructure, nativeErrorPrototypeStructure, ASCIILiteral("URIError"))); 428 429 m_generatorFunctionPrototype.set(vm, this, GeneratorFunctionPrototype::create(vm, GeneratorFunctionPrototype::createStructure(vm, this, m_functionPrototype.get())));430 GeneratorFunctionConstructor* generatorFunctionConstructor = GeneratorFunctionConstructor::create(vm, GeneratorFunctionConstructor::createStructure(vm, this, functionConstructor), m_generatorFunctionPrototype.get());431 m_generatorFunctionPrototype->putDirectWithoutTransition(vm, vm.propertyNames->constructor, generatorFunctionConstructor, DontEnum);432 m_generatorFunctionStructure.set(vm, this, JSGeneratorFunction::createStructure(vm, this, m_generatorFunctionPrototype.get()));433 434 m_generatorPrototype->putDirectWithoutTransition(vm, vm.propertyNames->constructor, m_generatorFunctionPrototype.get(), DontEnum);435 m_generatorFunctionPrototype->putDirectWithoutTransition(vm, vm.propertyNames->prototype, m_generatorPrototype.get(), DontEnum);436 423 437 424 m_objectPrototype->putDirectWithoutTransition(vm, vm.propertyNames->constructor, objectConstructor, DontEnum); … … 567 554 GlobalPropertyInfo(vm.propertyNames->builtinNames().InspectorInstrumentationPrivateName(), InspectorInstrumentationObject::create(vm, this, InspectorInstrumentationObject::createStructure(vm, this, m_objectPrototype.get())), DontEnum | DontDelete | ReadOnly), 568 555 GlobalPropertyInfo(vm.propertyNames->MapPrivateName, mapConstructor, DontEnum | DontDelete | ReadOnly), 569 GlobalPropertyInfo(vm.propertyNames->builtinNames().generatorResumePrivateName(), JSFunction::createBuiltinFunction(vm, generatorPrototypeGeneratorResumeCodeGenerator(vm), this), DontEnum | DontDelete | ReadOnly),570 556 }; 571 557 addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals)); … … 835 821 visitor.append(&thisObject->m_errorPrototype); 836 822 visitor.append(&thisObject->m_iteratorPrototype); 837 visitor.append(&thisObject->m_generatorFunctionPrototype);838 visitor.append(&thisObject->m_generatorPrototype);839 823 840 824 visitor.append(&thisObject->m_debuggerScopeStructure); … … 869 853 visitor.append(&thisObject->m_symbolObjectStructure); 870 854 visitor.append(&thisObject->m_regExpStructure); 871 visitor.append(&thisObject->m_generatorFunctionStructure);872 855 visitor.append(&thisObject->m_regExpMatchesArrayStructure); 873 856 visitor.append(&thisObject->m_moduleRecordStructure);
Note:
See TracChangeset
for help on using the changeset viewer.