Changeset 201703 in webkit


Ignore:
Timestamp:
Jun 5, 2016 6:56:11 PM (8 years ago)
Author:
Yusuke Suzuki
Message:

Change ProxyObject.Get? not to use custom accessor
​https://bugs.webkit.org/show_bug.cgi?id=157080

Reviewed by Darin Adler.

Source/JavaScriptCore:

This patch focuses on introducing the second part of the followings.
But to do so, first and third parts are necessary.

  1. Insert missing exception checks for getPropertySlot.

While getPropertySlot can perform user-observable behavior if the slot is not VMInquiry,
several places miss exeption checks. For example, ProxyObject's hasProperty already can
throw any errors. Looking through the code, we found several missing error checks after
hasProperty, but this will be fixed in the separated patch[1].

  1. Do not use custom accessor to implement ProxyObject's Get?.

The caller already allows getOwnPropertySlot to throw an exception if the type
is not VMInquiry. So instead of using custom accessor, we simply implement it
directly in the ProxyObject's method.

  1. Strip slotBase from custom accessor.

The custom accessor should not be bound to the specific slot base[2], since it
is just an accessor. There is an alternative design: makeing this custom accessor
to custom value accessor and accept both the slot base and the receiver instead
of allowing throwing an error from getOwnPropertySlot. But we take the first design
that allows getPropertySlot to throw an error, since hasProperty (that does not call
getValue of the custom getters) can already throw any errors.

To query the property with the non-user-observable way, we already provided the way for that:
use VMInquiry and isTaintedByProxy() instead.

Tests just ensure that the current semantics works correctly after this patch.
And this patch is performance neutral.

Later, we will attempt to rename "thisValue" to "receiver"[3].

[1]: ​https://bugs.webkit.org/show_bug.cgi?id=158398
[2]: ​https://bugs.webkit.org/show_bug.cgi?id=157978
[3]: ​https://bugs.webkit.org/show_bug.cgi?id=158397

  • API/JSCallbackObject.h:
  • API/JSCallbackObjectFunctions.h:

(JSC::JSCallbackObject<Parent>::staticFunctionGetter):
(JSC::JSCallbackObject<Parent>::callbackGetter):

  • bytecode/PolymorphicAccess.cpp:

(JSC::AccessCase::generateImpl):

  • dfg/DFGOperations.cpp:
  • interpreter/Interpreter.cpp:

(JSC::Interpreter::execute):

  • jit/JITOperations.cpp:
  • jsc.cpp:

(WTF::ImpureGetter::getOwnPropertySlot):
(WTF::CustomGetter::customGetter):
(WTF::RuntimeArray::lengthGetter):
(GlobalObject::finishCreation):
(GlobalObject::moduleLoaderFetch):
(functionGetGetterSetter):
(functionRun):
(functionLoad):
(functionLoadString):
(functionReadFile):
(functionCheckSyntax):
(functionLoadWebAssembly):
(functionLoadModule):
(functionCreateBuiltin):
(functionCheckModuleSyntax):
(dumpException):
(runWithScripts):
(runInteractive):

  • llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

  • runtime/CommonSlowPaths.cpp:

(JSC::SLOW_PATH_DECL):

  • runtime/JSBoundSlotBaseFunction.cpp:

(JSC::boundSlotBaseFunctionCall):

  • runtime/JSCJSValue.h:
  • runtime/JSCJSValueInlines.h:

(JSC::JSValue::getPropertySlot):

  • runtime/JSCellInlines.h:

(JSC::ExecState::vm):
This change is super important for performance. We add several exec->hadException() calls into the super hot path, like JSC::operationGetByIdOptimize.
Without this change, we call ExecState::vm() and it is not inlined. This causes 1 - 2% performance regression in Octane PDFJS.

  • runtime/JSFunction.cpp:

(JSC::JSFunction::argumentsGetter):
(JSC::JSFunction::callerGetter):

  • runtime/JSFunction.h:
  • runtime/JSGenericTypedArrayViewConstructorInlines.h:

(JSC::constructGenericTypedArrayViewWithArguments):

  • runtime/JSModuleNamespaceObject.cpp:

(JSC::callbackGetter):

  • runtime/JSONObject.cpp:

(JSC::Stringifier::Holder::appendNextProperty):
Here's UNLIKELY is important for Kraken's json-stringify-tinderbox. Without it, we can observe 0.5% regression.

(JSC::Walker::walk):

  • runtime/JSObject.h:

(JSC::JSObject::getPropertySlot):

  • runtime/ObjectPrototype.cpp:

(JSC::objectProtoFuncToString):

  • runtime/PropertySlot.cpp:

(JSC::PropertySlot::customGetter):

  • runtime/PropertySlot.h:

(JSC::PropertySlot::thisValue):

  • runtime/ProxyObject.cpp:

(JSC::performProxyGet):
(JSC::ProxyObject::performGet):
(JSC::ProxyObject::getOwnPropertySlotCommon):

  • runtime/ProxyObject.h:
  • runtime/RegExpConstructor.cpp:

(JSC::regExpConstructorDollar):
(JSC::regExpConstructorInput):
(JSC::regExpConstructorMultiline):
(JSC::regExpConstructorLastMatch):
(JSC::regExpConstructorLastParen):
(JSC::regExpConstructorLeftContext):
(JSC::regExpConstructorRightContext):

  • tests/stress/get-from-scope-dynamic-onto-proxy.js: Added.

(shouldBe):
(shouldThrow.handler.has):
(handler.has):
(try.handler.has):

  • tests/stress/operation-in-throw-error.js: Added.

(testCase.handler.has):
(testCase):

  • tests/stress/proxy-and-json-stringify.js: Added.

(shouldThrow):

  • tests/stress/proxy-and-typed-array.js: Added.
  • tests/stress/proxy-json-path.js: Added.
  • tests/stress/proxy-with-statement.js: Added.

Source/WebCore:

  • bindings/js/JSCryptoAlgorithmDictionary.cpp:

(WebCore::getProperty):

  • bindings/js/JSDOMBinding.h:

(WebCore::nonCachingStaticFunctionGetter):

  • bindings/js/JSDOMWindowCustom.cpp:

(WebCore::jsDOMWindowWebKit):

  • bindings/js/JSDictionary.cpp:

(WebCore::JSDictionary::tryGetProperty):

  • bindings/js/JSPluginElementFunctions.cpp:

(WebCore::pluginElementPropertyGetter):

  • bindings/js/JSPluginElementFunctions.h:
  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):
(GenerateImplementation):

  • bindings/scripts/test/JS/JSInterfaceName.cpp:

(WebCore::jsInterfaceNameConstructor):

  • bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:

(WebCore::jsTestActiveDOMObjectExcitingAttr):
(WebCore::jsTestActiveDOMObjectConstructor):

  • bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp:

(WebCore::jsTestClassWithJSBuiltinConstructorConstructor):

  • bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp:

(WebCore::jsTestCustomConstructorWithNoInterfaceObjectConstructor):

  • bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:

(WebCore::jsTestCustomNamedGetterConstructor):

  • bindings/scripts/test/JS/JSTestEventConstructor.cpp:

(WebCore::jsTestEventConstructorAttr1):
(WebCore::jsTestEventConstructorAttr2):
(WebCore::jsTestEventConstructorAttr3):
(WebCore::jsTestEventConstructorConstructor):

  • bindings/scripts/test/JS/JSTestEventTarget.cpp:

(WebCore::jsTestEventTargetConstructor):

  • bindings/scripts/test/JS/JSTestException.cpp:

(WebCore::jsTestExceptionName):
(WebCore::jsTestExceptionConstructor):

  • bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp:

(WebCore::jsTestGenerateIsReachableConstructor):

  • bindings/scripts/test/JS/JSTestGlobalObject.cpp:

(WebCore::jsTestGlobalObjectRegularAttribute):
(WebCore::jsTestGlobalObjectEnabledAtRuntimeAttribute):
(WebCore::jsTestGlobalObjectConstructor):

  • bindings/scripts/test/JS/JSTestInterface.cpp:

(WebCore::jsTestInterfaceConstructorImplementsStaticReadOnlyAttr):
(WebCore::jsTestInterfaceConstructorImplementsStaticAttr):
(WebCore::jsTestInterfaceImplementsStr1):
(WebCore::jsTestInterfaceImplementsStr2):
(WebCore::jsTestInterfaceImplementsStr3):
(WebCore::jsTestInterfaceImplementsNode):
(WebCore::jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr):
(WebCore::jsTestInterfaceConstructorSupplementalStaticAttr):
(WebCore::jsTestInterfaceSupplementalStr1):
(WebCore::jsTestInterfaceSupplementalStr2):
(WebCore::jsTestInterfaceSupplementalStr3):
(WebCore::jsTestInterfaceSupplementalNode):
(WebCore::jsTestInterfaceConstructor):

  • bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp:

(WebCore::jsTestJSBuiltinConstructorTestAttributeCustom):
(WebCore::jsTestJSBuiltinConstructorTestAttributeRWCustom):
(WebCore::jsTestJSBuiltinConstructorConstructor):

  • bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:

(WebCore::jsTestMediaQueryListListenerConstructor):

  • bindings/scripts/test/JS/JSTestNamedConstructor.cpp:

(WebCore::jsTestNamedConstructorConstructor):

  • bindings/scripts/test/JS/JSTestNode.cpp:

(WebCore::jsTestNodeName):
(WebCore::jsTestNodeConstructor):

  • bindings/scripts/test/JS/JSTestNondeterministic.cpp:

(WebCore::jsTestNondeterministicNondeterministicReadonlyAttr):
(WebCore::jsTestNondeterministicNondeterministicWriteableAttr):
(WebCore::jsTestNondeterministicNondeterministicExceptionAttr):
(WebCore::jsTestNondeterministicNondeterministicGetterExceptionAttr):
(WebCore::jsTestNondeterministicNondeterministicSetterExceptionAttr):
(WebCore::jsTestNondeterministicConstructor):

  • bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::jsTestObjReadOnlyLongAttr):
(WebCore::jsTestObjReadOnlyStringAttr):
(WebCore::jsTestObjReadOnlyTestObjAttr):
(WebCore::jsTestObjConstructorStaticReadOnlyLongAttr):
(WebCore::jsTestObjConstructorStaticStringAttr):
(WebCore::jsTestObjConstructorTestSubObj):
(WebCore::jsTestObjTestSubObjEnabledBySettingConstructor):
(WebCore::jsTestObjEnumAttr):
(WebCore::jsTestObjByteAttr):
(WebCore::jsTestObjOctetAttr):
(WebCore::jsTestObjShortAttr):
(WebCore::jsTestObjClampedShortAttr):
(WebCore::jsTestObjEnforceRangeShortAttr):
(WebCore::jsTestObjUnsignedShortAttr):
(WebCore::jsTestObjLongAttr):
(WebCore::jsTestObjLongLongAttr):
(WebCore::jsTestObjUnsignedLongLongAttr):
(WebCore::jsTestObjStringAttr):
(WebCore::jsTestObjTestObjAttr):
(WebCore::jsTestObjTestNullableObjAttr):
(WebCore::jsTestObjLenientTestObjAttr):
(WebCore::jsTestObjUnforgeableAttr):
(WebCore::jsTestObjStringAttrTreatingNullAsEmptyString):
(WebCore::jsTestObjXMLObjAttr):
(WebCore::jsTestObjCreate):
(WebCore::jsTestObjReflectedStringAttr):
(WebCore::jsTestObjReflectedIntegralAttr):
(WebCore::jsTestObjReflectedUnsignedIntegralAttr):
(WebCore::jsTestObjReflectedBooleanAttr):
(WebCore::jsTestObjReflectedURLAttr):
(WebCore::jsTestObjReflectedCustomIntegralAttr):
(WebCore::jsTestObjReflectedCustomBooleanAttr):
(WebCore::jsTestObjReflectedCustomURLAttr):
(WebCore::jsTestObjEnabledAtRuntimeAttribute):
(WebCore::jsTestObjTypedArrayAttr):
(WebCore::jsTestObjAttrWithGetterException):
(WebCore::jsTestObjAttrWithGetterExceptionWithMessage):
(WebCore::jsTestObjAttrWithSetterException):
(WebCore::jsTestObjAttrWithSetterExceptionWithMessage):
(WebCore::jsTestObjStringAttrWithGetterException):
(WebCore::jsTestObjStringAttrWithSetterException):
(WebCore::jsTestObjStrictTypeCheckingAttribute):
(WebCore::jsTestObjCustomAttr):
(WebCore::jsTestObjOnfoo):
(WebCore::jsTestObjOnwebkitfoo):
(WebCore::jsTestObjWithScriptStateAttribute):
(WebCore::jsTestObjWithCallWithAndSetterCallWithAttribute):
(WebCore::jsTestObjWithScriptExecutionContextAttribute):
(WebCore::jsTestObjWithScriptStateAttributeRaises):
(WebCore::jsTestObjWithScriptExecutionContextAttributeRaises):
(WebCore::jsTestObjWithScriptExecutionContextAndScriptStateAttribute):
(WebCore::jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises):
(WebCore::jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute):
(WebCore::jsTestObjWithScriptArgumentsAndCallStackAttribute):
(WebCore::jsTestObjConditionalAttr1):
(WebCore::jsTestObjConditionalAttr2):
(WebCore::jsTestObjConditionalAttr3):
(WebCore::jsTestObjConditionalAttr4Constructor):
(WebCore::jsTestObjConditionalAttr5Constructor):
(WebCore::jsTestObjConditionalAttr6Constructor):
(WebCore::jsTestObjCachedAttribute1):
(WebCore::jsTestObjCachedAttribute2):
(WebCore::jsTestObjAnyAttribute):
(WebCore::jsTestObjContentDocument):
(WebCore::jsTestObjMutablePoint):
(WebCore::jsTestObjImmutablePoint):
(WebCore::jsTestObjStrawberry):
(WebCore::jsTestObjStrictFloat):
(WebCore::jsTestObjDescription):
(WebCore::jsTestObjId):
(WebCore::jsTestObjHash):
(WebCore::jsTestObjReplaceableAttribute):
(WebCore::jsTestObjNullableDoubleAttribute):
(WebCore::jsTestObjNullableLongAttribute):
(WebCore::jsTestObjNullableBooleanAttribute):
(WebCore::jsTestObjNullableStringAttribute):
(WebCore::jsTestObjNullableLongSettableAttribute):
(WebCore::jsTestObjNullableStringSettableAttribute):
(WebCore::jsTestObjNullableStringValue):
(WebCore::jsTestObjAttribute):
(WebCore::jsTestObjAttributeWithReservedEnumType):
(WebCore::jsTestObjPutForwardsAttribute):
(WebCore::jsTestObjPutForwardsNullableAttribute):
(WebCore::jsTestObjConstructor):

  • bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:

(WebCore::jsTestOverloadedConstructorsConstructor):

  • bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:

(WebCore::jsTestOverrideBuiltinsConstructor):

  • bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:

(WebCore::jsTestSerializedScriptValueInterfaceValue):
(WebCore::jsTestSerializedScriptValueInterfaceReadonlyValue):
(WebCore::jsTestSerializedScriptValueInterfaceCachedValue):
(WebCore::jsTestSerializedScriptValueInterfacePorts):
(WebCore::jsTestSerializedScriptValueInterfaceCachedReadonlyValue):
(WebCore::jsTestSerializedScriptValueInterfaceConstructor):

  • bindings/scripts/test/JS/JSTestTypedefs.cpp:

(WebCore::jsTestTypedefsUnsignedLongLongAttr):
(WebCore::jsTestTypedefsImmutableSerializedScriptValue):
(WebCore::jsTestTypedefsConstructorTestSubObj):
(WebCore::jsTestTypedefsAttrWithGetterException):
(WebCore::jsTestTypedefsAttrWithSetterException):
(WebCore::jsTestTypedefsStringAttrWithGetterException):
(WebCore::jsTestTypedefsStringAttrWithSetterException):
(WebCore::jsTestTypedefsConstructor):

  • bindings/scripts/test/JS/JSattribute.cpp:

(WebCore::jsattributeReadonly):
(WebCore::jsattributeConstructor):

  • bindings/scripts/test/JS/JSreadonly.cpp:

(WebCore::jsreadonlyConstructor):

  • bridge/runtime_array.cpp:

(JSC::RuntimeArray::lengthGetter):

  • bridge/runtime_array.h:
  • bridge/runtime_method.cpp:

(JSC::RuntimeMethod::lengthGetter):

  • bridge/runtime_method.h:
  • bridge/runtime_object.cpp:

(JSC::Bindings::RuntimeObject::fallbackObjectGetter):
(JSC::Bindings::RuntimeObject::fieldGetter):
(JSC::Bindings::RuntimeObject::methodGetter):

  • bridge/runtime_object.h:

Source/WebKit2:

  • WebProcess/Plugins/Netscape/JSNPObject.cpp:

(WebKit::JSNPObject::propertyGetter):
(WebKit::JSNPObject::methodGetter):

  • WebProcess/Plugins/Netscape/JSNPObject.h:
Location:
trunk/Source
Files:
6 added
66 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/JSCallbackObject.h

    r201322 r201703  
    212212   
    213213    JSValue getStaticValue(ExecState*, PropertyName);
    214     static EncodedJSValue staticFunctionGetter(ExecState*, EncodedJSValue, PropertyName, JSObject*);
    215     static EncodedJSValue callbackGetter(ExecState*, EncodedJSValue, PropertyName, JSObject*);
     214    static EncodedJSValue staticFunctionGetter(ExecState*, EncodedJSValue, PropertyName);
     215    static EncodedJSValue callbackGetter(ExecState*, EncodedJSValue, PropertyName);
    216216
    217217    std::unique_ptr<JSCallbackObjectData> m_callbackObjectData;

  • trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

    r201322 r201703  
    600600
    601601template <class Parent>
    602 EncodedJSValue JSCallbackObject<Parent>::staticFunctionGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject*)
     602EncodedJSValue JSCallbackObject<Parent>::staticFunctionGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
    603603{
    604604    JSCallbackObject* thisObj = asCallbackObject(thisValue);
    … …  
    628628
    629629template <class Parent>
    630 EncodedJSValue JSCallbackObject<Parent>::callbackGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject*)
     630EncodedJSValue JSCallbackObject<Parent>::callbackGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
    631631{
    632632    JSCallbackObject* thisObj = asCallbackObject(thisValue);

  • trunk/Source/JavaScriptCore/ChangeLog

    r201702 r201703  
     12016-06-05  Yusuke Suzuki  <utatane.tea@gmail.com>
     2
     3        Change ProxyObject.[[Get]] not to use custom accessor
     4        https://bugs.webkit.org/show_bug.cgi?id=157080
     5
     6        Reviewed by Darin Adler.
     7
     8        This patch focuses on introducing the second part of the followings.
     9        But to do so, first and third parts are necessary.
     10
     11        1. Insert missing exception checks for getPropertySlot.
     12
     13            While getPropertySlot can perform user-observable behavior if the slot is not VMInquiry,
     14            several places miss exeption checks. For example, ProxyObject's hasProperty already can
     15            throw any errors. Looking through the code, we found several missing error checks after
     16            hasProperty, but this will be fixed in the separated patch[1].
     17
     18        2. Do not use custom accessor to implement ProxyObject's [[Get]].
     19
     20            The caller already allows getOwnPropertySlot to throw an exception if the type
     21            is not VMInquiry. So instead of using custom accessor, we simply implement it
     22            directly in the ProxyObject's method.
     23
     24        3. Strip slotBase from custom accessor.
     25
     26            The custom accessor should not be bound to the specific slot base[2], since it
     27            is just an accessor. There is an alternative design: makeing this custom accessor
     28            to custom value accessor and accept both the slot base and the receiver instead
     29            of allowing throwing an error from getOwnPropertySlot. But we take the first design
     30            that allows getPropertySlot to throw an error, since hasProperty (that does not call
     31            getValue of the custom getters) can already throw any errors.
     32
     33            To query the property with the non-user-observable way, we already provided the way for that:
     34            use VMInquiry and isTaintedByProxy() instead.
     35
     36        Tests just ensure that the current semantics works correctly after this patch.
     37        And this patch is performance neutral.
     38
     39        Later, we will attempt to rename "thisValue" to "receiver"[3].
     40
     41        [1]: https://bugs.webkit.org/show_bug.cgi?id=158398
     42        [2]: https://bugs.webkit.org/show_bug.cgi?id=157978
     43        [3]: https://bugs.webkit.org/show_bug.cgi?id=158397
     44
     45        * API/JSCallbackObject.h:
     46        * API/JSCallbackObjectFunctions.h:
     47        (JSC::JSCallbackObject<Parent>::staticFunctionGetter):
     48        (JSC::JSCallbackObject<Parent>::callbackGetter):
     49        * bytecode/PolymorphicAccess.cpp:
     50        (JSC::AccessCase::generateImpl):
     51        * dfg/DFGOperations.cpp:
     52        * interpreter/Interpreter.cpp:
     53        (JSC::Interpreter::execute):
     54        * jit/JITOperations.cpp:
     55        * jsc.cpp:
     56        (WTF::ImpureGetter::getOwnPropertySlot):
     57        (WTF::CustomGetter::customGetter):
     58        (WTF::RuntimeArray::lengthGetter):
     59        (GlobalObject::finishCreation):
     60        (GlobalObject::moduleLoaderFetch):
     61        (functionGetGetterSetter):
     62        (functionRun):
     63        (functionLoad):
     64        (functionLoadString):
     65        (functionReadFile):
     66        (functionCheckSyntax):
     67        (functionLoadWebAssembly):
     68        (functionLoadModule):
     69        (functionCreateBuiltin):
     70        (functionCheckModuleSyntax):
     71        (dumpException):
     72        (runWithScripts):
     73        (runInteractive):
     74        * llint/LLIntSlowPaths.cpp:
     75        (JSC::LLInt::LLINT_SLOW_PATH_DECL):
     76        * runtime/CommonSlowPaths.cpp:
     77        (JSC::SLOW_PATH_DECL):
     78        * runtime/JSBoundSlotBaseFunction.cpp:
     79        (JSC::boundSlotBaseFunctionCall):
     80        * runtime/JSCJSValue.h:
     81        * runtime/JSCJSValueInlines.h:
     82        (JSC::JSValue::getPropertySlot):
     83        * runtime/JSCellInlines.h:
     84        (JSC::ExecState::vm):
     85        This change is super important for performance. We add several `exec->hadException()` calls into the super hot path, like JSC::operationGetByIdOptimize.
     86        Without this change, we call ExecState::vm() and it is not inlined. This causes 1 - 2% performance regression in Octane PDFJS.
     87
     88        * runtime/JSFunction.cpp:
     89        (JSC::JSFunction::argumentsGetter):
     90        (JSC::JSFunction::callerGetter):
     91        * runtime/JSFunction.h:
     92        * runtime/JSGenericTypedArrayViewConstructorInlines.h:
     93        (JSC::constructGenericTypedArrayViewWithArguments):
     94        * runtime/JSModuleNamespaceObject.cpp:
     95        (JSC::callbackGetter):
     96        * runtime/JSONObject.cpp:
     97        (JSC::Stringifier::Holder::appendNextProperty):
     98        Here's UNLIKELY is important for Kraken's json-stringify-tinderbox. Without it, we can observe 0.5% regression.
     99
     100        (JSC::Walker::walk):
     101        * runtime/JSObject.h:
     102        (JSC::JSObject::getPropertySlot):
     103        * runtime/ObjectPrototype.cpp:
     104        (JSC::objectProtoFuncToString):
     105        * runtime/PropertySlot.cpp:
     106        (JSC::PropertySlot::customGetter):
     107        * runtime/PropertySlot.h:
     108        (JSC::PropertySlot::thisValue):
     109        * runtime/ProxyObject.cpp:
     110        (JSC::performProxyGet):
     111        (JSC::ProxyObject::performGet):
     112        (JSC::ProxyObject::getOwnPropertySlotCommon):
     113        * runtime/ProxyObject.h:
     114        * runtime/RegExpConstructor.cpp:
     115        (JSC::regExpConstructorDollar):
     116        (JSC::regExpConstructorInput):
     117        (JSC::regExpConstructorMultiline):
     118        (JSC::regExpConstructorLastMatch):
     119        (JSC::regExpConstructorLastParen):
     120        (JSC::regExpConstructorLeftContext):
     121        (JSC::regExpConstructorRightContext):
     122        * tests/stress/get-from-scope-dynamic-onto-proxy.js: Added.
     123        (shouldBe):
     124        (shouldThrow.handler.has):
     125        (handler.has):
     126        (try.handler.has):
     127        * tests/stress/operation-in-throw-error.js: Added.
     128        (testCase.handler.has):
     129        (testCase):
     130        * tests/stress/proxy-and-json-stringify.js: Added.
     131        (shouldThrow):
     132        * tests/stress/proxy-and-typed-array.js: Added.
     133        * tests/stress/proxy-json-path.js: Added.
     134        * tests/stress/proxy-with-statement.js: Added.
     135
    11362016-06-03  Gavin & Ellie Barraclough  <barraclough@apple.com>
    2137

  • trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp

    r201657 r201703  
    10851085            jit.makeSpaceOnStackForCCall();
    10861086
    1087             // getter: EncodedJSValue (*GetValueFunc)(ExecState*, EncodedJSValue thisValue, PropertyName, JSObject* slotBase);
     1087            // getter: EncodedJSValue (*GetValueFunc)(ExecState*, EncodedJSValue thisValue, PropertyName);
    10881088            // setter: void (*PutValueFunc)(ExecState*, EncodedJSValue thisObject, EncodedJSValue value);
    10891089            // Custom values are passed the slotBase (the property holder), custom accessors are passed the thisVaule (reciever).
    … …  
    10951095                jit.setupArgumentsWithExecState(
    10961096                    baseForCustomValue,
    1097                     CCallHelpers::TrustedImmPtr(ident.impl()),
    1098                     baseForAccessGPR);
     1097                    CCallHelpers::TrustedImmPtr(ident.impl()));
    10991098            } else
    11001099                jit.setupArgumentsWithExecState(baseForCustomValue, valueRegs.gpr());
    … …  
    11041103                    EABI_32BIT_DUMMY_ARG baseForCustomValue,
    11051104                    CCallHelpers::TrustedImm32(JSValue::CellTag),
    1106                     CCallHelpers::TrustedImmPtr(ident.impl()),
    1107                     baseForAccessGPR);
     1105                    CCallHelpers::TrustedImmPtr(ident.impl()));
    11081106            } else {
    11091107                jit.setupArgumentsWithExecState(

  • trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

    r201049 r201703  
    16231623    NativeCallFrameTracer tracer(&vm, exec);
    16241624
    1625     const Identifier& ident = Identifier::fromUid(exec, impl);
    1626     GetPutInfo getPutInfo(getPutInfoBits);
    1627 
    1628     PropertySlot slot(scope, PropertySlot::InternalMethodType::Get);
    1629     if (!scope->getPropertySlot(exec, ident, slot)) {
    1630         if (getPutInfo.resolveMode() == ThrowIfNotFound)
    1631             vm.throwException(exec, createUndefinedVariableError(exec, ident));
    1632         return JSValue::encode(jsUndefined());
    1633     }
    1634 
    1635     if (scope->isGlobalLexicalEnvironment()) {
    1636         // When we can't statically prove we need a TDZ check, we must perform the check on the slow path.
    1637         JSValue result = slot.getValue(exec, ident);
    1638         if (result == jsTDZValue()) {
    1639             exec->vm().throwException(exec, createTDZError(exec));
    1640             return JSValue::encode(jsUndefined());
     1625    Identifier ident = Identifier::fromUid(exec, impl);
     1626    return JSValue::encode(scope->getPropertySlot(exec, ident, [&] (bool found, PropertySlot& slot) -> JSValue {
     1627        if (!found) {
     1628            GetPutInfo getPutInfo(getPutInfoBits);
     1629            if (getPutInfo.resolveMode() == ThrowIfNotFound)
     1630                vm.throwException(exec, createUndefinedVariableError(exec, ident));
     1631            return jsUndefined();
    16411632        }
    1642         return JSValue::encode(result);
    1643     }
    1644 
    1645     return JSValue::encode(slot.getValue(exec, ident));
     1633
     1634        if (scope->isGlobalLexicalEnvironment()) {
     1635            // When we can't statically prove we need a TDZ check, we must perform the check on the slow path.
     1636            JSValue result = slot.getValue(exec, ident);
     1637            if (result == jsTDZValue()) {
     1638                exec->vm().throwException(exec, createTDZError(exec));
     1639                return jsUndefined();
     1640            }
     1641            return result;
     1642        }
     1643
     1644        return slot.getValue(exec, ident);
     1645    }));
    16461646}
    16471647

  • trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

    r201573 r201703  
    864864                        PropertySlot slot(globalObject, PropertySlot::InternalMethodType::Get);
    865865                        if (!globalObject->getPropertySlot(callFrame, JSONPPath[i].m_pathEntryName, slot)) {
     866                            if (callFrame->hadException())
     867                                return jsUndefined();
    866868                            if (entry)
    867869                                return callFrame->vm().throwException(callFrame, createUndefinedVariableError(callFrame, JSONPPath[i].m_pathEntryName));

  • trunk/Source/JavaScriptCore/jit/JITOperations.cpp

    r201542 r201703  
    242242    JSValue baseValue = JSValue::decode(base);
    243243    LOG_IC((ICEvent::OperationGetByIdOptimize, baseValue.classInfoOrNull(), ident));
    244     PropertySlot slot(baseValue, PropertySlot::InternalMethodType::Get);
    245    
    246     bool hasResult = baseValue.getPropertySlot(exec, ident, slot);
    247     if (stubInfo->considerCaching(baseValue.structureOrNull()))
    248         repatchGetByID(exec, baseValue, ident, slot, *stubInfo, GetByIDKind::Normal);
    249    
    250     return JSValue::encode(hasResult? slot.getValue(exec, ident) : jsUndefined());
     244
     245    return JSValue::encode(baseValue.getPropertySlot(exec, ident, [&] (bool found, PropertySlot& slot) -> JSValue {
     246        if (stubInfo->considerCaching(baseValue.structureOrNull()))
     247            repatchGetByID(exec, baseValue, ident, slot, *stubInfo, GetByIDKind::Normal);
     248        return found ? slot.getValue(exec, ident) : jsUndefined();
     249    }));
    251250}
    252251
    … …  
    269268    PropertySlot slot(base, PropertySlot::InternalMethodType::HasProperty);
    270269    bool result = asObject(base)->getPropertySlot(exec, ident, slot);
     270    if (vm->exception())
     271        return JSValue::encode(jsUndefined());
    271272   
    272273    RELEASE_ASSERT(accessType == stubInfo->accessType);
    … …  
    20152016    ASSERT(getPutInfo.resolveType() != ModuleVar);
    20162017
    2017     PropertySlot slot(scope, PropertySlot::InternalMethodType::Get);
    2018     if (!scope->getPropertySlot(exec, ident, slot)) {
    2019         if (getPutInfo.resolveMode() == ThrowIfNotFound)
    2020             vm.throwException(exec, createUndefinedVariableError(exec, ident));
    2021         return JSValue::encode(jsUndefined());
    2022     }
    2023 
    2024     JSValue result = JSValue();
    2025     if (scope->isGlobalLexicalEnvironment()) {
    2026         // When we can't statically prove we need a TDZ check, we must perform the check on the slow path.
    2027         result = slot.getValue(exec, ident);
    2028         if (result == jsTDZValue()) {
    2029             exec->vm().throwException(exec, createTDZError(exec));
    2030             return JSValue::encode(jsUndefined());
    2031         }
    2032     }
    2033 
    2034     CommonSlowPaths::tryCacheGetFromScopeGlobal(exec, vm, pc, scope, slot, ident);
    2035 
    2036     if (!result)
    2037         result = slot.getValue(exec, ident);
    2038     return JSValue::encode(result);
     2018    return JSValue::encode(scope->getPropertySlot(exec, ident, [&] (bool found, PropertySlot& slot) -> JSValue {
     2019        if (!found) {
     2020            if (getPutInfo.resolveMode() == ThrowIfNotFound)
     2021                vm.throwException(exec, createUndefinedVariableError(exec, ident));
     2022            return jsUndefined();
     2023        }
     2024
     2025        JSValue result = JSValue();
     2026        if (scope->isGlobalLexicalEnvironment()) {
     2027            // When we can't statically prove we need a TDZ check, we must perform the check on the slow path.
     2028            result = slot.getValue(exec, ident);
     2029            if (result == jsTDZValue()) {
     2030                vm.throwException(exec, createTDZError(exec));
     2031                return jsUndefined();
     2032            }
     2033        }
     2034
     2035        CommonSlowPaths::tryCacheGetFromScopeGlobal(exec, vm, pc, scope, slot, ident);
     2036
     2037        if (!result)
     2038            return slot.getValue(exec, ident);
     2039        return result;
     2040    }));
    20392041}
    20402042

  • trunk/Source/JavaScriptCore/jsc.cpp

    r201542 r201703  
    303303        ImpureGetter* thisObject = jsCast<ImpureGetter*>(object);
    304304       
    305         if (thisObject->m_delegate && thisObject->m_delegate->getPropertySlot(exec, name, slot))
    306             return true;
     305        if (thisObject->m_delegate) {
     306            if (thisObject->m_delegate->getPropertySlot(exec, name, slot))
     307                return true;
     308            if (exec->hadException())
     309                return false;
     310        }
    307311
    308312        return Base::getOwnPropertySlot(object, exec, name, slot);
    … …  
    359363
    360364private:
    361     static EncodedJSValue customGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     365    static EncodedJSValue customGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    362366    {
    363367        CustomGetter* thisObject = jsDynamicCast<CustomGetter*>(JSValue::decode(thisValue));
    … …  
    464468    }
    465469
    466     static EncodedJSValue lengthGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     470    static EncodedJSValue lengthGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    467471    {
    468472        RuntimeArray* thisObject = jsDynamicCast<RuntimeArray*>(JSValue::decode(thisValue));
    … …  
    586590static EncodedJSValue JSC_HOST_CALL functionRun(ExecState*);
    587591static EncodedJSValue JSC_HOST_CALL functionLoad(ExecState*);
     592static EncodedJSValue JSC_HOST_CALL functionLoadString(ExecState*);
    588593static EncodedJSValue JSC_HOST_CALL functionReadFile(ExecState*);
    589594static EncodedJSValue JSC_HOST_CALL functionCheckSyntax(ExecState*);
    … …  
    766771        addFunction(vm, "run", functionRun, 1);
    767772        addFunction(vm, "load", functionLoad, 1);
     773        addFunction(vm, "loadString", functionLoadString, 1);
    768774        addFunction(vm, "readFile", functionReadFile, 1);
    769775        addFunction(vm, "checkSyntax", functionCheckSyntax, 1);
    … …  
    11041110{
    11051111    JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
    1106     String moduleKey = key.toString(exec)->value(exec);
     1112    String moduleKey = key.toWTFString(exec);
    11071113    if (exec->hadException()) {
    11081114        JSValue exception = exec->exception();
    … …  
    13721378        return JSValue::encode(jsUndefined());
    13731379
    1374     Identifier ident = Identifier::fromString(&exec->vm(), property.toString(exec)->value(exec));
     1380    Identifier ident = Identifier::fromString(&exec->vm(), property.toWTFString(exec));
    13751381
    13761382    PropertySlot slot(value, PropertySlot::InternalMethodType::VMInquiry);
    … …  
    13951401EncodedJSValue JSC_HOST_CALL functionRun(ExecState* exec)
    13961402{
    1397     String fileName = exec->argument(0).toString(exec)->value(exec);
     1403    String fileName = exec->argument(0).toWTFString(exec);
    13981404    if (exec->hadException())
    13991405        return JSValue::encode(jsUndefined());
    … …  
    14261432EncodedJSValue JSC_HOST_CALL functionLoad(ExecState* exec)
    14271433{
    1428     String fileName = exec->argument(0).toString(exec)->value(exec);
     1434    String fileName = exec->argument(0).toWTFString(exec);
    14291435    if (exec->hadException())
    14301436        return JSValue::encode(jsUndefined());
    … …  
    14421448}
    14431449
     1450EncodedJSValue JSC_HOST_CALL functionLoadString(ExecState* exec)
     1451{
     1452    String sourceCode = exec->argument(0).toWTFString(exec);
     1453    if (exec->hadException())
     1454        return JSValue::encode(jsUndefined());
     1455    JSGlobalObject* globalObject = exec->lexicalGlobalObject();
     1456
     1457    NakedPtr<Exception> evaluationException;
     1458    JSValue result = evaluate(globalObject->globalExec(), makeSource(sourceCode), JSValue(), evaluationException);
     1459    if (evaluationException)
     1460        exec->vm().throwException(exec, evaluationException);
     1461    return JSValue::encode(result);
     1462}
     1463
    14441464EncodedJSValue JSC_HOST_CALL functionReadFile(ExecState* exec)
    14451465{
    1446     String fileName = exec->argument(0).toString(exec)->value(exec);
     1466    String fileName = exec->argument(0).toWTFString(exec);
    14471467    if (exec->hadException())
    14481468        return JSValue::encode(jsUndefined());
    … …  
    14561476EncodedJSValue JSC_HOST_CALL functionCheckSyntax(ExecState* exec)
    14571477{
    1458     String fileName = exec->argument(0).toString(exec)->value(exec);
     1478    String fileName = exec->argument(0).toWTFString(exec);
    14591479    if (exec->hadException())
    14601480        return JSValue::encode(jsUndefined());
    … …  
    17461766EncodedJSValue JSC_HOST_CALL functionLoadWebAssembly(ExecState* exec)
    17471767{
    1748     String fileName = exec->argument(0).toString(exec)->value(exec);
     1768    String fileName = exec->argument(0).toWTFString(exec);
    17491769    if (exec->hadException())
    17501770        return JSValue::encode(jsUndefined());
    … …  
    17671787EncodedJSValue JSC_HOST_CALL functionLoadModule(ExecState* exec)
    17681788{
    1769     String fileName = exec->argument(0).toString(exec)->value(exec);
     1789    String fileName = exec->argument(0).toWTFString(exec);
    17701790    if (exec->hadException())
    17711791        return JSValue::encode(jsUndefined());
    … …  
    17961816        return JSValue::encode(jsUndefined());
    17971817
    1798     String functionText = exec->argument(0).toString(exec)->value(exec);
     1818    String functionText = exec->argument(0).toWTFString(exec);
    17991819    if (exec->hadException())
    18001820        return JSValue::encode(JSValue());
    … …  
    18151835EncodedJSValue JSC_HOST_CALL functionCheckModuleSyntax(ExecState* exec)
    18161836{
    1817     String source = exec->argument(0).toString(exec)->value(exec);
     1837    String source = exec->argument(0).toWTFString(exec);
    18181838    if (exec->hadException())
    18191839        return JSValue::encode(jsUndefined());
    … …  
    19731993static void dumpException(GlobalObject* globalObject, JSValue exception)
    19741994{
    1975     printf("Exception: %s\n", exception.toString(globalObject->globalExec())->value(globalObject->globalExec()).utf8().data());
     1995    printf("Exception: %s\n", exception.toWTFString(globalObject->globalExec()).utf8().data());
    19761996    Identifier stackID = Identifier::fromString(globalObject->globalExec(), "stack");
    19771997    JSValue stackValue = exception.get(globalObject->globalExec(), stackID);
    19781998    if (!stackValue.isUndefinedOrNull())
    1979         printf("%s\n", stackValue.toString(globalObject->globalExec())->value(globalObject->globalExec()).utf8().data());
     1999        printf("%s\n", stackValue.toWTFString(globalObject->globalExec()).utf8().data());
    19802000}
    19812001
    … …  
    20622082                success = success && !evaluationException;
    20632083                if (dump && !evaluationException)
    2064                     printf("End: %s\n", returnValue.toString(globalObject->globalExec())->value(globalObject->globalExec()).utf8().data());
     2084                    printf("End: %s\n", returnValue.toWTFString(globalObject->globalExec()).utf8().data());
    20652085                dumpException(globalObject, evaluationException);
    20662086            } else
    … …  
    21292149#endif
    21302150        if (evaluationException)
    2131             printf("Exception: %s\n", evaluationException->value().toString(globalObject->globalExec())->value(globalObject->globalExec()).utf8().data());
     2151            printf("Exception: %s\n", evaluationException->value().toWTFString(globalObject->globalExec()).utf8().data());
    21322152        else
    2133             printf("%s\n", returnValue.toString(globalObject->globalExec())->value(globalObject->globalExec()).utf8().data());
     2153            printf("%s\n", returnValue.toWTFString(globalObject->globalExec()).utf8().data());
    21342154
    21352155        globalObject->globalExec()->clearException();

  • trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

    r201617 r201703  
    14931493    ASSERT(getPutInfo.resolveType() != ModuleVar);
    14941494
    1495     PropertySlot slot(scope, PropertySlot::InternalMethodType::Get);
    1496     if (!scope->getPropertySlot(exec, ident, slot)) {
    1497         if (getPutInfo.resolveMode() == ThrowIfNotFound)
    1498             LLINT_RETURN(exec->vm().throwException(exec, createUndefinedVariableError(exec, ident)));
    1499         LLINT_RETURN(jsUndefined());
    1500     }
    1501 
    1502     JSValue result = JSValue();
    1503     if (scope->isGlobalLexicalEnvironment()) {
    1504         // When we can't statically prove we need a TDZ check, we must perform the check on the slow path.
    1505         result = slot.getValue(exec, ident);
    1506         if (result == jsTDZValue())
    1507             LLINT_THROW(createTDZError(exec));
    1508     }
    1509 
    1510     CommonSlowPaths::tryCacheGetFromScopeGlobal(exec, vm, pc, scope, slot, ident);
    1511 
    1512     if (!result)
    1513         result = slot.getValue(exec, ident);
    1514     LLINT_RETURN(result);
     1495    LLINT_RETURN(scope->getPropertySlot(exec, ident, [&] (bool found, PropertySlot& slot) -> JSValue {
     1496        if (!found) {
     1497            if (getPutInfo.resolveMode() == ThrowIfNotFound)
     1498                return exec->vm().throwException(exec, createUndefinedVariableError(exec, ident));
     1499            return jsUndefined();
     1500        }
     1501
     1502        JSValue result = JSValue();
     1503        if (scope->isGlobalLexicalEnvironment()) {
     1504            // When we can't statically prove we need a TDZ check, we must perform the check on the slow path.
     1505            result = slot.getValue(exec, ident);
     1506            if (result == jsTDZValue())
     1507                return exec->vm().throwException(exec, createTDZError(exec));
     1508        }
     1509
     1510        CommonSlowPaths::tryCacheGetFromScopeGlobal(exec, vm, pc, scope, slot, ident);
     1511
     1512        if (!result)
     1513            return slot.getValue(exec, ident);
     1514        return result;
     1515    }));
    15151516}
    15161517

  • trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp

    r200606 r201703  
    772772    JSScope* scope = exec->uncheckedR(pc[2].u.operand).Register::scope();
    773773    JSObject* resolvedScope = JSScope::resolve(exec, scope, ident);
     774    // Proxy can throw an error here, e.g. Proxy in with statement's @unscopables.
     775    CHECK_EXCEPTION();
    774776
    775777    ResolveType resolveType = static_cast<ResolveType>(pc[4].u.operand);

  • trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp

    r201322 r201703  
    5252
    5353    const String& name = boundSlotBaseFunction->name();
    54     return getter(exec, JSValue::encode(exec->thisValue()), PropertyName(Identifier::fromString(exec, name)), baseObject);
     54    return getter(exec, JSValue::encode(exec->thisValue()), PropertyName(Identifier::fromString(exec, name)));
    5555}
    5656

  • trunk/Source/JavaScriptCore/runtime/JSCJSValue.h

    r200034 r201703  
    288288
    289289    bool getPropertySlot(ExecState*, PropertyName, PropertySlot&) const;
     290    template<typename CallbackWhenNoException> typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type getPropertySlot(ExecState*, PropertyName, CallbackWhenNoException) const;
     291    template<typename CallbackWhenNoException> typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type getPropertySlot(ExecState*, PropertyName, PropertySlot&, CallbackWhenNoException) const;
    290292
    291293    bool put(ExecState*, PropertyName, JSValue, PutPropertySlot&);

  • trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h

    r200034 r201703  
    769769}
    770770
     771template<typename CallbackWhenNoException>
     772ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSValue::getPropertySlot(ExecState* exec, PropertyName propertyName, CallbackWhenNoException callback) const
     773{
     774    PropertySlot slot(asValue(), PropertySlot::InternalMethodType::Get);
     775    return getPropertySlot(exec, propertyName, slot, callback);
     776}
     777
     778template<typename CallbackWhenNoException>
     779ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSValue::getPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot, CallbackWhenNoException callback) const
     780{
     781    bool found = getPropertySlot(exec, propertyName, slot);
     782    if (UNLIKELY(exec->hadException()))
     783        return { };
     784    return callback(found, slot);
     785}
     786
    771787ALWAYS_INLINE bool JSValue::getPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot) const
    772788{

  • trunk/Source/JavaScriptCore/runtime/JSCellInlines.h

    r190569 r201703  
    119119}
    120120
    121 inline VM& ExecState::vm() const
     121ALWAYS_INLINE VM& ExecState::vm() const
    122122{
    123123    ASSERT(callee());

  • trunk/Source/JavaScriptCore/runtime/JSFunction.cpp

    r201654 r201703  
    265265}
    266266
    267 EncodedJSValue JSFunction::argumentsGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     267EncodedJSValue JSFunction::argumentsGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    268268{
    269269    JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(thisValue));
    … …  
    320320}
    321321
    322 EncodedJSValue JSFunction::callerGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     322EncodedJSValue JSFunction::callerGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    323323{
    324324    JSFunction* thisObj = jsCast<JSFunction*>(JSValue::decode(thisValue));

  • trunk/Source/JavaScriptCore/runtime/JSFunction.h

    r201322 r201703  
    199199    friend class LLIntOffsetsExtractor;
    200200
    201     static EncodedJSValue argumentsGetter(ExecState*, EncodedJSValue, PropertyName, JSObject*);
    202     static EncodedJSValue callerGetter(ExecState*, EncodedJSValue, PropertyName, JSObject*);
     201    static EncodedJSValue argumentsGetter(ExecState*, EncodedJSValue, PropertyName);
     202    static EncodedJSValue callerGetter(ExecState*, EncodedJSValue, PropertyName);
     203    static EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, PropertyName);
     204    static EncodedJSValue nameGetter(ExecState*, EncodedJSValue, PropertyName);
    203205
    204206    WriteBarrier<ExecutableBase> m_executable;

  • trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h

    r200430 r201703  
    151151            length = jsCast<JSArrayBufferView*>(object)->length();
    152152        else {
    153             PropertySlot lengthSlot(object, PropertySlot::InternalMethodType::Get);
     153            // This getPropertySlot operation should not be observed by the Proxy.
     154            // So we use VMInquiry. And purge the proxy case by isTaintedByProxy() guard.
     155            PropertySlot lengthSlot(object, PropertySlot::InternalMethodType::VMInquiry);
    154156            object->getPropertySlot(exec, vm.propertyNames->length, lengthSlot);
    155157
    … …  
    166168            if (!iteratorFunc.isUndefined()
    167169                && (iteratorFunc != object->globalObject()->arrayProtoValuesFunction()
    168                     || lengthSlot.isAccessor() || lengthSlot.isCustom()
     170                    || lengthSlot.isAccessor() || lengthSlot.isCustom() || lengthSlot.isTaintedByProxy()
    169171                    || hasAnyArrayStorage(object->indexingType()))) {
    170172

  • trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp

    r201322 r201703  
    9898}
    9999
    100 static EncodedJSValue callbackGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject*)
     100static EncodedJSValue callbackGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
    101101{
    102102    JSModuleNamespaceObject* thisObject = jsCast<JSModuleNamespaceObject*>(JSValue::decode(thisValue));

  • trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

    r201674 r201703  
    481481        else {
    482482            PropertySlot slot(m_object.get(), PropertySlot::InternalMethodType::Get);
    483             if (m_object->methodTable()->getOwnPropertySlotByIndex(m_object.get(), exec, index, slot)) {
     483            if (m_object->methodTable()->getOwnPropertySlotByIndex(m_object.get(), exec, index, slot))
    484484                value = slot.getValue(exec, index);
    485                 if (exec->hadException())
    486                     return false;
    487             } else
     485            else
    488486                value = jsUndefined();
     487            if (UNLIKELY(exec->hadException()))
     488                return false;
    489489        }
    490490
    … …  
    632632                    else
    633633                        inValue = jsUndefined();
     634                    if (m_exec->hadException())
     635                        return jsNull();
    634636                }
    635637                   

  • trunk/Source/JavaScriptCore/runtime/JSObject.h

    r201645 r201703  
    152152    bool getPropertySlot(ExecState*, PropertyName, PropertySlot&);
    153153    bool getPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
     154    template<typename CallbackWhenNoException> typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type getPropertySlot(ExecState*, PropertyName, CallbackWhenNoException) const;
     155    template<typename CallbackWhenNoException> typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type getPropertySlot(ExecState*, PropertyName, PropertySlot&, CallbackWhenNoException) const;
    154156
    155157    static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
    … …  
    13621364}
    13631365
     1366template<typename CallbackWhenNoException>
     1367ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSObject::getPropertySlot(ExecState* exec, PropertyName propertyName, CallbackWhenNoException callback) const
     1368{
     1369    PropertySlot slot(this, PropertySlot::InternalMethodType::Get);
     1370    return getPropertySlot(exec, propertyName, slot, callback);
     1371}
     1372
     1373template<typename CallbackWhenNoException>
     1374ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSObject::getPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot, CallbackWhenNoException callback) const
     1375{
     1376    bool found = const_cast<JSObject*>(this)->getPropertySlot(exec, propertyName, slot);
     1377    if (UNLIKELY(exec->hadException()))
     1378        return { };
     1379    return callback(found, slot);
     1380}
     1381
    13641382template<JSObject::PutMode mode>
    13651383ALWAYS_INLINE bool JSObject::putDirectInternal(VM& vm, PropertyName propertyName, JSValue value, unsigned attributes, PutPropertySlot& slot)

  • trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp

    r201495 r201703  
    275275    JSObject* thisObject = thisValue.toObject(exec);
    276276    if (!thisObject)
    277         return JSValue::encode(JSValue());
    278 
    279     JSString* result = thisObject->structure(vm)->objectToStringValue();
    280     if (!result) {
    281         PropertyName toStringTagSymbol = exec->propertyNames().toStringTagSymbol;
    282         PropertySlot toStringTagSlot(thisObject, PropertySlot::InternalMethodType::Get);
    283         if (thisObject->getPropertySlot(exec, toStringTagSymbol, toStringTagSlot)) {
     277        return JSValue::encode(jsUndefined());
     278
     279    auto result = thisObject->structure(vm)->objectToStringValue();
     280    if (result)
     281        return JSValue::encode(result);
     282
     283    PropertyName toStringTagSymbol = exec->propertyNames().toStringTagSymbol;
     284    return JSValue::encode(thisObject->getPropertySlot(exec, toStringTagSymbol, [&] (bool found, PropertySlot& toStringTagSlot) -> JSValue {
     285        if (found) {
    284286            JSValue stringTag = toStringTagSlot.getValue(exec, toStringTagSymbol);
    285287            if (UNLIKELY(vm.exception()))
    286                 return JSValue::encode(JSValue());
     288                return jsUndefined();
    287289            if (stringTag.isString()) {
    288290                JSRopeString::RopeBuilder ropeBuilder(vm);
    … …  
    290292                ropeBuilder.append(jsCast<JSString*>(stringTag));
    291293                ropeBuilder.append(vm.smallStrings.singleCharacterString(']'));
    292                 result = ropeBuilder.release();
     294                JSString* result = ropeBuilder.release();
    293295
    294296                thisObject->structure(vm)->setObjectToStringValue(exec, vm, result, toStringTagSlot);
    295                 return JSValue::encode(result);
     297                return result;
    296298            }
    297299        }
    … …  
    299301        String newString = WTF::tryMakeString("[object ", thisObject->methodTable(exec->vm())->className(thisObject), "]");
    300302        if (!newString)
    301             return JSValue::encode(throwOutOfMemoryError(exec));
    302 
    303         result = jsNontrivialString(&vm, newString);
     303            return throwOutOfMemoryError(exec);
     304
     305        auto result = jsNontrivialString(&vm, newString);
    304306        thisObject->structure(vm)->setObjectToStringValue(exec, vm, result, toStringTagSlot);
    305     }
    306 
    307     return JSValue::encode(result);
     307        return result;
     308    }));
    308309}
    309310

  • trunk/Source/JavaScriptCore/runtime/PropertySlot.cpp

    r201322 r201703  
    3939    // https://bugs.webkit.org/show_bug.cgi?id=158014
    4040    JSValue thisValue = m_attributes & CustomAccessor ? m_thisValue : JSValue(slotBase());
    41     return JSValue::decode(m_data.custom.getValue(exec, JSValue::encode(thisValue), propertyName, slotBase()));
     41    return JSValue::decode(m_data.custom.getValue(exec, JSValue::encode(thisValue), propertyName));
    4242}
    4343

  • trunk/Source/JavaScriptCore/runtime/PropertySlot.h

    r201322 r201703  
    9595    }
    9696
    97     // There are two types of custom properties: custom values and custom accessors.
    98     // For the second argument, custom values are passed the slotBase (the property holder), custom accessors are passed the thisVaule (reciever).
    99     // And when getting the property descriptor from these properties, custom values return the data descriptor while custom accessors return the accessor descriptor.
    10097    // FIXME: Remove this slotBase / receiver behavior difference in custom values and custom accessors.
    10198    // https://bugs.webkit.org/show_bug.cgi?id=158014
    102     typedef EncodedJSValue (*GetValueFunc)(ExecState*, EncodedJSValue thisValue, PropertyName, JSObject* slotBase);
     99    typedef EncodedJSValue (*GetValueFunc)(ExecState*, EncodedJSValue thisValue, PropertyName);
    103100
    104101    JSValue getValue(ExecState*, PropertyName) const;
    … …  
    250247    }
    251248
     249    JSValue thisValue() const
     250    {
     251        return m_thisValue;
     252    }
     253
    252254    void setThisValue(JSValue thisValue)
    253255    {

  • trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp

    r201672 r201703  
    9696static const char* s_proxyAlreadyRevokedErrorMessage = "Proxy has already been revoked. No more operations are allowed to be performed on it";
    9797
    98 static EncodedJSValue performProxyGet(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject* slotBase)
    99 {
    100     VM& vm = exec->vm();
    101     if (UNLIKELY(!vm.isSafeToRecurse())) {
    102         throwStackOverflowError(exec);
    103         return JSValue::encode(JSValue());
    104     }
    105 
    106     ProxyObject* proxyObject = jsCast<ProxyObject*>(slotBase);
     98static JSValue performProxyGet(ExecState* exec, ProxyObject* proxyObject, JSValue receiver, PropertyName propertyName)
     99{
     100    VM& vm = exec->vm();
     101    if (UNLIKELY(!vm.isSafeToRecurse())) {
     102        throwStackOverflowError(exec);
     103        return JSValue();
     104    }
     105
    107106    JSObject* target = proxyObject->target();
    108107
    109108    if (propertyName == vm.propertyNames->underscoreProto)
    110         return JSValue::encode(proxyObject->performGetPrototype(exec));
     109        return proxyObject->performGetPrototype(exec);
    111110
    112111    auto performDefaultGet = [&] {
    113         return JSValue::encode(target->get(exec, propertyName));
     112        return target->get(exec, propertyName);
    114113    };
    115114
    … …  
    119118    JSValue handlerValue = proxyObject->handler();
    120119    if (handlerValue.isNull())
    121         return throwVMTypeError(exec, ASCIILiteral(s_proxyAlreadyRevokedErrorMessage));
     120        return throwTypeError(exec, ASCIILiteral(s_proxyAlreadyRevokedErrorMessage));
    122121
    123122    JSObject* handler = jsCast<JSObject*>(handlerValue);
    … …  
    126125    JSValue getHandler = handler->getMethod(exec, callData, callType, vm.propertyNames->get, ASCIILiteral("'get' property of a Proxy's handler object should be callable"));
    127126    if (exec->hadException())
    128         return JSValue::encode(jsUndefined());
     127        return jsUndefined();
    129128
    130129    if (getHandler.isUndefined())
    … …  
    134133    arguments.append(target);
    135134    arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
    136     arguments.append(JSValue::decode(thisValue));
     135    arguments.append(receiver);
    137136    JSValue trapResult = call(exec, getHandler, callType, callData, handler, arguments);
    138137    if (exec->hadException())
    139         return JSValue::encode(jsUndefined());
     138        return jsUndefined();
    140139
    141140    PropertyDescriptor descriptor;
    … …  
    143142        if (descriptor.isDataDescriptor() && !descriptor.configurable() && !descriptor.writable()) {
    144143            if (!sameValue(exec, descriptor.value(), trapResult))
    145                 return throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'get' result of a non-configurable and non-writable property should be the same value as the target's property"));
     144                return throwTypeError(exec, ASCIILiteral("Proxy handler's 'get' result of a non-configurable and non-writable property should be the same value as the target's property"));
    146145        } else if (descriptor.isAccessorDescriptor() && !descriptor.configurable() && descriptor.getter().isUndefined()) {
    147146            if (!trapResult.isUndefined())
    148                 return throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'get' result of a non-configurable accessor property without a getter should be undefined"));
    149         }
    150     }
    151 
    152     if (exec->hadException())
    153         return JSValue::encode(jsUndefined());
    154 
    155     return JSValue::encode(trapResult);
     147                return throwTypeError(exec, ASCIILiteral("Proxy handler's 'get' result of a non-configurable accessor property without a getter should be undefined"));
     148        }
     149    }
     150
     151    if (exec->hadException())
     152        return jsUndefined();
     153
     154    return trapResult;
     155}
     156
     157bool ProxyObject::performGet(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
     158{
     159    JSValue result = performProxyGet(exec, this, slot.thisValue(), propertyName);
     160    if (exec->hadException())
     161        return false;
     162    unsigned ignoredAttributes = 0;
     163    slot.setValue(this, ignoredAttributes, result);
     164    return true;
    156165}
    157166
    … …  
    338347    switch (slot.internalMethodType()) {
    339348    case PropertySlot::InternalMethodType::Get:
    340         slot.setCustom(this, CustomAccessor, performProxyGet);
    341         return true;
     349        return performGet(exec, propertyName, slot);
    342350    case PropertySlot::InternalMethodType::GetOwnProperty:
    343351        return performInternalMethodGetOwnProperty(exec, propertyName, slot);

  • trunk/Source/JavaScriptCore/runtime/ProxyObject.h

    r201495 r201703  
    9696    bool getOwnPropertySlotCommon(ExecState*, PropertyName, PropertySlot&);
    9797    bool performInternalMethodGetOwnProperty(ExecState*, PropertyName, PropertySlot&);
     98    bool performGet(ExecState*, PropertyName, PropertySlot&);
    9899    bool performHasProperty(ExecState*, PropertyName, PropertySlot&);
    99100    template <typename DefaultDeleteFunction>

  • trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp

    r201448 r201703  
    3232namespace JSC {
    3333
    34 static EncodedJSValue regExpConstructorInput(ExecState*, EncodedJSValue, PropertyName, JSObject*);
    35 static EncodedJSValue regExpConstructorMultiline(ExecState*, EncodedJSValue, PropertyName, JSObject*);
    36 static EncodedJSValue regExpConstructorLastMatch(ExecState*, EncodedJSValue, PropertyName, JSObject*);
    37 static EncodedJSValue regExpConstructorLastParen(ExecState*, EncodedJSValue, PropertyName, JSObject*);
    38 static EncodedJSValue regExpConstructorLeftContext(ExecState*, EncodedJSValue, PropertyName, JSObject*);
    39 static EncodedJSValue regExpConstructorRightContext(ExecState*, EncodedJSValue, PropertyName, JSObject*);
     34static EncodedJSValue regExpConstructorInput(ExecState*, EncodedJSValue, PropertyName);
     35static EncodedJSValue regExpConstructorMultiline(ExecState*, EncodedJSValue, PropertyName);
     36static EncodedJSValue regExpConstructorLastMatch(ExecState*, EncodedJSValue, PropertyName);
     37static EncodedJSValue regExpConstructorLastParen(ExecState*, EncodedJSValue, PropertyName);
     38static EncodedJSValue regExpConstructorLeftContext(ExecState*, EncodedJSValue, PropertyName);
     39static EncodedJSValue regExpConstructorRightContext(ExecState*, EncodedJSValue, PropertyName);
    4040template<int N>
    41 static EncodedJSValue regExpConstructorDollar(ExecState*, EncodedJSValue, PropertyName, JSObject*);
     41static EncodedJSValue regExpConstructorDollar(ExecState*, EncodedJSValue, PropertyName);
    4242
    4343static bool setRegExpConstructorInput(ExecState*, EncodedJSValue, EncodedJSValue);
    … …  
    148148
    149149template<int N>
    150 EncodedJSValue regExpConstructorDollar(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     150EncodedJSValue regExpConstructorDollar(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    151151{
    152152    return JSValue::encode(asRegExpConstructor(JSValue::decode(thisValue))->getBackref(exec, N));
    153153}
    154154
    155 EncodedJSValue regExpConstructorInput(ExecState*, EncodedJSValue thisValue, PropertyName, JSObject*)
     155EncodedJSValue regExpConstructorInput(ExecState*, EncodedJSValue thisValue, PropertyName)
    156156{
    157157    return JSValue::encode(asRegExpConstructor(JSValue::decode(thisValue))->input());
    158158}
    159159
    160 EncodedJSValue regExpConstructorMultiline(ExecState*, EncodedJSValue thisValue, PropertyName, JSObject*)
     160EncodedJSValue regExpConstructorMultiline(ExecState*, EncodedJSValue thisValue, PropertyName)
    161161{
    162162    return JSValue::encode(jsBoolean(asRegExpConstructor(JSValue::decode(thisValue))->multiline()));
    163163}
    164164
    165 EncodedJSValue regExpConstructorLastMatch(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     165EncodedJSValue regExpConstructorLastMatch(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    166166{
    167167    return JSValue::encode(asRegExpConstructor(JSValue::decode(thisValue))->getBackref(exec, 0));
    168168}
    169169
    170 EncodedJSValue regExpConstructorLastParen(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     170EncodedJSValue regExpConstructorLastParen(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    171171{
    172172    return JSValue::encode(asRegExpConstructor(JSValue::decode(thisValue))->getLastParen(exec));
    173173}
    174174
    175 EncodedJSValue regExpConstructorLeftContext(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     175EncodedJSValue regExpConstructorLeftContext(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    176176{
    177177    return JSValue::encode(asRegExpConstructor(JSValue::decode(thisValue))->getLeftContext(exec));
    178178}
    179179
    180 EncodedJSValue regExpConstructorRightContext(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     180EncodedJSValue regExpConstructorRightContext(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    181181{
    182182    return JSValue::encode(asRegExpConstructor(JSValue::decode(thisValue))->getRightContext(exec));

  • trunk/Source/WebCore/ChangeLog

    r201702 r201703  
     12016-06-05  Yusuke Suzuki  <utatane.tea@gmail.com>
     2
     3        Change ProxyObject.[[Get]] not to use custom accessor
     4        https://bugs.webkit.org/show_bug.cgi?id=157080
     5
     6        Reviewed by Darin Adler.
     7
     8        * bindings/js/JSCryptoAlgorithmDictionary.cpp:
     9        (WebCore::getProperty):
     10        * bindings/js/JSDOMBinding.h:
     11        (WebCore::nonCachingStaticFunctionGetter):
     12        * bindings/js/JSDOMWindowCustom.cpp:
     13        (WebCore::jsDOMWindowWebKit):
     14        * bindings/js/JSDictionary.cpp:
     15        (WebCore::JSDictionary::tryGetProperty):
     16        * bindings/js/JSPluginElementFunctions.cpp:
     17        (WebCore::pluginElementPropertyGetter):
     18        * bindings/js/JSPluginElementFunctions.h:
     19        * bindings/scripts/CodeGeneratorJS.pm:
     20        (GenerateHeader):
     21        (GenerateImplementation):
     22        * bindings/scripts/test/JS/JSInterfaceName.cpp:
     23        (WebCore::jsInterfaceNameConstructor):
     24        * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
     25        (WebCore::jsTestActiveDOMObjectExcitingAttr):
     26        (WebCore::jsTestActiveDOMObjectConstructor):
     27        * bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp:
     28        (WebCore::jsTestClassWithJSBuiltinConstructorConstructor):
     29        * bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp:
     30        (WebCore::jsTestCustomConstructorWithNoInterfaceObjectConstructor):
     31        * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
     32        (WebCore::jsTestCustomNamedGetterConstructor):
     33        * bindings/scripts/test/JS/JSTestEventConstructor.cpp:
     34        (WebCore::jsTestEventConstructorAttr1):
     35        (WebCore::jsTestEventConstructorAttr2):
     36        (WebCore::jsTestEventConstructorAttr3):
     37        (WebCore::jsTestEventConstructorConstructor):
     38        * bindings/scripts/test/JS/JSTestEventTarget.cpp:
     39        (WebCore::jsTestEventTargetConstructor):
     40        * bindings/scripts/test/JS/JSTestException.cpp:
     41        (WebCore::jsTestExceptionName):
     42        (WebCore::jsTestExceptionConstructor):
     43        * bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp:
     44        (WebCore::jsTestGenerateIsReachableConstructor):
     45        * bindings/scripts/test/JS/JSTestGlobalObject.cpp:
     46        (WebCore::jsTestGlobalObjectRegularAttribute):
     47        (WebCore::jsTestGlobalObjectEnabledAtRuntimeAttribute):
     48        (WebCore::jsTestGlobalObjectConstructor):
     49        * bindings/scripts/test/JS/JSTestInterface.cpp:
     50        (WebCore::jsTestInterfaceConstructorImplementsStaticReadOnlyAttr):
     51        (WebCore::jsTestInterfaceConstructorImplementsStaticAttr):
     52        (WebCore::jsTestInterfaceImplementsStr1):
     53        (WebCore::jsTestInterfaceImplementsStr2):
     54        (WebCore::jsTestInterfaceImplementsStr3):
     55        (WebCore::jsTestInterfaceImplementsNode):
     56        (WebCore::jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr):
     57        (WebCore::jsTestInterfaceConstructorSupplementalStaticAttr):
     58        (WebCore::jsTestInterfaceSupplementalStr1):
     59        (WebCore::jsTestInterfaceSupplementalStr2):
     60        (WebCore::jsTestInterfaceSupplementalStr3):
     61        (WebCore::jsTestInterfaceSupplementalNode):
     62        (WebCore::jsTestInterfaceConstructor):
     63        * bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp:
     64        (WebCore::jsTestJSBuiltinConstructorTestAttributeCustom):
     65        (WebCore::jsTestJSBuiltinConstructorTestAttributeRWCustom):
     66        (WebCore::jsTestJSBuiltinConstructorConstructor):
     67        * bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
     68        (WebCore::jsTestMediaQueryListListenerConstructor):
     69        * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
     70        (WebCore::jsTestNamedConstructorConstructor):
     71        * bindings/scripts/test/JS/JSTestNode.cpp:
     72        (WebCore::jsTestNodeName):
     73        (WebCore::jsTestNodeConstructor):
     74        * bindings/scripts/test/JS/JSTestNondeterministic.cpp:
     75        (WebCore::jsTestNondeterministicNondeterministicReadonlyAttr):
     76        (WebCore::jsTestNondeterministicNondeterministicWriteableAttr):
     77        (WebCore::jsTestNondeterministicNondeterministicExceptionAttr):
     78        (WebCore::jsTestNondeterministicNondeterministicGetterExceptionAttr):
     79        (WebCore::jsTestNondeterministicNondeterministicSetterExceptionAttr):
     80        (WebCore::jsTestNondeterministicConstructor):
     81        * bindings/scripts/test/JS/JSTestObj.cpp:
     82        (WebCore::jsTestObjReadOnlyLongAttr):
     83        (WebCore::jsTestObjReadOnlyStringAttr):
     84        (WebCore::jsTestObjReadOnlyTestObjAttr):
     85        (WebCore::jsTestObjConstructorStaticReadOnlyLongAttr):
     86        (WebCore::jsTestObjConstructorStaticStringAttr):
     87        (WebCore::jsTestObjConstructorTestSubObj):
     88        (WebCore::jsTestObjTestSubObjEnabledBySettingConstructor):
     89        (WebCore::jsTestObjEnumAttr):
     90        (WebCore::jsTestObjByteAttr):
     91        (WebCore::jsTestObjOctetAttr):
     92        (WebCore::jsTestObjShortAttr):
     93        (WebCore::jsTestObjClampedShortAttr):
     94        (WebCore::jsTestObjEnforceRangeShortAttr):
     95        (WebCore::jsTestObjUnsignedShortAttr):
     96        (WebCore::jsTestObjLongAttr):
     97        (WebCore::jsTestObjLongLongAttr):
     98        (WebCore::jsTestObjUnsignedLongLongAttr):
     99        (WebCore::jsTestObjStringAttr):
     100        (WebCore::jsTestObjTestObjAttr):
     101        (WebCore::jsTestObjTestNullableObjAttr):
     102        (WebCore::jsTestObjLenientTestObjAttr):
     103        (WebCore::jsTestObjUnforgeableAttr):
     104        (WebCore::jsTestObjStringAttrTreatingNullAsEmptyString):
     105        (WebCore::jsTestObjXMLObjAttr):
     106        (WebCore::jsTestObjCreate):
     107        (WebCore::jsTestObjReflectedStringAttr):
     108        (WebCore::jsTestObjReflectedIntegralAttr):
     109        (WebCore::jsTestObjReflectedUnsignedIntegralAttr):
     110        (WebCore::jsTestObjReflectedBooleanAttr):
     111        (WebCore::jsTestObjReflectedURLAttr):
     112        (WebCore::jsTestObjReflectedCustomIntegralAttr):
     113        (WebCore::jsTestObjReflectedCustomBooleanAttr):
     114        (WebCore::jsTestObjReflectedCustomURLAttr):
     115        (WebCore::jsTestObjEnabledAtRuntimeAttribute):
     116        (WebCore::jsTestObjTypedArrayAttr):
     117        (WebCore::jsTestObjAttrWithGetterException):
     118        (WebCore::jsTestObjAttrWithGetterExceptionWithMessage):
     119        (WebCore::jsTestObjAttrWithSetterException):
     120        (WebCore::jsTestObjAttrWithSetterExceptionWithMessage):
     121        (WebCore::jsTestObjStringAttrWithGetterException):
     122        (WebCore::jsTestObjStringAttrWithSetterException):
     123        (WebCore::jsTestObjStrictTypeCheckingAttribute):
     124        (WebCore::jsTestObjCustomAttr):
     125        (WebCore::jsTestObjOnfoo):
     126        (WebCore::jsTestObjOnwebkitfoo):
     127        (WebCore::jsTestObjWithScriptStateAttribute):
     128        (WebCore::jsTestObjWithCallWithAndSetterCallWithAttribute):
     129        (WebCore::jsTestObjWithScriptExecutionContextAttribute):
     130        (WebCore::jsTestObjWithScriptStateAttributeRaises):
     131        (WebCore::jsTestObjWithScriptExecutionContextAttributeRaises):
     132        (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateAttribute):
     133        (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises):
     134        (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute):
     135        (WebCore::jsTestObjWithScriptArgumentsAndCallStackAttribute):
     136        (WebCore::jsTestObjConditionalAttr1):
     137        (WebCore::jsTestObjConditionalAttr2):
     138        (WebCore::jsTestObjConditionalAttr3):
     139        (WebCore::jsTestObjConditionalAttr4Constructor):
     140        (WebCore::jsTestObjConditionalAttr5Constructor):
     141        (WebCore::jsTestObjConditionalAttr6Constructor):
     142        (WebCore::jsTestObjCachedAttribute1):
     143        (WebCore::jsTestObjCachedAttribute2):
     144        (WebCore::jsTestObjAnyAttribute):
     145        (WebCore::jsTestObjContentDocument):
     146        (WebCore::jsTestObjMutablePoint):
     147        (WebCore::jsTestObjImmutablePoint):
     148        (WebCore::jsTestObjStrawberry):
     149        (WebCore::jsTestObjStrictFloat):
     150        (WebCore::jsTestObjDescription):
     151        (WebCore::jsTestObjId):
     152        (WebCore::jsTestObjHash):
     153        (WebCore::jsTestObjReplaceableAttribute):
     154        (WebCore::jsTestObjNullableDoubleAttribute):
     155        (WebCore::jsTestObjNullableLongAttribute):
     156        (WebCore::jsTestObjNullableBooleanAttribute):
     157        (WebCore::jsTestObjNullableStringAttribute):
     158        (WebCore::jsTestObjNullableLongSettableAttribute):
     159        (WebCore::jsTestObjNullableStringSettableAttribute):
     160        (WebCore::jsTestObjNullableStringValue):
     161        (WebCore::jsTestObjAttribute):
     162        (WebCore::jsTestObjAttributeWithReservedEnumType):
     163        (WebCore::jsTestObjPutForwardsAttribute):
     164        (WebCore::jsTestObjPutForwardsNullableAttribute):
     165        (WebCore::jsTestObjConstructor):
     166        * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
     167        (WebCore::jsTestOverloadedConstructorsConstructor):
     168        * bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
     169        (WebCore::jsTestOverrideBuiltinsConstructor):
     170        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
     171        (WebCore::jsTestSerializedScriptValueInterfaceValue):
     172        (WebCore::jsTestSerializedScriptValueInterfaceReadonlyValue):
     173        (WebCore::jsTestSerializedScriptValueInterfaceCachedValue):
     174        (WebCore::jsTestSerializedScriptValueInterfacePorts):
     175        (WebCore::jsTestSerializedScriptValueInterfaceCachedReadonlyValue):
     176        (WebCore::jsTestSerializedScriptValueInterfaceConstructor):
     177        * bindings/scripts/test/JS/JSTestTypedefs.cpp:
     178        (WebCore::jsTestTypedefsUnsignedLongLongAttr):
     179        (WebCore::jsTestTypedefsImmutableSerializedScriptValue):
     180        (WebCore::jsTestTypedefsConstructorTestSubObj):
     181        (WebCore::jsTestTypedefsAttrWithGetterException):
     182        (WebCore::jsTestTypedefsAttrWithSetterException):
     183        (WebCore::jsTestTypedefsStringAttrWithGetterException):
     184        (WebCore::jsTestTypedefsStringAttrWithSetterException):
     185        (WebCore::jsTestTypedefsConstructor):
     186        * bindings/scripts/test/JS/JSattribute.cpp:
     187        (WebCore::jsattributeReadonly):
     188        (WebCore::jsattributeConstructor):
     189        * bindings/scripts/test/JS/JSreadonly.cpp:
     190        (WebCore::jsreadonlyConstructor):
     191        * bridge/runtime_array.cpp:
     192        (JSC::RuntimeArray::lengthGetter):
     193        * bridge/runtime_array.h:
     194        * bridge/runtime_method.cpp:
     195        (JSC::RuntimeMethod::lengthGetter):
     196        * bridge/runtime_method.h:
     197        * bridge/runtime_object.cpp:
     198        (JSC::Bindings::RuntimeObject::fallbackObjectGetter):
     199        (JSC::Bindings::RuntimeObject::fieldGetter):
     200        (JSC::Bindings::RuntimeObject::methodGetter):
     201        * bridge/runtime_object.h:
     202
    12032016-06-03  Gavin & Ellie Barraclough  <barraclough@apple.com>
    2204

  • trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp

    r200556 r201703  
    9696static JSValue getProperty(ExecState* exec, JSObject* object, const char* name)
    9797{
    98     Identifier identifier = Identifier::fromString(exec, name);
    99     PropertySlot slot(object, PropertySlot::InternalMethodType::Get);
    100 
    101     if (object->getPropertySlot(exec, identifier, slot))
    102         return slot.getValue(exec, identifier);
    103 
    104     return jsUndefined();
     98    return object->get(exec, Identifier::fromString(exec, name));
    10599}
    106100

  • trunk/Source/WebCore/bindings/js/JSDOMBinding.h

    r201322 r201703  
    306306
    307307template<typename DOMClass> const JSC::HashTableValue* getStaticValueSlotEntryWithoutCaching(JSC::ExecState*, JSC::PropertyName);
    308 template<JSC::NativeFunction, int length> JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     308template<JSC::NativeFunction, int length> JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    309309
    310310// Inline functions and template definitions.
    … …  
    785785}
    786786
    787 template<JSC::NativeFunction nativeFunction, int length> JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState* exec, JSC::EncodedJSValue, JSC::PropertyName propertyName, JSC::JSObject*)
     787template<JSC::NativeFunction nativeFunction, int length> JSC::EncodedJSValue nonCachingStaticFunctionGetter(JSC::ExecState* exec, JSC::EncodedJSValue, JSC::PropertyName propertyName)
    788788{
    789789    return JSC::JSValue::encode(JSC::JSFunction::create(exec->vm(), exec->lexicalGlobalObject(), length, propertyName.publicName(), nativeFunction));

  • trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

    r201702 r201703  
    6565
    6666#if ENABLE(USER_MESSAGE_HANDLERS)
    67 static EncodedJSValue jsDOMWindowWebKit(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     67static EncodedJSValue jsDOMWindowWebKit(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    6868{
    6969    JSDOMWindow* castedThis = toJSDOMWindow(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/js/JSDictionary.cpp

    r200550 r201703  
    7474    ASSERT(isValid());
    7575    Identifier identifier = Identifier::fromString(m_exec, propertyName);
    76     PropertySlot slot(m_initializerObject.get(), PropertySlot::InternalMethodType::Get);
    77 
    78     if (!m_initializerObject.get()->getPropertySlot(m_exec, identifier, slot))
    79         return NoPropertyFound;
    80 
     76    bool propertyFound = m_initializerObject.get()->getPropertySlot(m_exec, identifier, [&] (bool propertyFound, PropertySlot& slot) -> bool {
     77        if (!propertyFound)
     78            return false;
     79        finalResult = slot.getValue(m_exec, identifier);
     80        return true;
     81    });
    8182    if (m_exec->hadException())
    8283        return ExceptionThrown;
    83 
    84     finalResult = slot.getValue(m_exec, identifier);
    85     if (m_exec->hadException())
    86         return ExceptionThrown;
    87 
    88     return PropertyFound;
     84    return propertyFound ? PropertyFound : NoPropertyFound;
    8985}
    9086

  • trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp

    r201322 r201703  
    9595}
    9696   
    97 EncodedJSValue pluginElementPropertyGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject*)
     97EncodedJSValue pluginElementPropertyGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
    9898{
    9999

  • trunk/Source/WebCore/bindings/js/JSPluginElementFunctions.h

    r201322 r201703  
    3939    WEBCORE_EXPORT JSC::JSObject* pluginScriptObject(JSC::ExecState*, JSHTMLElement*);
    4040
    41     JSC::EncodedJSValue pluginElementPropertyGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     41    JSC::EncodedJSValue pluginElementPropertyGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4242    bool pluginElementCustomGetOwnPropertySlot(JSC::ExecState*, JSC::PropertyName, JSC::PropertySlot&, JSHTMLElement*);
    4343    bool pluginElementCustomPut(JSC::ExecState*, JSC::PropertyName, JSC::JSValue, JSHTMLElement*, JSC::PutPropertySlot&, bool& putResult);

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r201702 r201703  
    15181518            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
    15191519            my $getter = GetAttributeGetterName($interface, $className, $attribute);
    1520             push(@headerContent, "JSC::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);\n");
     1520            push(@headerContent, "JSC::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);\n");
    15211521            if (!IsReadonly($attribute)) {
    15221522                my $setter = GetAttributeSetterName($interface, $className, $attribute);
    … …  
    20802080            push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
    20812081            my $getter = GetAttributeGetterName($interface, $className, $attribute);
    2082             push(@implContent, "JSC::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);\n");
     2082            push(@implContent, "JSC::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);\n");
    20832083            if (!IsReadonly($attribute)) {
    20842084                my $setter = GetAttributeSetterName($interface, $className, $attribute);
    … …  
    20902090        if (NeedsConstructorProperty($interface)) {
    20912091            my $getter = "js" . $interfaceName . "Constructor";
    2092             push(@implContent, "JSC::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);\n");
     2092            push(@implContent, "JSC::EncodedJSValue ${getter}(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);\n");
    20932093        }
    20942094
    … …  
    25232523            push(@implContent, "#if ${attributeConditionalString}\n") if $attributeConditionalString;
    25242524
    2525             push(@implContent, "EncodedJSValue ${getFunctionName}(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)\n");
     2525            push(@implContent, "EncodedJSValue ${getFunctionName}(ExecState* state, EncodedJSValue thisValue, PropertyName)\n");
    25262526            push(@implContent, "{\n");
    25272527
    … …  
    27262726            my $constructorFunctionName = "js" . $interfaceName . "Constructor";
    27272727
    2728             push(@implContent, "EncodedJSValue ${constructorFunctionName}(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)\n");
     2728            push(@implContent, "EncodedJSValue ${constructorFunctionName}(ExecState* state, EncodedJSValue thisValue, PropertyName)\n");
    27292729            push(@implContent, "{\n");
    27302730            push(@implContent, "    ${className}Prototype* domObject = jsDynamicCast<${className}Prototype*>(JSValue::decode(thisValue));\n");

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSInterfaceName.cpp

    r201541 r201703  
    3333// Attributes
    3434
    35 JSC::EncodedJSValue jsInterfaceNameConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     35JSC::EncodedJSValue jsInterfaceNameConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    3636bool setJSInterfaceNameConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    3737
    … …  
    116116}
    117117
    118 EncodedJSValue jsInterfaceNameConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     118EncodedJSValue jsInterfaceNameConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    119119{
    120120    JSInterfaceNamePrototype* domObject = jsDynamicCast<JSInterfaceNamePrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp

    r201387 r201703  
    4141// Attributes
    4242
    43 JSC::EncodedJSValue jsTestActiveDOMObjectExcitingAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    44 JSC::EncodedJSValue jsTestActiveDOMObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     43JSC::EncodedJSValue jsTestActiveDOMObjectExcitingAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     44JSC::EncodedJSValue jsTestActiveDOMObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4545bool setJSTestActiveDOMObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4646
    … …  
    150150}
    151151
    152 EncodedJSValue jsTestActiveDOMObjectExcitingAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     152EncodedJSValue jsTestActiveDOMObjectExcitingAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    153153{
    154154    UNUSED_PARAM(state);
    … …  
    167167
    168168
    169 EncodedJSValue jsTestActiveDOMObjectConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     169EncodedJSValue jsTestActiveDOMObjectConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    170170{
    171171    JSTestActiveDOMObjectPrototype* domObject = jsDynamicCast<JSTestActiveDOMObjectPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp

    r201331 r201703  
    3434// Attributes
    3535
    36 JSC::EncodedJSValue jsTestClassWithJSBuiltinConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     36JSC::EncodedJSValue jsTestClassWithJSBuiltinConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    3737bool setJSTestClassWithJSBuiltinConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    3838
    … …  
    122122}
    123123
    124 EncodedJSValue jsTestClassWithJSBuiltinConstructorConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     124EncodedJSValue jsTestClassWithJSBuiltinConstructorConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    125125{
    126126    JSTestClassWithJSBuiltinConstructorPrototype* domObject = jsDynamicCast<JSTestClassWithJSBuiltinConstructorPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp

    r201331 r201703  
    3333// Attributes
    3434
    35 JSC::EncodedJSValue jsTestCustomConstructorWithNoInterfaceObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     35JSC::EncodedJSValue jsTestCustomConstructorWithNoInterfaceObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    3636bool setJSTestCustomConstructorWithNoInterfaceObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    3737
    … …  
    121121}
    122122
    123 EncodedJSValue jsTestCustomConstructorWithNoInterfaceObjectConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     123EncodedJSValue jsTestCustomConstructorWithNoInterfaceObjectConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    124124{
    125125    JSTestCustomConstructorWithNoInterfaceObjectPrototype* domObject = jsDynamicCast<JSTestCustomConstructorWithNoInterfaceObjectPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp

    r201331 r201703  
    4040// Attributes
    4141
    42 JSC::EncodedJSValue jsTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     42JSC::EncodedJSValue jsTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4343bool setJSTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4444
    … …  
    159159}
    160160
    161 EncodedJSValue jsTestCustomNamedGetterConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     161EncodedJSValue jsTestCustomNamedGetterConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    162162{
    163163    JSTestCustomNamedGetterPrototype* domObject = jsDynamicCast<JSTestCustomNamedGetterPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp

    r201387 r201703  
    3737// Attributes
    3838
    39 JSC::EncodedJSValue jsTestEventConstructorAttr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    40 JSC::EncodedJSValue jsTestEventConstructorAttr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     39JSC::EncodedJSValue jsTestEventConstructorAttr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     40JSC::EncodedJSValue jsTestEventConstructorAttr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4141#if ENABLE(SPECIAL_EVENT)
    42 JSC::EncodedJSValue jsTestEventConstructorAttr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    43 #endif
    44 JSC::EncodedJSValue jsTestEventConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     42JSC::EncodedJSValue jsTestEventConstructorAttr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     43#endif
     44JSC::EncodedJSValue jsTestEventConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4545bool setJSTestEventConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4646
    … …  
    177177}
    178178
    179 EncodedJSValue jsTestEventConstructorAttr1(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     179EncodedJSValue jsTestEventConstructorAttr1(ExecState* state, EncodedJSValue thisValue, PropertyName)
    180180{
    181181    UNUSED_PARAM(state);
    … …  
    192192
    193193
    194 EncodedJSValue jsTestEventConstructorAttr2(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     194EncodedJSValue jsTestEventConstructorAttr2(ExecState* state, EncodedJSValue thisValue, PropertyName)
    195195{
    196196    UNUSED_PARAM(state);
    … …  
    208208
    209209#if ENABLE(SPECIAL_EVENT)
    210 EncodedJSValue jsTestEventConstructorAttr3(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     210EncodedJSValue jsTestEventConstructorAttr3(ExecState* state, EncodedJSValue thisValue, PropertyName)
    211211{
    212212    UNUSED_PARAM(state);
    … …  
    224224#endif
    225225
    226 EncodedJSValue jsTestEventConstructorConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     226EncodedJSValue jsTestEventConstructorConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    227227{
    228228    JSTestEventConstructorPrototype* domObject = jsDynamicCast<JSTestEventConstructorPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp

    r201331 r201703  
    4343// Attributes
    4444
    45 JSC::EncodedJSValue jsTestEventTargetConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     45JSC::EncodedJSValue jsTestEventTargetConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4646bool setJSTestEventTargetConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4747
    … …  
    159159}
    160160
    161 EncodedJSValue jsTestEventTargetConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     161EncodedJSValue jsTestEventTargetConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    162162{
    163163    JSTestEventTargetPrototype* domObject = jsDynamicCast<JSTestEventTargetPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp

    r201387 r201703  
    3535// Attributes
    3636
    37 JSC::EncodedJSValue jsTestExceptionName(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    38 JSC::EncodedJSValue jsTestExceptionConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     37JSC::EncodedJSValue jsTestExceptionName(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     38JSC::EncodedJSValue jsTestExceptionConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    3939bool setJSTestExceptionConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4040
    … …  
    142142}
    143143
    144 EncodedJSValue jsTestExceptionName(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     144EncodedJSValue jsTestExceptionName(ExecState* state, EncodedJSValue thisValue, PropertyName)
    145145{
    146146    UNUSED_PARAM(state);
    … …  
    157157
    158158
    159 EncodedJSValue jsTestExceptionConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     159EncodedJSValue jsTestExceptionConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    160160{
    161161    JSTestExceptionPrototype* domObject = jsDynamicCast<JSTestExceptionPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp

    r201331 r201703  
    3333// Attributes
    3434
    35 JSC::EncodedJSValue jsTestGenerateIsReachableConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     35JSC::EncodedJSValue jsTestGenerateIsReachableConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    3636bool setJSTestGenerateIsReachableConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    3737
    … …  
    116116}
    117117
    118 EncodedJSValue jsTestGenerateIsReachableConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     118EncodedJSValue jsTestGenerateIsReachableConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    119119{
    120120    JSTestGenerateIsReachablePrototype* domObject = jsDynamicCast<JSTestGenerateIsReachablePrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp

    r201702 r201703  
    4646// Attributes
    4747
    48 JSC::EncodedJSValue jsTestGlobalObjectRegularAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     48JSC::EncodedJSValue jsTestGlobalObjectRegularAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4949bool setJSTestGlobalObjectRegularAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    5050#if ENABLE(TEST_FEATURE)
    51 JSC::EncodedJSValue jsTestGlobalObjectEnabledAtRuntimeAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     51JSC::EncodedJSValue jsTestGlobalObjectEnabledAtRuntimeAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    5252bool setJSTestGlobalObjectEnabledAtRuntimeAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    5353#endif
    54 JSC::EncodedJSValue jsTestGlobalObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     54JSC::EncodedJSValue jsTestGlobalObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    5555bool setJSTestGlobalObjectConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    5656
    … …  
    147147}
    148148
    149 EncodedJSValue jsTestGlobalObjectRegularAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     149EncodedJSValue jsTestGlobalObjectRegularAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    150150{
    151151    UNUSED_PARAM(state);
    … …  
    163163
    164164#if ENABLE(TEST_FEATURE)
    165 EncodedJSValue jsTestGlobalObjectEnabledAtRuntimeAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     165EncodedJSValue jsTestGlobalObjectEnabledAtRuntimeAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    166166{
    167167    UNUSED_PARAM(state);
    … …  
    179179#endif
    180180
    181 EncodedJSValue jsTestGlobalObjectConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     181EncodedJSValue jsTestGlobalObjectConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    182182{
    183183    JSTestGlobalObjectPrototype* domObject = jsDynamicCast<JSTestGlobalObjectPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp

    r201387 r201703  
    7979
    8080#if ENABLE(Condition22) || ENABLE(Condition23)
    81 JSC::EncodedJSValue jsTestInterfaceConstructorImplementsStaticReadOnlyAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    82 #endif
    83 #if ENABLE(Condition22) || ENABLE(Condition23)
    84 JSC::EncodedJSValue jsTestInterfaceConstructorImplementsStaticAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     81JSC::EncodedJSValue jsTestInterfaceConstructorImplementsStaticReadOnlyAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     82#endif
     83#if ENABLE(Condition22) || ENABLE(Condition23)
     84JSC::EncodedJSValue jsTestInterfaceConstructorImplementsStaticAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    8585bool setJSTestInterfaceConstructorImplementsStaticAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    8686#endif
    8787#if ENABLE(Condition22) || ENABLE(Condition23)
    88 JSC::EncodedJSValue jsTestInterfaceImplementsStr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    89 #endif
    90 #if ENABLE(Condition22) || ENABLE(Condition23)
    91 JSC::EncodedJSValue jsTestInterfaceImplementsStr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     88JSC::EncodedJSValue jsTestInterfaceImplementsStr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     89#endif
     90#if ENABLE(Condition22) || ENABLE(Condition23)
     91JSC::EncodedJSValue jsTestInterfaceImplementsStr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    9292bool setJSTestInterfaceImplementsStr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    9393#endif
    9494#if ENABLE(Condition22) || ENABLE(Condition23)
    95 JSC::EncodedJSValue jsTestInterfaceImplementsStr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     95JSC::EncodedJSValue jsTestInterfaceImplementsStr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    9696bool setJSTestInterfaceImplementsStr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    9797#endif
    9898#if ENABLE(Condition22) || ENABLE(Condition23)
    99 JSC::EncodedJSValue jsTestInterfaceImplementsNode(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     99JSC::EncodedJSValue jsTestInterfaceImplementsNode(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    100100bool setJSTestInterfaceImplementsNode(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    101101#endif
    102102#if ENABLE(Condition11) || ENABLE(Condition12)
    103 JSC::EncodedJSValue jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    104 #endif
    105 #if ENABLE(Condition11) || ENABLE(Condition12)
    106 JSC::EncodedJSValue jsTestInterfaceConstructorSupplementalStaticAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     103JSC::EncodedJSValue jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     104#endif
     105#if ENABLE(Condition11) || ENABLE(Condition12)
     106JSC::EncodedJSValue jsTestInterfaceConstructorSupplementalStaticAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    107107bool setJSTestInterfaceConstructorSupplementalStaticAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    108108#endif
    109109#if ENABLE(Condition11) || ENABLE(Condition12)
    110 JSC::EncodedJSValue jsTestInterfaceSupplementalStr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    111 #endif
    112 #if ENABLE(Condition11) || ENABLE(Condition12)
    113 JSC::EncodedJSValue jsTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     110JSC::EncodedJSValue jsTestInterfaceSupplementalStr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     111#endif
     112#if ENABLE(Condition11) || ENABLE(Condition12)
     113JSC::EncodedJSValue jsTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    114114bool setJSTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    115115#endif
    116116#if ENABLE(Condition11) || ENABLE(Condition12)
    117 JSC::EncodedJSValue jsTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     117JSC::EncodedJSValue jsTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    118118bool setJSTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    119119#endif
    120120#if ENABLE(Condition11) || ENABLE(Condition12)
    121 JSC::EncodedJSValue jsTestInterfaceSupplementalNode(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     121JSC::EncodedJSValue jsTestInterfaceSupplementalNode(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    122122bool setJSTestInterfaceSupplementalNode(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    123123#endif
    124 JSC::EncodedJSValue jsTestInterfaceConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     124JSC::EncodedJSValue jsTestInterfaceConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    125125bool setJSTestInterfaceConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    126126
    … …  
    410410
    411411#if ENABLE(Condition22) || ENABLE(Condition23)
    412 EncodedJSValue jsTestInterfaceConstructorImplementsStaticReadOnlyAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     412EncodedJSValue jsTestInterfaceConstructorImplementsStaticReadOnlyAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    413413{
    414414    UNUSED_PARAM(state);
    … …  
    421421
    422422#if ENABLE(Condition22) || ENABLE(Condition23)
    423 EncodedJSValue jsTestInterfaceConstructorImplementsStaticAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     423EncodedJSValue jsTestInterfaceConstructorImplementsStaticAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    424424{
    425425    UNUSED_PARAM(state);
    … …  
    432432
    433433#if ENABLE(Condition22) || ENABLE(Condition23)
    434 EncodedJSValue jsTestInterfaceImplementsStr1(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     434EncodedJSValue jsTestInterfaceImplementsStr1(ExecState* state, EncodedJSValue thisValue, PropertyName)
    435435{
    436436    UNUSED_PARAM(state);
    … …  
    449449
    450450#if ENABLE(Condition22) || ENABLE(Condition23)
    451 EncodedJSValue jsTestInterfaceImplementsStr2(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     451EncodedJSValue jsTestInterfaceImplementsStr2(ExecState* state, EncodedJSValue thisValue, PropertyName)
    452452{
    453453    UNUSED_PARAM(state);
    … …  
    466466
    467467#if ENABLE(Condition22) || ENABLE(Condition23)
    468 EncodedJSValue jsTestInterfaceImplementsStr3(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     468EncodedJSValue jsTestInterfaceImplementsStr3(ExecState* state, EncodedJSValue thisValue, PropertyName)
    469469{
    470470    UNUSED_PARAM(state);
    … …  
    481481
    482482#if ENABLE(Condition22) || ENABLE(Condition23)
    483 EncodedJSValue jsTestInterfaceImplementsNode(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     483EncodedJSValue jsTestInterfaceImplementsNode(ExecState* state, EncodedJSValue thisValue, PropertyName)
    484484{
    485485    UNUSED_PARAM(state);
    … …  
    498498
    499499#if ENABLE(Condition11) || ENABLE(Condition12)
    500 EncodedJSValue jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     500EncodedJSValue jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    501501{
    502502    UNUSED_PARAM(state);
    … …  
    509509
    510510#if ENABLE(Condition11) || ENABLE(Condition12)
    511 EncodedJSValue jsTestInterfaceConstructorSupplementalStaticAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     511EncodedJSValue jsTestInterfaceConstructorSupplementalStaticAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    512512{
    513513    UNUSED_PARAM(state);
    … …  
    520520
    521521#if ENABLE(Condition11) || ENABLE(Condition12)
    522 EncodedJSValue jsTestInterfaceSupplementalStr1(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     522EncodedJSValue jsTestInterfaceSupplementalStr1(ExecState* state, EncodedJSValue thisValue, PropertyName)
    523523{
    524524    UNUSED_PARAM(state);
    … …  
    537537
    538538#if ENABLE(Condition11) || ENABLE(Condition12)
    539 EncodedJSValue jsTestInterfaceSupplementalStr2(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     539EncodedJSValue jsTestInterfaceSupplementalStr2(ExecState* state, EncodedJSValue thisValue, PropertyName)
    540540{
    541541    UNUSED_PARAM(state);
    … …  
    554554
    555555#if ENABLE(Condition11) || ENABLE(Condition12)
    556 EncodedJSValue jsTestInterfaceSupplementalStr3(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     556EncodedJSValue jsTestInterfaceSupplementalStr3(ExecState* state, EncodedJSValue thisValue, PropertyName)
    557557{
    558558    UNUSED_PARAM(state);
    … …  
    569569
    570570#if ENABLE(Condition11) || ENABLE(Condition12)
    571 EncodedJSValue jsTestInterfaceSupplementalNode(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     571EncodedJSValue jsTestInterfaceSupplementalNode(ExecState* state, EncodedJSValue thisValue, PropertyName)
    572572{
    573573    UNUSED_PARAM(state);
    … …  
    585585#endif
    586586
    587 EncodedJSValue jsTestInterfaceConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     587EncodedJSValue jsTestInterfaceConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    588588{
    589589    JSTestInterfacePrototype* domObject = jsDynamicCast<JSTestInterfacePrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp

    r201387 r201703  
    3939// Attributes
    4040
    41 JSC::EncodedJSValue jsTestJSBuiltinConstructorTestAttributeCustom(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    42 JSC::EncodedJSValue jsTestJSBuiltinConstructorTestAttributeRWCustom(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     41JSC::EncodedJSValue jsTestJSBuiltinConstructorTestAttributeCustom(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     42JSC::EncodedJSValue jsTestJSBuiltinConstructorTestAttributeRWCustom(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4343bool setJSTestJSBuiltinConstructorTestAttributeRWCustom(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    44 JSC::EncodedJSValue jsTestJSBuiltinConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     44JSC::EncodedJSValue jsTestJSBuiltinConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4545bool setJSTestJSBuiltinConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4646
    … …  
    133133}
    134134
    135 EncodedJSValue jsTestJSBuiltinConstructorTestAttributeCustom(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     135EncodedJSValue jsTestJSBuiltinConstructorTestAttributeCustom(ExecState* state, EncodedJSValue thisValue, PropertyName)
    136136{
    137137    UNUSED_PARAM(state);
    … …  
    146146
    147147
    148 EncodedJSValue jsTestJSBuiltinConstructorTestAttributeRWCustom(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     148EncodedJSValue jsTestJSBuiltinConstructorTestAttributeRWCustom(ExecState* state, EncodedJSValue thisValue, PropertyName)
    149149{
    150150    UNUSED_PARAM(state);
    … …  
    159159
    160160
    161 EncodedJSValue jsTestJSBuiltinConstructorConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     161EncodedJSValue jsTestJSBuiltinConstructorConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    162162{
    163163    JSTestJSBuiltinConstructorPrototype* domObject = jsDynamicCast<JSTestJSBuiltinConstructorPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp

    r201331 r201703  
    4040// Attributes
    4141
    42 JSC::EncodedJSValue jsTestMediaQueryListListenerConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     42JSC::EncodedJSValue jsTestMediaQueryListListenerConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4343bool setJSTestMediaQueryListListenerConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4444
    … …  
    124124}
    125125
    126 EncodedJSValue jsTestMediaQueryListListenerConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     126EncodedJSValue jsTestMediaQueryListListenerConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    127127{
    128128    JSTestMediaQueryListListenerPrototype* domObject = jsDynamicCast<JSTestMediaQueryListListenerPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp

    r201331 r201703  
    3535// Attributes
    3636
    37 JSC::EncodedJSValue jsTestNamedConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     37JSC::EncodedJSValue jsTestNamedConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    3838bool setJSTestNamedConstructorConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    3939
    … …  
    157157}
    158158
    159 EncodedJSValue jsTestNamedConstructorConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     159EncodedJSValue jsTestNamedConstructorConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    160160{
    161161    JSTestNamedConstructorPrototype* domObject = jsDynamicCast<JSTestNamedConstructorPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp

    r201387 r201703  
    4545// Attributes
    4646
    47 JSC::EncodedJSValue jsTestNodeName(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     47JSC::EncodedJSValue jsTestNodeName(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4848bool setJSTestNodeName(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    49 JSC::EncodedJSValue jsTestNodeConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     49JSC::EncodedJSValue jsTestNodeConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    5050bool setJSTestNodeConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    5151
    … …  
    136136}
    137137
    138 EncodedJSValue jsTestNodeName(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     138EncodedJSValue jsTestNodeName(ExecState* state, EncodedJSValue thisValue, PropertyName)
    139139{
    140140    UNUSED_PARAM(state);
    … …  
    151151
    152152
    153 EncodedJSValue jsTestNodeConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     153EncodedJSValue jsTestNodeConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    154154{
    155155    JSTestNodePrototype* domObject = jsDynamicCast<JSTestNodePrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp

    r201387 r201703  
    4747// Attributes
    4848
    49 JSC::EncodedJSValue jsTestNondeterministicNondeterministicReadonlyAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    50 JSC::EncodedJSValue jsTestNondeterministicNondeterministicWriteableAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     49JSC::EncodedJSValue jsTestNondeterministicNondeterministicReadonlyAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     50JSC::EncodedJSValue jsTestNondeterministicNondeterministicWriteableAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    5151bool setJSTestNondeterministicNondeterministicWriteableAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    52 JSC::EncodedJSValue jsTestNondeterministicNondeterministicExceptionAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     52JSC::EncodedJSValue jsTestNondeterministicNondeterministicExceptionAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    5353bool setJSTestNondeterministicNondeterministicExceptionAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    54 JSC::EncodedJSValue jsTestNondeterministicNondeterministicGetterExceptionAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     54JSC::EncodedJSValue jsTestNondeterministicNondeterministicGetterExceptionAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    5555bool setJSTestNondeterministicNondeterministicGetterExceptionAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    56 JSC::EncodedJSValue jsTestNondeterministicNondeterministicSetterExceptionAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     56JSC::EncodedJSValue jsTestNondeterministicNondeterministicSetterExceptionAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    5757bool setJSTestNondeterministicNondeterministicSetterExceptionAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    58 JSC::EncodedJSValue jsTestNondeterministicConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     58JSC::EncodedJSValue jsTestNondeterministicConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    5959bool setJSTestNondeterministicConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    6060
    … …  
    145145}
    146146
    147 EncodedJSValue jsTestNondeterministicNondeterministicReadonlyAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     147EncodedJSValue jsTestNondeterministicNondeterministicReadonlyAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    148148{
    149149    UNUSED_PARAM(state);
    … …  
    180180
    181181
    182 EncodedJSValue jsTestNondeterministicNondeterministicWriteableAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     182EncodedJSValue jsTestNondeterministicNondeterministicWriteableAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    183183{
    184184    UNUSED_PARAM(state);
    … …  
    215215
    216216
    217 EncodedJSValue jsTestNondeterministicNondeterministicExceptionAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     217EncodedJSValue jsTestNondeterministicNondeterministicExceptionAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    218218{
    219219    UNUSED_PARAM(state);
    … …  
    250250
    251251
    252 EncodedJSValue jsTestNondeterministicNondeterministicGetterExceptionAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     252EncodedJSValue jsTestNondeterministicNondeterministicGetterExceptionAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    253253{
    254254    UNUSED_PARAM(state);
    … …  
    289289
    290290
    291 EncodedJSValue jsTestNondeterministicNondeterministicSetterExceptionAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     291EncodedJSValue jsTestNondeterministicNondeterministicSetterExceptionAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    292292{
    293293    UNUSED_PARAM(state);
    … …  
    324324
    325325
    326 EncodedJSValue jsTestNondeterministicConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     326EncodedJSValue jsTestNondeterministicConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    327327{
    328328    JSTestNondeterministicPrototype* domObject = jsDynamicCast<JSTestNondeterministicPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

    r201681 r201703  
    712712// Attributes
    713713
    714 JSC::EncodedJSValue jsTestObjReadOnlyLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    715 JSC::EncodedJSValue jsTestObjReadOnlyStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    716 JSC::EncodedJSValue jsTestObjReadOnlyTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    717 JSC::EncodedJSValue jsTestObjConstructorStaticReadOnlyLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    718 JSC::EncodedJSValue jsTestObjConstructorStaticStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     714JSC::EncodedJSValue jsTestObjReadOnlyLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     715JSC::EncodedJSValue jsTestObjReadOnlyStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     716JSC::EncodedJSValue jsTestObjReadOnlyTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     717JSC::EncodedJSValue jsTestObjConstructorStaticReadOnlyLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     718JSC::EncodedJSValue jsTestObjConstructorStaticStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    719719bool setJSTestObjConstructorStaticStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    720 JSC::EncodedJSValue jsTestObjConstructorTestSubObj(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    721 JSC::EncodedJSValue jsTestObjTestSubObjEnabledBySettingConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     720JSC::EncodedJSValue jsTestObjConstructorTestSubObj(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     721JSC::EncodedJSValue jsTestObjTestSubObjEnabledBySettingConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    722722bool setJSTestObjTestSubObjEnabledBySettingConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    723 JSC::EncodedJSValue jsTestObjEnumAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     723JSC::EncodedJSValue jsTestObjEnumAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    724724bool setJSTestObjEnumAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    725 JSC::EncodedJSValue jsTestObjByteAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     725JSC::EncodedJSValue jsTestObjByteAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    726726bool setJSTestObjByteAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    727 JSC::EncodedJSValue jsTestObjOctetAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     727JSC::EncodedJSValue jsTestObjOctetAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    728728bool setJSTestObjOctetAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    729 JSC::EncodedJSValue jsTestObjShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     729JSC::EncodedJSValue jsTestObjShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    730730bool setJSTestObjShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    731 JSC::EncodedJSValue jsTestObjClampedShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     731JSC::EncodedJSValue jsTestObjClampedShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    732732bool setJSTestObjClampedShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    733 JSC::EncodedJSValue jsTestObjEnforceRangeShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     733JSC::EncodedJSValue jsTestObjEnforceRangeShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    734734bool setJSTestObjEnforceRangeShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    735 JSC::EncodedJSValue jsTestObjUnsignedShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     735JSC::EncodedJSValue jsTestObjUnsignedShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    736736bool setJSTestObjUnsignedShortAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    737 JSC::EncodedJSValue jsTestObjLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     737JSC::EncodedJSValue jsTestObjLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    738738bool setJSTestObjLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    739 JSC::EncodedJSValue jsTestObjLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     739JSC::EncodedJSValue jsTestObjLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    740740bool setJSTestObjLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    741 JSC::EncodedJSValue jsTestObjUnsignedLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     741JSC::EncodedJSValue jsTestObjUnsignedLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    742742bool setJSTestObjUnsignedLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    743 JSC::EncodedJSValue jsTestObjStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     743JSC::EncodedJSValue jsTestObjStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    744744bool setJSTestObjStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    745 JSC::EncodedJSValue jsTestObjTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     745JSC::EncodedJSValue jsTestObjTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    746746bool setJSTestObjTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    747 JSC::EncodedJSValue jsTestObjTestNullableObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     747JSC::EncodedJSValue jsTestObjTestNullableObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    748748bool setJSTestObjTestNullableObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    749 JSC::EncodedJSValue jsTestObjLenientTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     749JSC::EncodedJSValue jsTestObjLenientTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    750750bool setJSTestObjLenientTestObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    751 JSC::EncodedJSValue jsTestObjUnforgeableAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    752 JSC::EncodedJSValue jsTestObjStringAttrTreatingNullAsEmptyString(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     751JSC::EncodedJSValue jsTestObjUnforgeableAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     752JSC::EncodedJSValue jsTestObjStringAttrTreatingNullAsEmptyString(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    753753bool setJSTestObjStringAttrTreatingNullAsEmptyString(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    754 JSC::EncodedJSValue jsTestObjXMLObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     754JSC::EncodedJSValue jsTestObjXMLObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    755755bool setJSTestObjXMLObjAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    756 JSC::EncodedJSValue jsTestObjCreate(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     756JSC::EncodedJSValue jsTestObjCreate(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    757757bool setJSTestObjCreate(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    758 JSC::EncodedJSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     758JSC::EncodedJSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    759759bool setJSTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    760 JSC::EncodedJSValue jsTestObjReflectedIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     760JSC::EncodedJSValue jsTestObjReflectedIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    761761bool setJSTestObjReflectedIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    762 JSC::EncodedJSValue jsTestObjReflectedUnsignedIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     762JSC::EncodedJSValue jsTestObjReflectedUnsignedIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    763763bool setJSTestObjReflectedUnsignedIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    764 JSC::EncodedJSValue jsTestObjReflectedBooleanAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     764JSC::EncodedJSValue jsTestObjReflectedBooleanAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    765765bool setJSTestObjReflectedBooleanAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    766 JSC::EncodedJSValue jsTestObjReflectedURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     766JSC::EncodedJSValue jsTestObjReflectedURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    767767bool setJSTestObjReflectedURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    768 JSC::EncodedJSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     768JSC::EncodedJSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    769769bool setJSTestObjReflectedStringAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    770 JSC::EncodedJSValue jsTestObjReflectedCustomIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     770JSC::EncodedJSValue jsTestObjReflectedCustomIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    771771bool setJSTestObjReflectedCustomIntegralAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    772 JSC::EncodedJSValue jsTestObjReflectedCustomBooleanAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     772JSC::EncodedJSValue jsTestObjReflectedCustomBooleanAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    773773bool setJSTestObjReflectedCustomBooleanAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    774 JSC::EncodedJSValue jsTestObjReflectedCustomURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     774JSC::EncodedJSValue jsTestObjReflectedCustomURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    775775bool setJSTestObjReflectedCustomURLAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    776776#if ENABLE(TEST_FEATURE)
    777 JSC::EncodedJSValue jsTestObjEnabledAtRuntimeAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     777JSC::EncodedJSValue jsTestObjEnabledAtRuntimeAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    778778bool setJSTestObjEnabledAtRuntimeAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    779779#endif
    780 JSC::EncodedJSValue jsTestObjTypedArrayAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     780JSC::EncodedJSValue jsTestObjTypedArrayAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    781781bool setJSTestObjTypedArrayAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    782 JSC::EncodedJSValue jsTestObjAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     782JSC::EncodedJSValue jsTestObjAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    783783bool setJSTestObjAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    784 JSC::EncodedJSValue jsTestObjAttrWithGetterExceptionWithMessage(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     784JSC::EncodedJSValue jsTestObjAttrWithGetterExceptionWithMessage(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    785785bool setJSTestObjAttrWithGetterExceptionWithMessage(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    786 JSC::EncodedJSValue jsTestObjAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     786JSC::EncodedJSValue jsTestObjAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    787787bool setJSTestObjAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    788 JSC::EncodedJSValue jsTestObjAttrWithSetterExceptionWithMessage(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     788JSC::EncodedJSValue jsTestObjAttrWithSetterExceptionWithMessage(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    789789bool setJSTestObjAttrWithSetterExceptionWithMessage(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    790 JSC::EncodedJSValue jsTestObjStringAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     790JSC::EncodedJSValue jsTestObjStringAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    791791bool setJSTestObjStringAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    792 JSC::EncodedJSValue jsTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     792JSC::EncodedJSValue jsTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    793793bool setJSTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    794 JSC::EncodedJSValue jsTestObjStrictTypeCheckingAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     794JSC::EncodedJSValue jsTestObjStrictTypeCheckingAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    795795bool setJSTestObjStrictTypeCheckingAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    796 JSC::EncodedJSValue jsTestObjCustomAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     796JSC::EncodedJSValue jsTestObjCustomAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    797797bool setJSTestObjCustomAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    798 JSC::EncodedJSValue jsTestObjOnfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     798JSC::EncodedJSValue jsTestObjOnfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    799799bool setJSTestObjOnfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    800 JSC::EncodedJSValue jsTestObjOnwebkitfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     800JSC::EncodedJSValue jsTestObjOnwebkitfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    801801bool setJSTestObjOnwebkitfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    802 JSC::EncodedJSValue jsTestObjWithScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     802JSC::EncodedJSValue jsTestObjWithScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    803803bool setJSTestObjWithScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    804 JSC::EncodedJSValue jsTestObjWithCallWithAndSetterCallWithAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     804JSC::EncodedJSValue jsTestObjWithCallWithAndSetterCallWithAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    805805bool setJSTestObjWithCallWithAndSetterCallWithAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    806 JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     806JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    807807bool setJSTestObjWithScriptExecutionContextAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    808 JSC::EncodedJSValue jsTestObjWithScriptStateAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     808JSC::EncodedJSValue jsTestObjWithScriptStateAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    809809bool setJSTestObjWithScriptStateAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    810 JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     810JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    811811bool setJSTestObjWithScriptExecutionContextAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    812 JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     812JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    813813bool setJSTestObjWithScriptExecutionContextAndScriptStateAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    814 JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     814JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    815815bool setJSTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    816 JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     816JSC::EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    817817bool setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    818 JSC::EncodedJSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     818JSC::EncodedJSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    819819bool setJSTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    820820#if ENABLE(Condition1)
    821 JSC::EncodedJSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     821JSC::EncodedJSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    822822bool setJSTestObjConditionalAttr1(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    823823#endif
    824824#if ENABLE(Condition1) && ENABLE(Condition2)
    825 JSC::EncodedJSValue jsTestObjConditionalAttr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     825JSC::EncodedJSValue jsTestObjConditionalAttr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    826826bool setJSTestObjConditionalAttr2(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    827827#endif
    828828#if ENABLE(Condition1) || ENABLE(Condition2)
    829 JSC::EncodedJSValue jsTestObjConditionalAttr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     829JSC::EncodedJSValue jsTestObjConditionalAttr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    830830bool setJSTestObjConditionalAttr3(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    831831#endif
    832832#if ENABLE(Condition1)
    833 JSC::EncodedJSValue jsTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     833JSC::EncodedJSValue jsTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    834834bool setJSTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    835835#endif
    836836#if ENABLE(Condition1) && ENABLE(Condition2)
    837 JSC::EncodedJSValue jsTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     837JSC::EncodedJSValue jsTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    838838bool setJSTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    839839#endif
    840840#if ENABLE(Condition1) || ENABLE(Condition2)
    841 JSC::EncodedJSValue jsTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     841JSC::EncodedJSValue jsTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    842842bool setJSTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    843843#endif
    844 JSC::EncodedJSValue jsTestObjCachedAttribute1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    845 JSC::EncodedJSValue jsTestObjCachedAttribute2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    846 JSC::EncodedJSValue jsTestObjAnyAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     844JSC::EncodedJSValue jsTestObjCachedAttribute1(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     845JSC::EncodedJSValue jsTestObjCachedAttribute2(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     846JSC::EncodedJSValue jsTestObjAnyAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    847847bool setJSTestObjAnyAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    848 JSC::EncodedJSValue jsTestObjContentDocument(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    849 JSC::EncodedJSValue jsTestObjMutablePoint(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     848JSC::EncodedJSValue jsTestObjContentDocument(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     849JSC::EncodedJSValue jsTestObjMutablePoint(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    850850bool setJSTestObjMutablePoint(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    851 JSC::EncodedJSValue jsTestObjImmutablePoint(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     851JSC::EncodedJSValue jsTestObjImmutablePoint(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    852852bool setJSTestObjImmutablePoint(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    853 JSC::EncodedJSValue jsTestObjStrawberry(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     853JSC::EncodedJSValue jsTestObjStrawberry(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    854854bool setJSTestObjStrawberry(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    855 JSC::EncodedJSValue jsTestObjStrictFloat(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     855JSC::EncodedJSValue jsTestObjStrictFloat(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    856856bool setJSTestObjStrictFloat(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    857 JSC::EncodedJSValue jsTestObjDescription(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    858 JSC::EncodedJSValue jsTestObjId(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     857JSC::EncodedJSValue jsTestObjDescription(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     858JSC::EncodedJSValue jsTestObjId(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    859859bool setJSTestObjId(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    860 JSC::EncodedJSValue jsTestObjHash(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    861 JSC::EncodedJSValue jsTestObjReplaceableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     860JSC::EncodedJSValue jsTestObjHash(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     861JSC::EncodedJSValue jsTestObjReplaceableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    862862bool setJSTestObjReplaceableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    863 JSC::EncodedJSValue jsTestObjNullableDoubleAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    864 JSC::EncodedJSValue jsTestObjNullableLongAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    865 JSC::EncodedJSValue jsTestObjNullableBooleanAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    866 JSC::EncodedJSValue jsTestObjNullableStringAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    867 JSC::EncodedJSValue jsTestObjNullableLongSettableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     863JSC::EncodedJSValue jsTestObjNullableDoubleAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     864JSC::EncodedJSValue jsTestObjNullableLongAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     865JSC::EncodedJSValue jsTestObjNullableBooleanAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     866JSC::EncodedJSValue jsTestObjNullableStringAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     867JSC::EncodedJSValue jsTestObjNullableLongSettableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    868868bool setJSTestObjNullableLongSettableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    869 JSC::EncodedJSValue jsTestObjNullableStringSettableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     869JSC::EncodedJSValue jsTestObjNullableStringSettableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    870870bool setJSTestObjNullableStringSettableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    871 JSC::EncodedJSValue jsTestObjNullableStringValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     871JSC::EncodedJSValue jsTestObjNullableStringValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    872872bool setJSTestObjNullableStringValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    873 JSC::EncodedJSValue jsTestObjAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    874 JSC::EncodedJSValue jsTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     873JSC::EncodedJSValue jsTestObjAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     874JSC::EncodedJSValue jsTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    875875bool setJSTestObjAttributeWithReservedEnumType(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    876 JSC::EncodedJSValue jsTestObjPutForwardsAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     876JSC::EncodedJSValue jsTestObjPutForwardsAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    877877bool setJSTestObjPutForwardsAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    878 JSC::EncodedJSValue jsTestObjPutForwardsNullableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     878JSC::EncodedJSValue jsTestObjPutForwardsNullableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    879879bool setJSTestObjPutForwardsNullableAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    880 JSC::EncodedJSValue jsTestObjConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     880JSC::EncodedJSValue jsTestObjConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    881881bool setJSTestObjConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    882882
    … …  
    13761376}
    13771377
    1378 EncodedJSValue jsTestObjReadOnlyLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1378EncodedJSValue jsTestObjReadOnlyLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    13791379{
    13801380    UNUSED_PARAM(state);
    … …  
    13911391
    13921392
    1393 EncodedJSValue jsTestObjReadOnlyStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1393EncodedJSValue jsTestObjReadOnlyStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    13941394{
    13951395    UNUSED_PARAM(state);
    … …  
    14061406
    14071407
    1408 EncodedJSValue jsTestObjReadOnlyTestObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1408EncodedJSValue jsTestObjReadOnlyTestObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    14091409{
    14101410    UNUSED_PARAM(state);
    … …  
    14211421
    14221422
    1423 EncodedJSValue jsTestObjConstructorStaticReadOnlyLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1423EncodedJSValue jsTestObjConstructorStaticReadOnlyLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    14241424{
    14251425    UNUSED_PARAM(state);
    … …  
    14301430
    14311431
    1432 EncodedJSValue jsTestObjConstructorStaticStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1432EncodedJSValue jsTestObjConstructorStaticStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    14331433{
    14341434    UNUSED_PARAM(state);
    … …  
    14391439
    14401440
    1441 EncodedJSValue jsTestObjConstructorTestSubObj(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1441EncodedJSValue jsTestObjConstructorTestSubObj(ExecState* state, EncodedJSValue thisValue, PropertyName)
    14421442{
    14431443    UNUSED_PARAM(state);
    … …  
    14521452
    14531453
    1454 EncodedJSValue jsTestObjTestSubObjEnabledBySettingConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1454EncodedJSValue jsTestObjTestSubObjEnabledBySettingConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    14551455{
    14561456    UNUSED_PARAM(state);
    … …  
    14701470
    14711471
    1472 EncodedJSValue jsTestObjEnumAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1472EncodedJSValue jsTestObjEnumAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    14731473{
    14741474    UNUSED_PARAM(state);
    … …  
    14851485
    14861486
    1487 EncodedJSValue jsTestObjByteAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1487EncodedJSValue jsTestObjByteAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    14881488{
    14891489    UNUSED_PARAM(state);
    … …  
    15001500
    15011501
    1502 EncodedJSValue jsTestObjOctetAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1502EncodedJSValue jsTestObjOctetAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    15031503{
    15041504    UNUSED_PARAM(state);
    … …  
    15151515
    15161516
    1517 EncodedJSValue jsTestObjShortAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1517EncodedJSValue jsTestObjShortAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    15181518{
    15191519    UNUSED_PARAM(state);
    … …  
    15301530
    15311531
    1532 EncodedJSValue jsTestObjClampedShortAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1532EncodedJSValue jsTestObjClampedShortAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    15331533{
    15341534    UNUSED_PARAM(state);
    … …  
    15451545
    15461546
    1547 EncodedJSValue jsTestObjEnforceRangeShortAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1547EncodedJSValue jsTestObjEnforceRangeShortAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    15481548{
    15491549    UNUSED_PARAM(state);
    … …  
    15601560
    15611561
    1562 EncodedJSValue jsTestObjUnsignedShortAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1562EncodedJSValue jsTestObjUnsignedShortAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    15631563{
    15641564    UNUSED_PARAM(state);
    … …  
    15751575
    15761576
    1577 EncodedJSValue jsTestObjLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1577EncodedJSValue jsTestObjLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    15781578{
    15791579    UNUSED_PARAM(state);
    … …  
    15901590
    15911591
    1592 EncodedJSValue jsTestObjLongLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1592EncodedJSValue jsTestObjLongLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    15931593{
    15941594    UNUSED_PARAM(state);
    … …  
    16051605
    16061606
    1607 EncodedJSValue jsTestObjUnsignedLongLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1607EncodedJSValue jsTestObjUnsignedLongLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    16081608{
    16091609    UNUSED_PARAM(state);
    … …  
    16201620
    16211621
    1622 EncodedJSValue jsTestObjStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1622EncodedJSValue jsTestObjStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    16231623{
    16241624    UNUSED_PARAM(state);
    … …  
    16351635
    16361636
    1637 EncodedJSValue jsTestObjTestObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1637EncodedJSValue jsTestObjTestObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    16381638{
    16391639    UNUSED_PARAM(state);
    … …  
    16501650
    16511651
    1652 EncodedJSValue jsTestObjTestNullableObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1652EncodedJSValue jsTestObjTestNullableObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    16531653{
    16541654    UNUSED_PARAM(state);
    … …  
    16651665
    16661666
    1667 EncodedJSValue jsTestObjLenientTestObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1667EncodedJSValue jsTestObjLenientTestObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    16681668{
    16691669    UNUSED_PARAM(state);
    … …  
    16801680
    16811681
    1682 EncodedJSValue jsTestObjUnforgeableAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1682EncodedJSValue jsTestObjUnforgeableAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    16831683{
    16841684    UNUSED_PARAM(state);
    … …  
    16951695
    16961696
    1697 EncodedJSValue jsTestObjStringAttrTreatingNullAsEmptyString(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1697EncodedJSValue jsTestObjStringAttrTreatingNullAsEmptyString(ExecState* state, EncodedJSValue thisValue, PropertyName)
    16981698{
    16991699    UNUSED_PARAM(state);
    … …  
    17101710
    17111711
    1712 EncodedJSValue jsTestObjXMLObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1712EncodedJSValue jsTestObjXMLObjAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    17131713{
    17141714    UNUSED_PARAM(state);
    … …  
    17251725
    17261726
    1727 EncodedJSValue jsTestObjCreate(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1727EncodedJSValue jsTestObjCreate(ExecState* state, EncodedJSValue thisValue, PropertyName)
    17281728{
    17291729    UNUSED_PARAM(state);
    … …  
    17401740
    17411741
    1742 EncodedJSValue jsTestObjReflectedStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1742EncodedJSValue jsTestObjReflectedStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    17431743{
    17441744    UNUSED_PARAM(state);
    … …  
    17551755
    17561756
    1757 EncodedJSValue jsTestObjReflectedIntegralAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1757EncodedJSValue jsTestObjReflectedIntegralAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    17581758{
    17591759    UNUSED_PARAM(state);
    … …  
    17701770
    17711771
    1772 EncodedJSValue jsTestObjReflectedUnsignedIntegralAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1772EncodedJSValue jsTestObjReflectedUnsignedIntegralAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    17731773{
    17741774    UNUSED_PARAM(state);
    … …  
    17851785
    17861786
    1787 EncodedJSValue jsTestObjReflectedBooleanAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1787EncodedJSValue jsTestObjReflectedBooleanAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    17881788{
    17891789    UNUSED_PARAM(state);
    … …  
    18001800
    18011801
    1802 EncodedJSValue jsTestObjReflectedURLAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1802EncodedJSValue jsTestObjReflectedURLAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    18031803{
    18041804    UNUSED_PARAM(state);
    … …  
    18151815
    18161816
    1817 EncodedJSValue jsTestObjReflectedStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1817EncodedJSValue jsTestObjReflectedStringAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    18181818{
    18191819    UNUSED_PARAM(state);
    … …  
    18301830
    18311831
    1832 EncodedJSValue jsTestObjReflectedCustomIntegralAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1832EncodedJSValue jsTestObjReflectedCustomIntegralAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    18331833{
    18341834    UNUSED_PARAM(state);
    … …  
    18451845
    18461846
    1847 EncodedJSValue jsTestObjReflectedCustomBooleanAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1847EncodedJSValue jsTestObjReflectedCustomBooleanAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    18481848{
    18491849    UNUSED_PARAM(state);
    … …  
    18601860
    18611861
    1862 EncodedJSValue jsTestObjReflectedCustomURLAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1862EncodedJSValue jsTestObjReflectedCustomURLAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    18631863{
    18641864    UNUSED_PARAM(state);
    … …  
    18761876
    18771877#if ENABLE(TEST_FEATURE)
    1878 EncodedJSValue jsTestObjEnabledAtRuntimeAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1878EncodedJSValue jsTestObjEnabledAtRuntimeAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    18791879{
    18801880    UNUSED_PARAM(state);
    … …  
    18921892#endif
    18931893
    1894 EncodedJSValue jsTestObjTypedArrayAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1894EncodedJSValue jsTestObjTypedArrayAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    18951895{
    18961896    UNUSED_PARAM(state);
    … …  
    19071907
    19081908
    1909 EncodedJSValue jsTestObjAttrWithGetterException(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1909EncodedJSValue jsTestObjAttrWithGetterException(ExecState* state, EncodedJSValue thisValue, PropertyName)
    19101910{
    19111911    UNUSED_PARAM(state);
    … …  
    19241924
    19251925
    1926 EncodedJSValue jsTestObjAttrWithGetterExceptionWithMessage(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1926EncodedJSValue jsTestObjAttrWithGetterExceptionWithMessage(ExecState* state, EncodedJSValue thisValue, PropertyName)
    19271927{
    19281928    UNUSED_PARAM(state);
    … …  
    19411941
    19421942
    1943 EncodedJSValue jsTestObjAttrWithSetterException(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1943EncodedJSValue jsTestObjAttrWithSetterException(ExecState* state, EncodedJSValue thisValue, PropertyName)
    19441944{
    19451945    UNUSED_PARAM(state);
    … …  
    19561956
    19571957
    1958 EncodedJSValue jsTestObjAttrWithSetterExceptionWithMessage(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1958EncodedJSValue jsTestObjAttrWithSetterExceptionWithMessage(ExecState* state, EncodedJSValue thisValue, PropertyName)
    19591959{
    19601960    UNUSED_PARAM(state);
    … …  
    19711971
    19721972
    1973 EncodedJSValue jsTestObjStringAttrWithGetterException(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1973EncodedJSValue jsTestObjStringAttrWithGetterException(ExecState* state, EncodedJSValue thisValue, PropertyName)
    19741974{
    19751975    UNUSED_PARAM(state);
    … …  
    19881988
    19891989
    1990 EncodedJSValue jsTestObjStringAttrWithSetterException(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     1990EncodedJSValue jsTestObjStringAttrWithSetterException(ExecState* state, EncodedJSValue thisValue, PropertyName)
    19911991{
    19921992    UNUSED_PARAM(state);
    … …  
    20032003
    20042004
    2005 EncodedJSValue jsTestObjStrictTypeCheckingAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2005EncodedJSValue jsTestObjStrictTypeCheckingAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    20062006{
    20072007    UNUSED_PARAM(state);
    … …  
    20182018
    20192019
    2020 EncodedJSValue jsTestObjCustomAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2020EncodedJSValue jsTestObjCustomAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    20212021{
    20222022    UNUSED_PARAM(state);
    … …  
    20312031
    20322032
    2033 EncodedJSValue jsTestObjOnfoo(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2033EncodedJSValue jsTestObjOnfoo(ExecState* state, EncodedJSValue thisValue, PropertyName)
    20342034{
    20352035    UNUSED_PARAM(state);
    … …  
    20452045
    20462046
    2047 EncodedJSValue jsTestObjOnwebkitfoo(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2047EncodedJSValue jsTestObjOnwebkitfoo(ExecState* state, EncodedJSValue thisValue, PropertyName)
    20482048{
    20492049    UNUSED_PARAM(state);
    … …  
    20592059
    20602060
    2061 EncodedJSValue jsTestObjWithScriptStateAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2061EncodedJSValue jsTestObjWithScriptStateAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    20622062{
    20632063    UNUSED_PARAM(state);
    … …  
    20742074
    20752075
    2076 EncodedJSValue jsTestObjWithCallWithAndSetterCallWithAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2076EncodedJSValue jsTestObjWithCallWithAndSetterCallWithAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    20772077{
    20782078    UNUSED_PARAM(state);
    … …  
    20892089
    20902090
    2091 EncodedJSValue jsTestObjWithScriptExecutionContextAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2091EncodedJSValue jsTestObjWithScriptExecutionContextAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    20922092{
    20932093    UNUSED_PARAM(state);
    … …  
    21072107
    21082108
    2109 EncodedJSValue jsTestObjWithScriptStateAttributeRaises(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2109EncodedJSValue jsTestObjWithScriptStateAttributeRaises(ExecState* state, EncodedJSValue thisValue, PropertyName)
    21102110{
    21112111    UNUSED_PARAM(state);
    … …  
    21242124
    21252125
    2126 EncodedJSValue jsTestObjWithScriptExecutionContextAttributeRaises(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2126EncodedJSValue jsTestObjWithScriptExecutionContextAttributeRaises(ExecState* state, EncodedJSValue thisValue, PropertyName)
    21272127{
    21282128    UNUSED_PARAM(state);
    … …  
    21442144
    21452145
    2146 EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2146EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    21472147{
    21482148    UNUSED_PARAM(state);
    … …  
    21622162
    21632163
    2164 EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2164EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises(ExecState* state, EncodedJSValue thisValue, PropertyName)
    21652165{
    21662166    UNUSED_PARAM(state);
    … …  
    21822182
    21832183
    2184 EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2184EncodedJSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    21852185{
    21862186    UNUSED_PARAM(state);
    … …  
    22002200
    22012201
    2202 EncodedJSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2202EncodedJSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    22032203{
    22042204    UNUSED_PARAM(state);
    … …  
    22162216
    22172217#if ENABLE(Condition1)
    2218 EncodedJSValue jsTestObjConditionalAttr1(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2218EncodedJSValue jsTestObjConditionalAttr1(ExecState* state, EncodedJSValue thisValue, PropertyName)
    22192219{
    22202220    UNUSED_PARAM(state);
    … …  
    22332233
    22342234#if ENABLE(Condition1) && ENABLE(Condition2)
    2235 EncodedJSValue jsTestObjConditionalAttr2(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2235EncodedJSValue jsTestObjConditionalAttr2(ExecState* state, EncodedJSValue thisValue, PropertyName)
    22362236{
    22372237    UNUSED_PARAM(state);
    … …  
    22502250
    22512251#if ENABLE(Condition1) || ENABLE(Condition2)
    2252 EncodedJSValue jsTestObjConditionalAttr3(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2252EncodedJSValue jsTestObjConditionalAttr3(ExecState* state, EncodedJSValue thisValue, PropertyName)
    22532253{
    22542254    UNUSED_PARAM(state);
    … …  
    22672267
    22682268#if ENABLE(Condition1)
    2269 EncodedJSValue jsTestObjConditionalAttr4Constructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2269EncodedJSValue jsTestObjConditionalAttr4Constructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    22702270{
    22712271    UNUSED_PARAM(state);
    … …  
    22822282
    22832283#if ENABLE(Condition1) && ENABLE(Condition2)
    2284 EncodedJSValue jsTestObjConditionalAttr5Constructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2284EncodedJSValue jsTestObjConditionalAttr5Constructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    22852285{
    22862286    UNUSED_PARAM(state);
    … …  
    22972297
    22982298#if ENABLE(Condition1) || ENABLE(Condition2)
    2299 EncodedJSValue jsTestObjConditionalAttr6Constructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2299EncodedJSValue jsTestObjConditionalAttr6Constructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    23002300{
    23012301    UNUSED_PARAM(state);
    … …  
    23112311#endif
    23122312
    2313 EncodedJSValue jsTestObjCachedAttribute1(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2313EncodedJSValue jsTestObjCachedAttribute1(ExecState* state, EncodedJSValue thisValue, PropertyName)
    23142314{
    23152315    UNUSED_PARAM(state);
    … …  
    23292329
    23302330
    2331 EncodedJSValue jsTestObjCachedAttribute2(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2331EncodedJSValue jsTestObjCachedAttribute2(ExecState* state, EncodedJSValue thisValue, PropertyName)
    23322332{
    23332333    UNUSED_PARAM(state);
    … …  
    23472347
    23482348
    2349 EncodedJSValue jsTestObjAnyAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2349EncodedJSValue jsTestObjAnyAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    23502350{
    23512351    UNUSED_PARAM(state);
    … …  
    23622362
    23632363
    2364 EncodedJSValue jsTestObjContentDocument(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2364EncodedJSValue jsTestObjContentDocument(ExecState* state, EncodedJSValue thisValue, PropertyName)
    23652365{
    23662366    UNUSED_PARAM(state);
    … …  
    23762376
    23772377
    2378 EncodedJSValue jsTestObjMutablePoint(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2378EncodedJSValue jsTestObjMutablePoint(ExecState* state, EncodedJSValue thisValue, PropertyName)
    23792379{
    23802380    UNUSED_PARAM(state);
    … …  
    23912391
    23922392
    2393 EncodedJSValue jsTestObjImmutablePoint(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2393EncodedJSValue jsTestObjImmutablePoint(ExecState* state, EncodedJSValue thisValue, PropertyName)
    23942394{
    23952395    UNUSED_PARAM(state);
    … …  
    24062406
    24072407
    2408 EncodedJSValue jsTestObjStrawberry(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2408EncodedJSValue jsTestObjStrawberry(ExecState* state, EncodedJSValue thisValue, PropertyName)
    24092409{
    24102410    UNUSED_PARAM(state);
    … …  
    24212421
    24222422
    2423 EncodedJSValue jsTestObjStrictFloat(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2423EncodedJSValue jsTestObjStrictFloat(ExecState* state, EncodedJSValue thisValue, PropertyName)
    24242424{
    24252425    UNUSED_PARAM(state);
    … …  
    24362436
    24372437
    2438 EncodedJSValue jsTestObjDescription(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2438EncodedJSValue jsTestObjDescription(ExecState* state, EncodedJSValue thisValue, PropertyName)
    24392439{
    24402440    UNUSED_PARAM(state);
    … …  
    24512451
    24522452
    2453 EncodedJSValue jsTestObjId(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2453EncodedJSValue jsTestObjId(ExecState* state, EncodedJSValue thisValue, PropertyName)
    24542454{
    24552455    UNUSED_PARAM(state);
    … …  
    24662466
    24672467
    2468 EncodedJSValue jsTestObjHash(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2468EncodedJSValue jsTestObjHash(ExecState* state, EncodedJSValue thisValue, PropertyName)
    24692469{
    24702470    UNUSED_PARAM(state);
    … …  
    24812481
    24822482
    2483 EncodedJSValue jsTestObjReplaceableAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2483EncodedJSValue jsTestObjReplaceableAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    24842484{
    24852485    UNUSED_PARAM(state);
    … …  
    24962496
    24972497
    2498 EncodedJSValue jsTestObjNullableDoubleAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2498EncodedJSValue jsTestObjNullableDoubleAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    24992499{
    25002500    UNUSED_PARAM(state);
    … …  
    25112511
    25122512
    2513 EncodedJSValue jsTestObjNullableLongAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2513EncodedJSValue jsTestObjNullableLongAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    25142514{
    25152515    UNUSED_PARAM(state);
    … …  
    25262526
    25272527
    2528 EncodedJSValue jsTestObjNullableBooleanAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2528EncodedJSValue jsTestObjNullableBooleanAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    25292529{
    25302530    UNUSED_PARAM(state);
    … …  
    25412541
    25422542
    2543 EncodedJSValue jsTestObjNullableStringAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2543EncodedJSValue jsTestObjNullableStringAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    25442544{
    25452545    UNUSED_PARAM(state);
    … …  
    25562556
    25572557
    2558 EncodedJSValue jsTestObjNullableLongSettableAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2558EncodedJSValue jsTestObjNullableLongSettableAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    25592559{
    25602560    UNUSED_PARAM(state);
    … …  
    25712571
    25722572
    2573 EncodedJSValue jsTestObjNullableStringSettableAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2573EncodedJSValue jsTestObjNullableStringSettableAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    25742574{
    25752575    UNUSED_PARAM(state);
    … …  
    25862586
    25872587
    2588 EncodedJSValue jsTestObjNullableStringValue(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2588EncodedJSValue jsTestObjNullableStringValue(ExecState* state, EncodedJSValue thisValue, PropertyName)
    25892589{
    25902590    UNUSED_PARAM(state);
    … …  
    26032603
    26042604
    2605 EncodedJSValue jsTestObjAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2605EncodedJSValue jsTestObjAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    26062606{
    26072607    UNUSED_PARAM(state);
    … …  
    26182618
    26192619
    2620 EncodedJSValue jsTestObjAttributeWithReservedEnumType(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2620EncodedJSValue jsTestObjAttributeWithReservedEnumType(ExecState* state, EncodedJSValue thisValue, PropertyName)
    26212621{
    26222622    UNUSED_PARAM(state);
    … …  
    26332633
    26342634
    2635 EncodedJSValue jsTestObjPutForwardsAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2635EncodedJSValue jsTestObjPutForwardsAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    26362636{
    26372637    UNUSED_PARAM(state);
    … …  
    26482648
    26492649
    2650 EncodedJSValue jsTestObjPutForwardsNullableAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2650EncodedJSValue jsTestObjPutForwardsNullableAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
    26512651{
    26522652    UNUSED_PARAM(state);
    … …  
    26632663
    26642664
    2665 EncodedJSValue jsTestObjConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     2665EncodedJSValue jsTestObjConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    26662666{
    26672667    JSTestObjPrototype* domObject = jsDynamicCast<JSTestObjPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp

    r201331 r201703  
    3636// Attributes
    3737
    38 JSC::EncodedJSValue jsTestOverloadedConstructorsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     38JSC::EncodedJSValue jsTestOverloadedConstructorsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    3939bool setJSTestOverloadedConstructorsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4040
    … …  
    200200}
    201201
    202 EncodedJSValue jsTestOverloadedConstructorsConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     202EncodedJSValue jsTestOverloadedConstructorsConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    203203{
    204204    JSTestOverloadedConstructorsPrototype* domObject = jsDynamicCast<JSTestOverloadedConstructorsPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp

    r201331 r201703  
    4242// Attributes
    4343
    44 JSC::EncodedJSValue jsTestOverrideBuiltinsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     44JSC::EncodedJSValue jsTestOverrideBuiltinsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4545bool setJSTestOverrideBuiltinsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4646
    … …  
    157157}
    158158
    159 EncodedJSValue jsTestOverrideBuiltinsConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     159EncodedJSValue jsTestOverrideBuiltinsConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    160160{
    161161    JSTestOverrideBuiltinsPrototype* domObject = jsDynamicCast<JSTestOverrideBuiltinsPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp

    r201387 r201703  
    3939// Attributes
    4040
    41 JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     41JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4242bool setJSTestSerializedScriptValueInterfaceValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    43 JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceReadonlyValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    44 JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceCachedValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     43JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceReadonlyValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     44JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceCachedValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4545bool setJSTestSerializedScriptValueInterfaceCachedValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    46 JSC::EncodedJSValue jsTestSerializedScriptValueInterfacePorts(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    47 JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceCachedReadonlyValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    48 JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     46JSC::EncodedJSValue jsTestSerializedScriptValueInterfacePorts(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     47JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceCachedReadonlyValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     48JSC::EncodedJSValue jsTestSerializedScriptValueInterfaceConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    4949bool setJSTestSerializedScriptValueInterfaceConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    5050
    … …  
    134134}
    135135
    136 EncodedJSValue jsTestSerializedScriptValueInterfaceValue(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     136EncodedJSValue jsTestSerializedScriptValueInterfaceValue(ExecState* state, EncodedJSValue thisValue, PropertyName)
    137137{
    138138    UNUSED_PARAM(state);
    … …  
    149149
    150150
    151 EncodedJSValue jsTestSerializedScriptValueInterfaceReadonlyValue(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     151EncodedJSValue jsTestSerializedScriptValueInterfaceReadonlyValue(ExecState* state, EncodedJSValue thisValue, PropertyName)
    152152{
    153153    UNUSED_PARAM(state);
    … …  
    164164
    165165
    166 EncodedJSValue jsTestSerializedScriptValueInterfaceCachedValue(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     166EncodedJSValue jsTestSerializedScriptValueInterfaceCachedValue(ExecState* state, EncodedJSValue thisValue, PropertyName)
    167167{
    168168    UNUSED_PARAM(state);
    … …  
    182182
    183183
    184 EncodedJSValue jsTestSerializedScriptValueInterfacePorts(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     184EncodedJSValue jsTestSerializedScriptValueInterfacePorts(ExecState* state, EncodedJSValue thisValue, PropertyName)
    185185{
    186186    UNUSED_PARAM(state);
    … …  
    197197
    198198
    199 EncodedJSValue jsTestSerializedScriptValueInterfaceCachedReadonlyValue(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     199EncodedJSValue jsTestSerializedScriptValueInterfaceCachedReadonlyValue(ExecState* state, EncodedJSValue thisValue, PropertyName)
    200200{
    201201    UNUSED_PARAM(state);
    … …  
    215215
    216216
    217 EncodedJSValue jsTestSerializedScriptValueInterfaceConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     217EncodedJSValue jsTestSerializedScriptValueInterfaceConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    218218{
    219219    JSTestSerializedScriptValueInterfacePrototype* domObject = jsDynamicCast<JSTestSerializedScriptValueInterfacePrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp

    r201387 r201703  
    6161// Attributes
    6262
    63 JSC::EncodedJSValue jsTestTypedefsUnsignedLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     63JSC::EncodedJSValue jsTestTypedefsUnsignedLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    6464bool setJSTestTypedefsUnsignedLongLongAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    65 JSC::EncodedJSValue jsTestTypedefsImmutableSerializedScriptValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     65JSC::EncodedJSValue jsTestTypedefsImmutableSerializedScriptValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    6666bool setJSTestTypedefsImmutableSerializedScriptValue(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    67 JSC::EncodedJSValue jsTestTypedefsConstructorTestSubObj(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    68 JSC::EncodedJSValue jsTestTypedefsAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     67JSC::EncodedJSValue jsTestTypedefsConstructorTestSubObj(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     68JSC::EncodedJSValue jsTestTypedefsAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    6969bool setJSTestTypedefsAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    70 JSC::EncodedJSValue jsTestTypedefsAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     70JSC::EncodedJSValue jsTestTypedefsAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    7171bool setJSTestTypedefsAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    72 JSC::EncodedJSValue jsTestTypedefsStringAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     72JSC::EncodedJSValue jsTestTypedefsStringAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    7373bool setJSTestTypedefsStringAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    74 JSC::EncodedJSValue jsTestTypedefsStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     74JSC::EncodedJSValue jsTestTypedefsStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    7575bool setJSTestTypedefsStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    76 JSC::EncodedJSValue jsTestTypedefsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     76JSC::EncodedJSValue jsTestTypedefsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    7777bool setJSTestTypedefsConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    7878
    … …  
    219219}
    220220
    221 EncodedJSValue jsTestTypedefsUnsignedLongLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     221EncodedJSValue jsTestTypedefsUnsignedLongLongAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
    222222{
    223223    UNUSED_PARAM(state);
    … …  
    234234
    235235
    236 EncodedJSValue jsTestTypedefsImmutableSerializedScriptValue(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     236EncodedJSValue jsTestTypedefsImmutableSerializedScriptValue(ExecState* state, EncodedJSValue thisValue, PropertyName)
    237237{
    238238    UNUSED_PARAM(state);
    … …  
    249249
    250250
    251 EncodedJSValue jsTestTypedefsConstructorTestSubObj(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     251EncodedJSValue jsTestTypedefsConstructorTestSubObj(ExecState* state, EncodedJSValue thisValue, PropertyName)
    252252{
    253253    UNUSED_PARAM(state);
    … …  
    262262
    263263
    264 EncodedJSValue jsTestTypedefsAttrWithGetterException(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     264EncodedJSValue jsTestTypedefsAttrWithGetterException(ExecState* state, EncodedJSValue thisValue, PropertyName)
    265265{
    266266    UNUSED_PARAM(state);
    … …  
    279279
    280280
    281 EncodedJSValue jsTestTypedefsAttrWithSetterException(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     281EncodedJSValue jsTestTypedefsAttrWithSetterException(ExecState* state, EncodedJSValue thisValue, PropertyName)
    282282{
    283283    UNUSED_PARAM(state);
    … …  
    294294
    295295
    296 EncodedJSValue jsTestTypedefsStringAttrWithGetterException(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     296EncodedJSValue jsTestTypedefsStringAttrWithGetterException(ExecState* state, EncodedJSValue thisValue, PropertyName)
    297297{
    298298    UNUSED_PARAM(state);
    … …  
    311311
    312312
    313 EncodedJSValue jsTestTypedefsStringAttrWithSetterException(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     313EncodedJSValue jsTestTypedefsStringAttrWithSetterException(ExecState* state, EncodedJSValue thisValue, PropertyName)
    314314{
    315315    UNUSED_PARAM(state);
    … …  
    326326
    327327
    328 EncodedJSValue jsTestTypedefsConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     328EncodedJSValue jsTestTypedefsConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    329329{
    330330    JSTestTypedefsPrototype* domObject = jsDynamicCast<JSTestTypedefsPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp

    r201387 r201703  
    3535// Attributes
    3636
    37 JSC::EncodedJSValue jsattributeReadonly(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    38 JSC::EncodedJSValue jsattributeConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     37JSC::EncodedJSValue jsattributeReadonly(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     38JSC::EncodedJSValue jsattributeConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    3939bool setJSattributeConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    4040
    … …  
    142142}
    143143
    144 EncodedJSValue jsattributeReadonly(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     144EncodedJSValue jsattributeReadonly(ExecState* state, EncodedJSValue thisValue, PropertyName)
    145145{
    146146    UNUSED_PARAM(state);
    … …  
    157157
    158158
    159 EncodedJSValue jsattributeConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     159EncodedJSValue jsattributeConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    160160{
    161161    JSattributePrototype* domObject = jsDynamicCast<JSattributePrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp

    r201331 r201703  
    3333// Attributes
    3434
    35 JSC::EncodedJSValue jsreadonlyConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     35JSC::EncodedJSValue jsreadonlyConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    3636bool setJSreadonlyConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    3737
    … …  
    116116}
    117117
    118 EncodedJSValue jsreadonlyConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName, JSObject*)
     118EncodedJSValue jsreadonlyConstructor(ExecState* state, EncodedJSValue thisValue, PropertyName)
    119119{
    120120    JSreadonlyPrototype* domObject = jsDynamicCast<JSreadonlyPrototype*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bridge/runtime_array.cpp

    r201322 r201703  
    6161}
    6262
    63 EncodedJSValue RuntimeArray::lengthGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     63EncodedJSValue RuntimeArray::lengthGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    6464{
    6565    RuntimeArray* thisObject = jsDynamicCast<RuntimeArray*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bridge/runtime_array.h

    r201322 r201703  
    8484private:
    8585    RuntimeArray(ExecState*, Structure*);
    86     static EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, PropertyName, JSObject*);
     86    static EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, PropertyName);
    8787
    8888    BindingsArray* m_array;

  • trunk/Source/WebCore/bridge/runtime_method.cpp

    r201322 r201703  
    5555}
    5656
    57 EncodedJSValue RuntimeMethod::lengthGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName, JSObject*)
     57EncodedJSValue RuntimeMethod::lengthGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    5858{
    5959    RuntimeMethod* thisObject = jsDynamicCast<RuntimeMethod*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bridge/runtime_method.h

    r201322 r201703  
    6767
    6868private:
    69     static EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, PropertyName, JSObject*);
     69    static EncodedJSValue lengthGetter(ExecState*, EncodedJSValue, PropertyName);
    7070
    7171    Bindings::Method* m_method;

  • trunk/Source/WebCore/bridge/runtime_object.cpp

    r201322 r201703  
    6363}
    6464
    65 EncodedJSValue RuntimeObject::fallbackObjectGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject*)
     65EncodedJSValue RuntimeObject::fallbackObjectGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
    6666{
    6767    RuntimeObject* thisObj = jsCast<RuntimeObject*>(JSValue::decode(thisValue));
    … …  
    8181}
    8282
    83 EncodedJSValue RuntimeObject::fieldGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject*)
     83EncodedJSValue RuntimeObject::fieldGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
    8484{   
    8585    RuntimeObject* thisObj = jsCast<RuntimeObject*>(JSValue::decode(thisValue));
    … …  
    100100}
    101101
    102 EncodedJSValue RuntimeObject::methodGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject*)
     102EncodedJSValue RuntimeObject::methodGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
    103103{
    104104    RuntimeObject* thisObj = jsCast<RuntimeObject*>(JSValue::decode(thisValue));

  • trunk/Source/WebCore/bridge/runtime_object.h

    r201322 r201703  
    7979
    8080private:
    81     static EncodedJSValue fallbackObjectGetter(ExecState*, EncodedJSValue, PropertyName, JSObject*);
    82     static EncodedJSValue fieldGetter(ExecState*, EncodedJSValue, PropertyName, JSObject*);
    83     static EncodedJSValue methodGetter(ExecState*, EncodedJSValue, PropertyName, JSObject*);
     81    static EncodedJSValue fallbackObjectGetter(ExecState*, EncodedJSValue, PropertyName);
     82    static EncodedJSValue fieldGetter(ExecState*, EncodedJSValue, PropertyName);
     83    static EncodedJSValue methodGetter(ExecState*, EncodedJSValue, PropertyName);
    8484
    8585    RefPtr<Instance> m_instance;

  • trunk/Source/WebKit2/ChangeLog

    r201695 r201703  
     12016-06-05  Yusuke Suzuki  <utatane.tea@gmail.com>
     2
     3        Change ProxyObject.[[Get]] not to use custom accessor
     4        https://bugs.webkit.org/show_bug.cgi?id=157080
     5
     6        Reviewed by Darin Adler.
     7
     8        * WebProcess/Plugins/Netscape/JSNPObject.cpp:
     9        (WebKit::JSNPObject::propertyGetter):
     10        (WebKit::JSNPObject::methodGetter):
     11        * WebProcess/Plugins/Netscape/JSNPObject.h:
     12
    1132016-06-05  Brady Eidson  <beidson@apple.com>
    214

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp

    r201322 r201703  
    436436}
    437437
    438 EncodedJSValue JSNPObject::propertyGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject*)
     438EncodedJSValue JSNPObject::propertyGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
    439439{
    440440    JSNPObject* thisObj = jsCast<JSNPObject*>(JSValue::decode(thisValue));
    … …  
    476476}
    477477
    478 EncodedJSValue JSNPObject::methodGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName, JSObject*)
     478EncodedJSValue JSNPObject::methodGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
    479479{
    480480    JSNPObject* thisObj = jsCast<JSNPObject*>(JSValue::decode(thisValue));

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h

    r201322 r201703  
    9595    static void getOwnPropertyNames(JSC::JSObject*, JSC::ExecState*, JSC::PropertyNameArray&, JSC::EnumerationMode);
    9696
    97     static JSC::EncodedJSValue propertyGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
    98     static JSC::EncodedJSValue methodGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName, JSC::JSObject*);
     97    static JSC::EncodedJSValue propertyGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
     98    static JSC::EncodedJSValue methodGetter(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
    9999    static JSC::JSObject* throwInvalidAccessError(JSC::ExecState*);
    100100
Note: See TracChangeset for help on using the changeset viewer.