Changeset 166493 in webkit


Ignore:
Timestamp:
Mar 31, 2014 3:43:22 AM (10 years ago)
Author:
Dániel Bátyai
Message:

Remove hostThisRegister() and hostThisValue()
​https://bugs.webkit.org/show_bug.cgi?id=130895

Reviewed by Geoffrey Garen.

Removed hostThisRegister() and hostThisValue() and instead use thisArgumentOffset() and thisValue() respectively.

Source/JavaScriptCore:

  • API/APICallbackFunction.h:

(JSC::APICallbackFunction::call):

  • API/JSCallbackObjectFunctions.h:

(JSC::JSCallbackObject<Parent>::call):

  • dfg/DFGOSREntry.cpp:

(JSC::DFG::prepareOSREntry):

  • inspector/JSInjectedScriptHostPrototype.cpp:

(Inspector::jsInjectedScriptHostPrototypeAttributeEvaluate):
(Inspector::jsInjectedScriptHostPrototypeFunctionInternalConstructorName):
(Inspector::jsInjectedScriptHostPrototypeFunctionIsHTMLAllCollection):
(Inspector::jsInjectedScriptHostPrototypeFunctionType):
(Inspector::jsInjectedScriptHostPrototypeFunctionFunctionDetails):
(Inspector::jsInjectedScriptHostPrototypeFunctionGetInternalProperties):

  • inspector/JSJavaScriptCallFramePrototype.cpp:

(Inspector::jsJavaScriptCallFramePrototypeFunctionEvaluate):
(Inspector::jsJavaScriptCallFramePrototypeFunctionScopeType):
(Inspector::jsJavaScriptCallFrameAttributeCaller):
(Inspector::jsJavaScriptCallFrameAttributeSourceID):
(Inspector::jsJavaScriptCallFrameAttributeLine):
(Inspector::jsJavaScriptCallFrameAttributeColumn):
(Inspector::jsJavaScriptCallFrameAttributeFunctionName):
(Inspector::jsJavaScriptCallFrameAttributeScopeChain):
(Inspector::jsJavaScriptCallFrameAttributeThisObject):
(Inspector::jsJavaScriptCallFrameAttributeType):

  • interpreter/CallFrame.h:

(JSC::ExecState::hostThisRegister): Deleted.
(JSC::ExecState::hostThisValue): Deleted.

  • runtime/Arguments.cpp:

(JSC::argumentsFuncIterator):

  • runtime/ArrayPrototype.cpp:

(JSC::arrayProtoFuncToString):
(JSC::arrayProtoFuncToLocaleString):
(JSC::arrayProtoFuncJoin):
(JSC::arrayProtoFuncConcat):
(JSC::arrayProtoFuncPop):
(JSC::arrayProtoFuncPush):
(JSC::arrayProtoFuncReverse):
(JSC::arrayProtoFuncShift):
(JSC::arrayProtoFuncSlice):
(JSC::arrayProtoFuncSort):
(JSC::arrayProtoFuncSplice):
(JSC::arrayProtoFuncUnShift):
(JSC::arrayProtoFuncReduce):
(JSC::arrayProtoFuncReduceRight):
(JSC::arrayProtoFuncIndexOf):
(JSC::arrayProtoFuncLastIndexOf):
(JSC::arrayProtoFuncValues):
(JSC::arrayProtoFuncEntries):
(JSC::arrayProtoFuncKeys):

  • runtime/BooleanPrototype.cpp:

(JSC::booleanProtoFuncToString):
(JSC::booleanProtoFuncValueOf):

  • runtime/ConsolePrototype.cpp:

(JSC::consoleLogWithLevel):
(JSC::consoleProtoFuncClear):
(JSC::consoleProtoFuncDir):
(JSC::consoleProtoFuncDirXML):
(JSC::consoleProtoFuncTable):
(JSC::consoleProtoFuncTrace):
(JSC::consoleProtoFuncAssert):
(JSC::consoleProtoFuncCount):
(JSC::consoleProtoFuncProfile):
(JSC::consoleProtoFuncProfileEnd):
(JSC::consoleProtoFuncTime):
(JSC::consoleProtoFuncTimeEnd):
(JSC::consoleProtoFuncTimeStamp):
(JSC::consoleProtoFuncGroup):
(JSC::consoleProtoFuncGroupCollapsed):
(JSC::consoleProtoFuncGroupEnd):

  • runtime/DatePrototype.cpp:

(JSC::formateDateInstance):
(JSC::dateProtoFuncToISOString):
(JSC::dateProtoFuncToLocaleString):
(JSC::dateProtoFuncToLocaleDateString):
(JSC::dateProtoFuncToLocaleTimeString):
(JSC::dateProtoFuncGetTime):
(JSC::dateProtoFuncGetFullYear):
(JSC::dateProtoFuncGetUTCFullYear):
(JSC::dateProtoFuncGetMonth):
(JSC::dateProtoFuncGetUTCMonth):
(JSC::dateProtoFuncGetDate):
(JSC::dateProtoFuncGetUTCDate):
(JSC::dateProtoFuncGetDay):
(JSC::dateProtoFuncGetUTCDay):
(JSC::dateProtoFuncGetHours):
(JSC::dateProtoFuncGetUTCHours):
(JSC::dateProtoFuncGetMinutes):
(JSC::dateProtoFuncGetUTCMinutes):
(JSC::dateProtoFuncGetSeconds):
(JSC::dateProtoFuncGetUTCSeconds):
(JSC::dateProtoFuncGetMilliSeconds):
(JSC::dateProtoFuncGetUTCMilliseconds):
(JSC::dateProtoFuncGetTimezoneOffset):
(JSC::dateProtoFuncSetTime):
(JSC::setNewValueFromTimeArgs):
(JSC::setNewValueFromDateArgs):
(JSC::dateProtoFuncSetYear):
(JSC::dateProtoFuncGetYear):
(JSC::dateProtoFuncToJSON):

  • runtime/ErrorPrototype.cpp:

(JSC::errorProtoFuncToString):

  • runtime/FunctionPrototype.cpp:

(JSC::functionProtoFuncToString):
(JSC::functionProtoFuncBind):

  • runtime/NamePrototype.cpp:

(JSC::privateNameProtoFuncToString):

  • runtime/NumberPrototype.cpp:

(JSC::numberProtoFuncToExponential):
(JSC::numberProtoFuncToFixed):
(JSC::numberProtoFuncToPrecision):
(JSC::numberProtoFuncClz):
(JSC::numberProtoFuncToString):
(JSC::numberProtoFuncToLocaleString):
(JSC::numberProtoFuncValueOf):

  • runtime/ObjectPrototype.cpp:

(JSC::objectProtoFuncValueOf):
(JSC::objectProtoFuncHasOwnProperty):
(JSC::objectProtoFuncIsPrototypeOf):
(JSC::objectProtoFuncDefineGetter):
(JSC::objectProtoFuncDefineSetter):
(JSC::objectProtoFuncLookupGetter):
(JSC::objectProtoFuncLookupSetter):
(JSC::objectProtoFuncPropertyIsEnumerable):
(JSC::objectProtoFuncToLocaleString):
(JSC::objectProtoFuncToString):

  • runtime/RegExpPrototype.cpp:

(JSC::regExpProtoFuncTest):
(JSC::regExpProtoFuncExec):
(JSC::regExpProtoFuncCompile):
(JSC::regExpProtoFuncToString):

  • runtime/StringPrototype.cpp:

(JSC::stringProtoFuncReplace):
(JSC::stringProtoFuncToString):
(JSC::stringProtoFuncCharAt):
(JSC::stringProtoFuncCharCodeAt):
(JSC::stringProtoFuncConcat):
(JSC::stringProtoFuncIndexOf):
(JSC::stringProtoFuncLastIndexOf):
(JSC::stringProtoFuncMatch):
(JSC::stringProtoFuncSearch):
(JSC::stringProtoFuncSlice):
(JSC::stringProtoFuncSplit):
(JSC::stringProtoFuncSubstr):
(JSC::stringProtoFuncSubstring):
(JSC::stringProtoFuncToLowerCase):
(JSC::stringProtoFuncToUpperCase):
(JSC::stringProtoFuncLocaleCompare):
(JSC::stringProtoFuncBig):
(JSC::stringProtoFuncSmall):
(JSC::stringProtoFuncBlink):
(JSC::stringProtoFuncBold):
(JSC::stringProtoFuncFixed):
(JSC::stringProtoFuncItalics):
(JSC::stringProtoFuncStrike):
(JSC::stringProtoFuncSub):
(JSC::stringProtoFuncSup):
(JSC::stringProtoFuncFontcolor):
(JSC::stringProtoFuncFontsize):
(JSC::stringProtoFuncAnchor):
(JSC::stringProtoFuncLink):
(JSC::stringProtoFuncTrim):
(JSC::stringProtoFuncTrimLeft):
(JSC::stringProtoFuncTrimRight):

Source/WebCore:

No new tests, no behavior changes.

  • bindings/js/JSNavigatorCustom.cpp:

(WebCore::JSNavigator::webkitGetUserMedia):

  • bindings/js/JSPluginElementFunctions.cpp:

(WebCore::callPlugin):

  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):

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

(WebCore::jsFloat64ArrayPrototypeFunctionFoo):
(WebCore::jsFloat64ArrayPrototypeFunctionSet):

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

(WebCore::jsTestActiveDOMObjectPrototypeFunctionExcitingFunction):
(WebCore::jsTestActiveDOMObjectPrototypeFunctionPostMessage):

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

(WebCore::jsTestCustomNamedGetterPrototypeFunctionAnotherFunction):

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

(WebCore::jsTestEventTargetPrototypeFunctionItem):
(WebCore::jsTestEventTargetPrototypeFunctionAddEventListener):
(WebCore::jsTestEventTargetPrototypeFunctionRemoveEventListener):
(WebCore::jsTestEventTargetPrototypeFunctionDispatchEvent):

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

(WebCore::jsTestInterfacePrototypeFunctionImplementsMethod1):
(WebCore::jsTestInterfacePrototypeFunctionImplementsMethod2):
(WebCore::jsTestInterfacePrototypeFunctionImplementsMethod3):
(WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod1):
(WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod2):
(WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod3):

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

(WebCore::jsTestMediaQueryListListenerPrototypeFunctionMethod):

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

(WebCore::jsTestObjPrototypeFunctionVoidMethod):
(WebCore::jsTestObjPrototypeFunctionVoidMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionByteMethod):
(WebCore::jsTestObjPrototypeFunctionByteMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionOctetMethod):
(WebCore::jsTestObjPrototypeFunctionOctetMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionLongMethod):
(WebCore::jsTestObjPrototypeFunctionLongMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionObjMethod):
(WebCore::jsTestObjPrototypeFunctionObjMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionMethodWithSequenceArg):
(WebCore::jsTestObjPrototypeFunctionMethodReturningSequence):
(WebCore::jsTestObjPrototypeFunctionMethodWithEnumArg):
(WebCore::jsTestObjPrototypeFunctionMethodThatRequiresAllArgsAndThrows):
(WebCore::jsTestObjPrototypeFunctionSerializedValue):
(WebCore::jsTestObjPrototypeFunctionOptionsObject):
(WebCore::jsTestObjPrototypeFunctionMethodWithException):
(WebCore::jsTestObjPrototypeFunctionCustomMethod):
(WebCore::jsTestObjPrototypeFunctionCustomMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionAddEventListener):
(WebCore::jsTestObjPrototypeFunctionRemoveEventListener):
(WebCore::jsTestObjPrototypeFunctionWithScriptStateVoid):
(WebCore::jsTestObjPrototypeFunctionWithScriptStateObj):
(WebCore::jsTestObjPrototypeFunctionWithScriptStateVoidException):
(WebCore::jsTestObjPrototypeFunctionWithScriptStateObjException):
(WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContext):
(WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptState):
(WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException):
(WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces):
(WebCore::jsTestObjPrototypeFunctionWithScriptArgumentsAndCallStack):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalString):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefined):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsNullString):
(WebCore::jsTestObjPrototypeFunctionMethodWithCallbackArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg):
(WebCore::jsTestObjPrototypeFunctionConditionalMethod1):
(WebCore::jsTestObjPrototypeFunctionConditionalMethod2):
(WebCore::jsTestObjPrototypeFunctionConditionalMethod3):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod1):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod2):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod3):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod4):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod5):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod6):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod7):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod8):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod9):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod10):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod11):
(WebCore::jsTestObjPrototypeFunctionClassMethodWithClamp):
(WebCore::jsTestObjPrototypeFunctionMethodWithUnsignedLongSequence):
(WebCore::jsTestObjPrototypeFunctionStringArrayFunction):
(WebCore::jsTestObjPrototypeFunctionDomStringListFunction):
(WebCore::jsTestObjPrototypeFunctionGetSVGDocument):
(WebCore::jsTestObjPrototypeFunctionConvert1):
(WebCore::jsTestObjPrototypeFunctionConvert2):
(WebCore::jsTestObjPrototypeFunctionConvert4):
(WebCore::jsTestObjPrototypeFunctionConvert5):
(WebCore::jsTestObjPrototypeFunctionMutablePointFunction):
(WebCore::jsTestObjPrototypeFunctionImmutablePointFunction):
(WebCore::jsTestObjPrototypeFunctionOrange):
(WebCore::jsTestObjPrototypeFunctionStrictFunction):
(WebCore::jsTestObjPrototypeFunctionStrictFunctionWithSequence):
(WebCore::jsTestObjPrototypeFunctionStrictFunctionWithArray):
(WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):
(WebCore::jsTestObjPrototypeFunctionAny):

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

(WebCore::jsTestTypedefsPrototypeFunctionFunc):
(WebCore::jsTestTypedefsPrototypeFunctionSetShadow):
(WebCore::jsTestTypedefsPrototypeFunctionMethodWithSequenceArg):
(WebCore::jsTestTypedefsPrototypeFunctionNullableArrayArg):
(WebCore::jsTestTypedefsPrototypeFunctionFuncWithClamp):
(WebCore::jsTestTypedefsPrototypeFunctionImmutablePointFunction):
(WebCore::jsTestTypedefsPrototypeFunctionStringArrayFunction):
(WebCore::jsTestTypedefsPrototypeFunctionStringArrayFunction2):
(WebCore::jsTestTypedefsPrototypeFunctionCallWithSequenceThatRequiresInclude):
(WebCore::jsTestTypedefsPrototypeFunctionMethodWithException):

  • bridge/objc/objc_runtime.mm:

(JSC::Bindings::callObjCFallbackObject):

  • bridge/runtime_method.cpp:

(JSC::callRuntimeMethod):

Source/WebKit2:

  • WebProcess/Plugins/Netscape/JSNPMethod.cpp:

(WebKit::callMethod):

Location:
trunk/Source
Files:
35 edited

Legend:

Unmodified
Added
Removed

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

    r165074 r166493  
    4747    JSContextRef execRef = toRef(exec);
    4848    JSObjectRef functionRef = toRef(exec->callee());
    49     JSObjectRef thisObjRef = toRef(jsCast<JSObject*>(exec->hostThisValue().toThis(exec, NotStrictMode)));
     49    JSObjectRef thisObjRef = toRef(jsCast<JSObject*>(exec->thisValue().toThis(exec, NotStrictMode)));
    5050
    5151    int argumentCount = static_cast<int>(exec->argumentCount());

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

    r165676 r166493  
    473473    JSContextRef execRef = toRef(exec);
    474474    JSObjectRef functionRef = toRef(exec->callee());
    475     JSObjectRef thisObjRef = toRef(jsCast<JSObject*>(exec->hostThisValue().toThis(exec, NotStrictMode)));
     475    JSObjectRef thisObjRef = toRef(jsCast<JSObject*>(exec->thisValue().toThis(exec, NotStrictMode)));
    476476   
    477477    for (JSClassRef jsClass = jsCast<JSCallbackObject<Parent>*>(toJS(functionRef))->classRef(); jsClass; jsClass = jsClass->parentClass) {

  • trunk/Source/JavaScriptCore/ChangeLog

    r166463 r166493  
     12014-03-31  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
     2
     3        Remove hostThisRegister() and hostThisValue()
     4        https://bugs.webkit.org/show_bug.cgi?id=130895
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        Removed hostThisRegister() and hostThisValue() and instead use thisArgumentOffset() and thisValue() respectively.
     9
     10        * API/APICallbackFunction.h:
     11        (JSC::APICallbackFunction::call):
     12        * API/JSCallbackObjectFunctions.h:
     13        (JSC::JSCallbackObject<Parent>::call):
     14        * dfg/DFGOSREntry.cpp:
     15        (JSC::DFG::prepareOSREntry):
     16        * inspector/JSInjectedScriptHostPrototype.cpp:
     17        (Inspector::jsInjectedScriptHostPrototypeAttributeEvaluate):
     18        (Inspector::jsInjectedScriptHostPrototypeFunctionInternalConstructorName):
     19        (Inspector::jsInjectedScriptHostPrototypeFunctionIsHTMLAllCollection):
     20        (Inspector::jsInjectedScriptHostPrototypeFunctionType):
     21        (Inspector::jsInjectedScriptHostPrototypeFunctionFunctionDetails):
     22        (Inspector::jsInjectedScriptHostPrototypeFunctionGetInternalProperties):
     23        * inspector/JSJavaScriptCallFramePrototype.cpp:
     24        (Inspector::jsJavaScriptCallFramePrototypeFunctionEvaluate):
     25        (Inspector::jsJavaScriptCallFramePrototypeFunctionScopeType):
     26        (Inspector::jsJavaScriptCallFrameAttributeCaller):
     27        (Inspector::jsJavaScriptCallFrameAttributeSourceID):
     28        (Inspector::jsJavaScriptCallFrameAttributeLine):
     29        (Inspector::jsJavaScriptCallFrameAttributeColumn):
     30        (Inspector::jsJavaScriptCallFrameAttributeFunctionName):
     31        (Inspector::jsJavaScriptCallFrameAttributeScopeChain):
     32        (Inspector::jsJavaScriptCallFrameAttributeThisObject):
     33        (Inspector::jsJavaScriptCallFrameAttributeType):
     34        * interpreter/CallFrame.h:
     35        (JSC::ExecState::hostThisRegister): Deleted.
     36        (JSC::ExecState::hostThisValue): Deleted.
     37        * runtime/Arguments.cpp:
     38        (JSC::argumentsFuncIterator):
     39        * runtime/ArrayPrototype.cpp:
     40        (JSC::arrayProtoFuncToString):
     41        (JSC::arrayProtoFuncToLocaleString):
     42        (JSC::arrayProtoFuncJoin):
     43        (JSC::arrayProtoFuncConcat):
     44        (JSC::arrayProtoFuncPop):
     45        (JSC::arrayProtoFuncPush):
     46        (JSC::arrayProtoFuncReverse):
     47        (JSC::arrayProtoFuncShift):
     48        (JSC::arrayProtoFuncSlice):
     49        (JSC::arrayProtoFuncSort):
     50        (JSC::arrayProtoFuncSplice):
     51        (JSC::arrayProtoFuncUnShift):
     52        (JSC::arrayProtoFuncReduce):
     53        (JSC::arrayProtoFuncReduceRight):
     54        (JSC::arrayProtoFuncIndexOf):
     55        (JSC::arrayProtoFuncLastIndexOf):
     56        (JSC::arrayProtoFuncValues):
     57        (JSC::arrayProtoFuncEntries):
     58        (JSC::arrayProtoFuncKeys):
     59        * runtime/BooleanPrototype.cpp:
     60        (JSC::booleanProtoFuncToString):
     61        (JSC::booleanProtoFuncValueOf):
     62        * runtime/ConsolePrototype.cpp:
     63        (JSC::consoleLogWithLevel):
     64        (JSC::consoleProtoFuncClear):
     65        (JSC::consoleProtoFuncDir):
     66        (JSC::consoleProtoFuncDirXML):
     67        (JSC::consoleProtoFuncTable):
     68        (JSC::consoleProtoFuncTrace):
     69        (JSC::consoleProtoFuncAssert):
     70        (JSC::consoleProtoFuncCount):
     71        (JSC::consoleProtoFuncProfile):
     72        (JSC::consoleProtoFuncProfileEnd):
     73        (JSC::consoleProtoFuncTime):
     74        (JSC::consoleProtoFuncTimeEnd):
     75        (JSC::consoleProtoFuncTimeStamp):
     76        (JSC::consoleProtoFuncGroup):
     77        (JSC::consoleProtoFuncGroupCollapsed):
     78        (JSC::consoleProtoFuncGroupEnd):
     79        * runtime/DatePrototype.cpp:
     80        (JSC::formateDateInstance):
     81        (JSC::dateProtoFuncToISOString):
     82        (JSC::dateProtoFuncToLocaleString):
     83        (JSC::dateProtoFuncToLocaleDateString):
     84        (JSC::dateProtoFuncToLocaleTimeString):
     85        (JSC::dateProtoFuncGetTime):
     86        (JSC::dateProtoFuncGetFullYear):
     87        (JSC::dateProtoFuncGetUTCFullYear):
     88        (JSC::dateProtoFuncGetMonth):
     89        (JSC::dateProtoFuncGetUTCMonth):
     90        (JSC::dateProtoFuncGetDate):
     91        (JSC::dateProtoFuncGetUTCDate):
     92        (JSC::dateProtoFuncGetDay):
     93        (JSC::dateProtoFuncGetUTCDay):
     94        (JSC::dateProtoFuncGetHours):
     95        (JSC::dateProtoFuncGetUTCHours):
     96        (JSC::dateProtoFuncGetMinutes):
     97        (JSC::dateProtoFuncGetUTCMinutes):
     98        (JSC::dateProtoFuncGetSeconds):
     99        (JSC::dateProtoFuncGetUTCSeconds):
     100        (JSC::dateProtoFuncGetMilliSeconds):
     101        (JSC::dateProtoFuncGetUTCMilliseconds):
     102        (JSC::dateProtoFuncGetTimezoneOffset):
     103        (JSC::dateProtoFuncSetTime):
     104        (JSC::setNewValueFromTimeArgs):
     105        (JSC::setNewValueFromDateArgs):
     106        (JSC::dateProtoFuncSetYear):
     107        (JSC::dateProtoFuncGetYear):
     108        (JSC::dateProtoFuncToJSON):
     109        * runtime/ErrorPrototype.cpp:
     110        (JSC::errorProtoFuncToString):
     111        * runtime/FunctionPrototype.cpp:
     112        (JSC::functionProtoFuncToString):
     113        (JSC::functionProtoFuncBind):
     114        * runtime/NamePrototype.cpp:
     115        (JSC::privateNameProtoFuncToString):
     116        * runtime/NumberPrototype.cpp:
     117        (JSC::numberProtoFuncToExponential):
     118        (JSC::numberProtoFuncToFixed):
     119        (JSC::numberProtoFuncToPrecision):
     120        (JSC::numberProtoFuncClz):
     121        (JSC::numberProtoFuncToString):
     122        (JSC::numberProtoFuncToLocaleString):
     123        (JSC::numberProtoFuncValueOf):
     124        * runtime/ObjectPrototype.cpp:
     125        (JSC::objectProtoFuncValueOf):
     126        (JSC::objectProtoFuncHasOwnProperty):
     127        (JSC::objectProtoFuncIsPrototypeOf):
     128        (JSC::objectProtoFuncDefineGetter):
     129        (JSC::objectProtoFuncDefineSetter):
     130        (JSC::objectProtoFuncLookupGetter):
     131        (JSC::objectProtoFuncLookupSetter):
     132        (JSC::objectProtoFuncPropertyIsEnumerable):
     133        (JSC::objectProtoFuncToLocaleString):
     134        (JSC::objectProtoFuncToString):
     135        * runtime/RegExpPrototype.cpp:
     136        (JSC::regExpProtoFuncTest):
     137        (JSC::regExpProtoFuncExec):
     138        (JSC::regExpProtoFuncCompile):
     139        (JSC::regExpProtoFuncToString):
     140        * runtime/StringPrototype.cpp:
     141        (JSC::stringProtoFuncReplace):
     142        (JSC::stringProtoFuncToString):
     143        (JSC::stringProtoFuncCharAt):
     144        (JSC::stringProtoFuncCharCodeAt):
     145        (JSC::stringProtoFuncConcat):
     146        (JSC::stringProtoFuncIndexOf):
     147        (JSC::stringProtoFuncLastIndexOf):
     148        (JSC::stringProtoFuncMatch):
     149        (JSC::stringProtoFuncSearch):
     150        (JSC::stringProtoFuncSlice):
     151        (JSC::stringProtoFuncSplit):
     152        (JSC::stringProtoFuncSubstr):
     153        (JSC::stringProtoFuncSubstring):
     154        (JSC::stringProtoFuncToLowerCase):
     155        (JSC::stringProtoFuncToUpperCase):
     156        (JSC::stringProtoFuncLocaleCompare):
     157        (JSC::stringProtoFuncBig):
     158        (JSC::stringProtoFuncSmall):
     159        (JSC::stringProtoFuncBlink):
     160        (JSC::stringProtoFuncBold):
     161        (JSC::stringProtoFuncFixed):
     162        (JSC::stringProtoFuncItalics):
     163        (JSC::stringProtoFuncStrike):
     164        (JSC::stringProtoFuncSub):
     165        (JSC::stringProtoFuncSup):
     166        (JSC::stringProtoFuncFontcolor):
     167        (JSC::stringProtoFuncFontsize):
     168        (JSC::stringProtoFuncAnchor):
     169        (JSC::stringProtoFuncLink):
     170        (JSC::stringProtoFuncTrim):
     171        (JSC::stringProtoFuncTrimLeft):
     172        (JSC::stringProtoFuncTrimRight):
     173
    11742014-03-28  Filip Pizlo  <fpizlo@apple.com>
    2175

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

    r164229 r166493  
    131131        JSValue value;
    132132        if (!argument)
    133             value = exec->hostThisValue();
     133            value = exec->thisValue();
    134134        else
    135135            value = exec->argument(argument - 1);

  • trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp

    r165982 r166493  
    7272EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeAttributeEvaluate(ExecState* exec)
    7373{
    74     JSValue thisValue = exec->hostThisValue();
     74    JSValue thisValue = exec->thisValue();
    7575    JSInjectedScriptHost* castedThis = jsDynamicCast<JSInjectedScriptHost*>(thisValue);
    7676    if (!castedThis)
    … …  
    8383EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionInternalConstructorName(ExecState* exec)
    8484{
    85     JSValue thisValue = exec->hostThisValue();
     85    JSValue thisValue = exec->thisValue();
    8686    JSInjectedScriptHost* castedThis = jsDynamicCast<JSInjectedScriptHost*>(thisValue);
    8787    if (!castedThis)
    … …  
    9494EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionIsHTMLAllCollection(ExecState* exec)
    9595{
    96     JSValue thisValue = exec->hostThisValue();
     96    JSValue thisValue = exec->thisValue();
    9797    JSInjectedScriptHost* castedThis = jsDynamicCast<JSInjectedScriptHost*>(thisValue);
    9898    if (!castedThis)
    … …  
    105105EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionType(ExecState* exec)
    106106{
    107     JSValue thisValue = exec->hostThisValue();
     107    JSValue thisValue = exec->thisValue();
    108108    JSInjectedScriptHost* castedThis = jsDynamicCast<JSInjectedScriptHost*>(thisValue);
    109109    if (!castedThis)
    … …  
    116116EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionFunctionDetails(ExecState* exec)
    117117{
    118     JSValue thisValue = exec->hostThisValue();
     118    JSValue thisValue = exec->thisValue();
    119119    JSInjectedScriptHost* castedThis = jsDynamicCast<JSInjectedScriptHost*>(thisValue);
    120120    if (!castedThis)
    … …  
    127127EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionGetInternalProperties(ExecState* exec)
    128128{
    129     JSValue thisValue = exec->hostThisValue();
     129    JSValue thisValue = exec->thisValue();
    130130    JSInjectedScriptHost* castedThis = jsDynamicCast<JSInjectedScriptHost*>(thisValue);
    131131    if (!castedThis)

  • trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFramePrototype.cpp

    r165982 r166493  
    9999EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFramePrototypeFunctionEvaluate(ExecState* exec)
    100100{
    101     JSValue thisValue = exec->hostThisValue();
     101    JSValue thisValue = exec->thisValue();
    102102    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    103103    if (!castedThis)
    … …  
    110110EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFramePrototypeFunctionScopeType(ExecState* exec)
    111111{
    112     JSValue thisValue = exec->hostThisValue();
     112    JSValue thisValue = exec->thisValue();
    113113    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    114114    if (!castedThis)
    … …  
    121121EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeCaller(ExecState* exec)
    122122{
    123     JSValue thisValue = exec->hostThisValue();
     123    JSValue thisValue = exec->thisValue();
    124124    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    125125    if (!castedThis)
    … …  
    132132EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeSourceID(ExecState* exec)
    133133{
    134     JSValue thisValue = exec->hostThisValue();
     134    JSValue thisValue = exec->thisValue();
    135135    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    136136    if (!castedThis)
    … …  
    143143EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeLine(ExecState* exec)
    144144{
    145     JSValue thisValue = exec->hostThisValue();
     145    JSValue thisValue = exec->thisValue();
    146146    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    147147    if (!castedThis)
    … …  
    154154EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeColumn(ExecState* exec)
    155155{
    156     JSValue thisValue = exec->hostThisValue();
     156    JSValue thisValue = exec->thisValue();
    157157    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    158158    if (!castedThis)
    … …  
    165165EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeFunctionName(ExecState* exec)
    166166{
    167     JSValue thisValue = exec->hostThisValue();
     167    JSValue thisValue = exec->thisValue();
    168168    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    169169    if (!castedThis)
    … …  
    176176EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeScopeChain(ExecState* exec)
    177177{
    178     JSValue thisValue = exec->hostThisValue();
     178    JSValue thisValue = exec->thisValue();
    179179    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    180180    if (!castedThis)
    … …  
    187187EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeThisObject(ExecState* exec)
    188188{
    189     JSValue thisValue = exec->hostThisValue();
     189    JSValue thisValue = exec->thisValue();
    190190    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    191191    if (!castedThis)
    … …  
    198198EncodedJSValue JSC_HOST_CALL jsJavaScriptCallFrameAttributeType(ExecState* exec)
    199199{
    200     JSValue thisValue = exec->hostThisValue();
     200    JSValue thisValue = exec->thisValue();
    201201    JSJavaScriptCallFrame* castedThis = jsDynamicCast<JSJavaScriptCallFrame*>(thisValue);
    202202    if (!castedThis)

  • trunk/Source/JavaScriptCore/interpreter/CallFrame.h

    r165999 r166493  
    265265        static int offsetFor(size_t argumentCountIncludingThis) { return argumentCountIncludingThis + JSStack::ThisArgument - 1; }
    266266
    267         // FIXME: Remove these.
    268         int hostThisRegister() { return thisArgumentOffset(); }
    269         JSValue hostThisValue() { return thisValue(); }
    270 
    271267        static CallFrame* noCaller() { return 0; }
    272268

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

    r164764 r166493  
    378378EncodedJSValue JSC_HOST_CALL argumentsFuncIterator(ExecState* exec)
    379379{
    380     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     380    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    381381    Arguments* arguments = jsDynamicCast<Arguments*>(thisObj);
    382382    if (!arguments)

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

    r164764 r166493  
    269269EncodedJSValue JSC_HOST_CALL arrayProtoFuncToString(ExecState* exec)
    270270{
    271     JSValue thisValue = exec->hostThisValue().toThis(exec, StrictMode);
     271    JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
    272272
    273273    // 1. Let array be the result of calling ToObject on the this value.
    … …  
    327327EncodedJSValue JSC_HOST_CALL arrayProtoFuncToLocaleString(ExecState* exec)
    328328{
    329     JSValue thisValue = exec->hostThisValue().toThis(exec, StrictMode);
     329    JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
    330330
    331331    JSObject* thisObj = thisValue.toObject(exec);
    … …  
    370370EncodedJSValue JSC_HOST_CALL arrayProtoFuncJoin(ExecState* exec)
    371371{
    372     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     372    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    373373    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    374374    if (exec->hadException())
    … …  
    416416EncodedJSValue JSC_HOST_CALL arrayProtoFuncConcat(ExecState* exec)
    417417{
    418     JSValue thisValue = exec->hostThisValue().toThis(exec, StrictMode);
     418    JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
    419419    JSArray* arr = constructEmptyArray(exec, nullptr);
    420420    unsigned n = 0;
    … …  
    451451EncodedJSValue JSC_HOST_CALL arrayProtoFuncPop(ExecState* exec)
    452452{
    453     JSValue thisValue = exec->hostThisValue().toThis(exec, StrictMode);
     453    JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
    454454
    455455    if (isJSArray(thisValue))
    … …  
    480480EncodedJSValue JSC_HOST_CALL arrayProtoFuncPush(ExecState* exec)
    481481{
    482     JSValue thisValue = exec->hostThisValue().toThis(exec, StrictMode);
     482    JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
    483483
    484484    if (isJSArray(thisValue) && exec->argumentCount() == 1) {
    … …  
    513513EncodedJSValue JSC_HOST_CALL arrayProtoFuncReverse(ExecState* exec)
    514514{
    515     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     515    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    516516    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    517517    if (exec->hadException())
    … …  
    551551EncodedJSValue JSC_HOST_CALL arrayProtoFuncShift(ExecState* exec)
    552552{
    553     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     553    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    554554    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    555555    if (exec->hadException())
    … …  
    573573{
    574574    // http://developer.netscape.com/docs/manuals/js/client/jsref/array.htm#1193713 or 15.4.4.10
    575     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     575    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    576576    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    577577    if (exec->hadException())
    … …  
    681681EncodedJSValue JSC_HOST_CALL arrayProtoFuncSort(ExecState* exec)
    682682{
    683     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     683    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    684684    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    685685    if (!length || exec->hadException())
    … …  
    756756    // 15.4.4.12
    757757
    758     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     758    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    759759    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    760760    if (exec->hadException())
    … …  
    814814    // 15.4.4.13
    815815
    816     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     816    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    817817    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    818818    if (exec->hadException())
    … …  
    837837EncodedJSValue JSC_HOST_CALL arrayProtoFuncReduce(ExecState* exec)
    838838{
    839     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     839    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    840840    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    841841    if (exec->hadException())
    … …  
    914914EncodedJSValue JSC_HOST_CALL arrayProtoFuncReduceRight(ExecState* exec)
    915915{
    916     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     916    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    917917    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    918918    if (exec->hadException())
    … …  
    991991{
    992992    // 15.4.4.14
    993     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     993    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    994994    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    995995    if (exec->hadException())
    … …  
    10141014{
    10151015    // 15.4.4.15
    1016     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     1016    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    10171017    unsigned length = thisObj->get(exec, exec->propertyNames().length).toUInt32(exec);
    10181018    if (!length)
    … …  
    10491049EncodedJSValue JSC_HOST_CALL arrayProtoFuncValues(ExecState* exec)
    10501050{
    1051     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     1051    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    10521052    return JSValue::encode(JSArrayIterator::create(exec, exec->callee()->globalObject()->arrayIteratorStructure(), ArrayIterateValue, thisObj));
    10531053}
    … …  
    10551055EncodedJSValue JSC_HOST_CALL arrayProtoFuncEntries(ExecState* exec)
    10561056{
    1057     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     1057    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    10581058    return JSValue::encode(JSArrayIterator::create(exec, exec->callee()->globalObject()->arrayIteratorStructure(), ArrayIterateKeyValue, thisObj));
    10591059}
    … …  
    10611061EncodedJSValue JSC_HOST_CALL arrayProtoFuncKeys(ExecState* exec)
    10621062{
    1063     JSObject* thisObj = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     1063    JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    10641064    return JSValue::encode(JSArrayIterator::create(exec, exec->callee()->globalObject()->arrayIteratorStructure(), ArrayIterateKey, thisObj));
    10651065}

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

    r163844 r166493  
    7474{
    7575    VM* vm = &exec->vm();
    76     JSValue thisValue = exec->hostThisValue();
     76    JSValue thisValue = exec->thisValue();
    7777    if (thisValue == jsBoolean(false))
    7878        return JSValue::encode(vm->smallStrings.falseString());
    … …  
    9393EncodedJSValue JSC_HOST_CALL booleanProtoFuncValueOf(ExecState* exec)
    9494{
    95     JSValue thisValue = exec->hostThisValue();
     95    JSValue thisValue = exec->thisValue();
    9696    if (thisValue.isBoolean())
    9797        return JSValue::encode(thisValue);

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

    r166439 r166493  
    100100static EncodedJSValue consoleLogWithLevel(ExecState* exec, MessageLevel level)
    101101{
    102     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     102    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    103103    if (!castedThis)
    104104        return throwVMTypeError(exec);
    … …  
    135135static EncodedJSValue JSC_HOST_CALL consoleProtoFuncClear(ExecState* exec)
    136136{
    137     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     137    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    138138    if (!castedThis)
    139139        return throwVMTypeError(exec);
    … …  
    150150static EncodedJSValue JSC_HOST_CALL consoleProtoFuncDir(ExecState* exec)
    151151{
    152     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     152    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    153153    if (!castedThis)
    154154        return throwVMTypeError(exec);
    … …  
    165165static EncodedJSValue JSC_HOST_CALL consoleProtoFuncDirXML(ExecState* exec)
    166166{
    167     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     167    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    168168    if (!castedThis)
    169169        return throwVMTypeError(exec);
    … …  
    180180static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTable(ExecState* exec)
    181181{
    182     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     182    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    183183    if (!castedThis)
    184184        return throwVMTypeError(exec);
    … …  
    195195static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTrace(ExecState* exec)
    196196{
    197     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     197    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    198198    if (!castedThis)
    199199        return throwVMTypeError(exec);
    … …  
    210210static EncodedJSValue JSC_HOST_CALL consoleProtoFuncAssert(ExecState* exec)
    211211{
    212     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     212    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    213213    if (!castedThis)
    214214        return throwVMTypeError(exec);
    … …  
    229229static EncodedJSValue JSC_HOST_CALL consoleProtoFuncCount(ExecState* exec)
    230230{
    231     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     231    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    232232    if (!castedThis)
    233233        return throwVMTypeError(exec);
    … …  
    244244static EncodedJSValue JSC_HOST_CALL consoleProtoFuncProfile(ExecState* exec)
    245245{
    246     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     246    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    247247    if (!castedThis)
    248248        return throwVMTypeError(exec);
    … …  
    268268static EncodedJSValue JSC_HOST_CALL consoleProtoFuncProfileEnd(ExecState* exec)
    269269{
    270     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     270    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    271271    if (!castedThis)
    272272        return throwVMTypeError(exec);
    … …  
    292292static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTime(ExecState* exec)
    293293{
    294     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     294    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    295295    if (!castedThis)
    296296        return throwVMTypeError(exec);
    … …  
    313313static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTimeEnd(ExecState* exec)
    314314{
    315     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     315    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    316316    if (!castedThis)
    317317        return throwVMTypeError(exec);
    … …  
    334334static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTimeStamp(ExecState* exec)
    335335{
    336     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     336    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    337337    if (!castedThis)
    338338        return throwVMTypeError(exec);
    … …  
    349349static EncodedJSValue JSC_HOST_CALL consoleProtoFuncGroup(ExecState* exec)
    350350{
    351     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     351    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    352352    if (!castedThis)
    353353        return throwVMTypeError(exec);
    … …  
    364364static EncodedJSValue JSC_HOST_CALL consoleProtoFuncGroupCollapsed(ExecState* exec)
    365365{
    366     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     366    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    367367    if (!castedThis)
    368368        return throwVMTypeError(exec);
    … …  
    379379static EncodedJSValue JSC_HOST_CALL consoleProtoFuncGroupEnd(ExecState* exec)
    380380{
    381     JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->hostThisValue());
     381    JSConsole* castedThis = jsDynamicCast<JSConsole*>(exec->thisValue());
    382382    if (!castedThis)
    383383        return throwVMTypeError(exec);

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

    r165703 r166493  
    320320static EncodedJSValue formateDateInstance(ExecState* exec, DateTimeFormat format, bool asUTCVariant)
    321321{
    322     JSValue thisValue = exec->hostThisValue();
     322    JSValue thisValue = exec->thisValue();
    323323    if (!thisValue.inherits(DateInstance::info()))
    324324        return throwVMTypeError(exec);
    … …  
    515515EncodedJSValue JSC_HOST_CALL dateProtoFuncToISOString(ExecState* exec)
    516516{
    517     JSValue thisValue = exec->hostThisValue();
     517    JSValue thisValue = exec->thisValue();
    518518    if (!thisValue.inherits(DateInstance::info()))
    519519        return throwVMTypeError(exec);
    … …  
    561561EncodedJSValue JSC_HOST_CALL dateProtoFuncToLocaleString(ExecState* exec)
    562562{
    563     JSValue thisValue = exec->hostThisValue();
     563    JSValue thisValue = exec->thisValue();
    564564    if (!thisValue.inherits(DateInstance::info()))
    565565        return throwVMTypeError(exec);
    … …  
    571571EncodedJSValue JSC_HOST_CALL dateProtoFuncToLocaleDateString(ExecState* exec)
    572572{
    573     JSValue thisValue = exec->hostThisValue();
     573    JSValue thisValue = exec->thisValue();
    574574    if (!thisValue.inherits(DateInstance::info()))
    575575        return throwVMTypeError(exec);
    … …  
    581581EncodedJSValue JSC_HOST_CALL dateProtoFuncToLocaleTimeString(ExecState* exec)
    582582{
    583     JSValue thisValue = exec->hostThisValue();
     583    JSValue thisValue = exec->thisValue();
    584584    if (!thisValue.inherits(DateInstance::info()))
    585585        return throwVMTypeError(exec);
    … …  
    591591EncodedJSValue JSC_HOST_CALL dateProtoFuncGetTime(ExecState* exec)
    592592{
    593     JSValue thisValue = exec->hostThisValue();
     593    JSValue thisValue = exec->thisValue();
    594594    if (!thisValue.inherits(DateInstance::info()))
    595595        return throwVMTypeError(exec);
    … …  
    600600EncodedJSValue JSC_HOST_CALL dateProtoFuncGetFullYear(ExecState* exec)
    601601{
    602     JSValue thisValue = exec->hostThisValue();
     602    JSValue thisValue = exec->thisValue();
    603603    if (!thisValue.inherits(DateInstance::info()))
    604604        return throwVMTypeError(exec);
    … …  
    614614EncodedJSValue JSC_HOST_CALL dateProtoFuncGetUTCFullYear(ExecState* exec)
    615615{
    616     JSValue thisValue = exec->hostThisValue();
     616    JSValue thisValue = exec->thisValue();
    617617    if (!thisValue.inherits(DateInstance::info()))
    618618        return throwVMTypeError(exec);
    … …  
    634634EncodedJSValue JSC_HOST_CALL dateProtoFuncGetMonth(ExecState* exec)
    635635{
    636     JSValue thisValue = exec->hostThisValue();
     636    JSValue thisValue = exec->thisValue();
    637637    if (!thisValue.inherits(DateInstance::info()))
    638638        return throwVMTypeError(exec);
    … …  
    648648EncodedJSValue JSC_HOST_CALL dateProtoFuncGetUTCMonth(ExecState* exec)
    649649{
    650     JSValue thisValue = exec->hostThisValue();
     650    JSValue thisValue = exec->thisValue();
    651651    if (!thisValue.inherits(DateInstance::info()))
    652652        return throwVMTypeError(exec);
    … …  
    662662EncodedJSValue JSC_HOST_CALL dateProtoFuncGetDate(ExecState* exec)
    663663{
    664     JSValue thisValue = exec->hostThisValue();
     664    JSValue thisValue = exec->thisValue();
    665665    if (!thisValue.inherits(DateInstance::info()))
    666666        return throwVMTypeError(exec);
    … …  
    676676EncodedJSValue JSC_HOST_CALL dateProtoFuncGetUTCDate(ExecState* exec)
    677677{
    678     JSValue thisValue = exec->hostThisValue();
     678    JSValue thisValue = exec->thisValue();
    679679    if (!thisValue.inherits(DateInstance::info()))
    680680        return throwVMTypeError(exec);
    … …  
    690690EncodedJSValue JSC_HOST_CALL dateProtoFuncGetDay(ExecState* exec)
    691691{
    692     JSValue thisValue = exec->hostThisValue();
     692    JSValue thisValue = exec->thisValue();
    693693    if (!thisValue.inherits(DateInstance::info()))
    694694        return throwVMTypeError(exec);
    … …  
    704704EncodedJSValue JSC_HOST_CALL dateProtoFuncGetUTCDay(ExecState* exec)
    705705{
    706     JSValue thisValue = exec->hostThisValue();
     706    JSValue thisValue = exec->thisValue();
    707707    if (!thisValue.inherits(DateInstance::info()))
    708708        return throwVMTypeError(exec);
    … …  
    718718EncodedJSValue JSC_HOST_CALL dateProtoFuncGetHours(ExecState* exec)
    719719{
    720     JSValue thisValue = exec->hostThisValue();
     720    JSValue thisValue = exec->thisValue();
    721721    if (!thisValue.inherits(DateInstance::info()))
    722722        return throwVMTypeError(exec);
    … …  
    732732EncodedJSValue JSC_HOST_CALL dateProtoFuncGetUTCHours(ExecState* exec)
    733733{
    734     JSValue thisValue = exec->hostThisValue();
     734    JSValue thisValue = exec->thisValue();
    735735    if (!thisValue.inherits(DateInstance::info()))
    736736        return throwVMTypeError(exec);
    … …  
    746746EncodedJSValue JSC_HOST_CALL dateProtoFuncGetMinutes(ExecState* exec)
    747747{
    748     JSValue thisValue = exec->hostThisValue();
     748    JSValue thisValue = exec->thisValue();
    749749    if (!thisValue.inherits(DateInstance::info()))
    750750        return throwVMTypeError(exec);
    … …  
    760760EncodedJSValue JSC_HOST_CALL dateProtoFuncGetUTCMinutes(ExecState* exec)
    761761{
    762     JSValue thisValue = exec->hostThisValue();
     762    JSValue thisValue = exec->thisValue();
    763763    if (!thisValue.inherits(DateInstance::info()))
    764764        return throwVMTypeError(exec);
    … …  
    774774EncodedJSValue JSC_HOST_CALL dateProtoFuncGetSeconds(ExecState* exec)
    775775{
    776     JSValue thisValue = exec->hostThisValue();
     776    JSValue thisValue = exec->thisValue();
    777777    if (!thisValue.inherits(DateInstance::info()))
    778778        return throwVMTypeError(exec);
    … …  
    788788EncodedJSValue JSC_HOST_CALL dateProtoFuncGetUTCSeconds(ExecState* exec)
    789789{
    790     JSValue thisValue = exec->hostThisValue();
     790    JSValue thisValue = exec->thisValue();
    791791    if (!thisValue.inherits(DateInstance::info()))
    792792        return throwVMTypeError(exec);
    … …  
    802802EncodedJSValue JSC_HOST_CALL dateProtoFuncGetMilliSeconds(ExecState* exec)
    803803{
    804     JSValue thisValue = exec->hostThisValue();
     804    JSValue thisValue = exec->thisValue();
    805805    if (!thisValue.inherits(DateInstance::info()))
    806806        return throwVMTypeError(exec);
    … …  
    818818EncodedJSValue JSC_HOST_CALL dateProtoFuncGetUTCMilliseconds(ExecState* exec)
    819819{
    820     JSValue thisValue = exec->hostThisValue();
     820    JSValue thisValue = exec->thisValue();
    821821    if (!thisValue.inherits(DateInstance::info()))
    822822        return throwVMTypeError(exec);
    … …  
    834834EncodedJSValue JSC_HOST_CALL dateProtoFuncGetTimezoneOffset(ExecState* exec)
    835835{
    836     JSValue thisValue = exec->hostThisValue();
     836    JSValue thisValue = exec->thisValue();
    837837    if (!thisValue.inherits(DateInstance::info()))
    838838        return throwVMTypeError(exec);
    … …  
    848848EncodedJSValue JSC_HOST_CALL dateProtoFuncSetTime(ExecState* exec)
    849849{
    850     JSValue thisValue = exec->hostThisValue();
     850    JSValue thisValue = exec->thisValue();
    851851    if (!thisValue.inherits(DateInstance::info()))
    852852        return throwVMTypeError(exec);
    … …  
    862862static EncodedJSValue setNewValueFromTimeArgs(ExecState* exec, int numArgsToUse, bool inputIsUTC)
    863863{
    864     JSValue thisValue = exec->hostThisValue();
     864    JSValue thisValue = exec->thisValue();
    865865    if (!thisValue.inherits(DateInstance::info()))
    866866        return throwVMTypeError(exec);
    … …  
    900900static EncodedJSValue setNewValueFromDateArgs(ExecState* exec, int numArgsToUse, bool inputIsUTC)
    901901{
    902     JSValue thisValue = exec->hostThisValue();
     902    JSValue thisValue = exec->thisValue();
    903903    if (!thisValue.inherits(DateInstance::info()))
    904904        return throwVMTypeError(exec);
    … …  
    10251025EncodedJSValue JSC_HOST_CALL dateProtoFuncSetYear(ExecState* exec)
    10261026{
    1027     JSValue thisValue = exec->hostThisValue();
     1027    JSValue thisValue = exec->thisValue();
    10281028    if (!thisValue.inherits(DateInstance::info()))
    10291029        return throwVMTypeError(exec);
    … …  
    10671067EncodedJSValue JSC_HOST_CALL dateProtoFuncGetYear(ExecState* exec)
    10681068{
    1069     JSValue thisValue = exec->hostThisValue();
     1069    JSValue thisValue = exec->thisValue();
    10701070    if (!thisValue.inherits(DateInstance::info()))
    10711071        return throwVMTypeError(exec);
    … …  
    10831083EncodedJSValue JSC_HOST_CALL dateProtoFuncToJSON(ExecState* exec)
    10841084{
    1085     JSValue thisValue = exec->hostThisValue();
     1085    JSValue thisValue = exec->thisValue();
    10861086    JSObject* object = jsCast<JSObject*>(thisValue.toThis(exec, NotStrictMode));
    10871087    if (exec->hadException())

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

    r163844 r166493  
    7373{
    7474    // 1. Let O be the this value.
    75     JSValue thisValue = exec->hostThisValue();
     75    JSValue thisValue = exec->thisValue();
    7676
    7777    // 2. If Type(O) is not Object, throw a TypeError exception.

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

    r164835 r166493  
    103103EncodedJSValue JSC_HOST_CALL functionProtoFuncToString(ExecState* exec)
    104104{
    105     JSValue thisValue = exec->hostThisValue();
     105    JSValue thisValue = exec->thisValue();
    106106    if (thisValue.inherits(JSFunction::info())) {
    107107        JSFunction* function = jsCast<JSFunction*>(thisValue);
    … …  
    128128
    129129    // Let Target be the this value.
    130     JSValue target = exec->hostThisValue();
     130    JSValue target = exec->thisValue();
    131131
    132132    // If IsCallable(Target) is false, throw a TypeError exception.

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

    r163844 r166493  
    6868EncodedJSValue JSC_HOST_CALL privateNameProtoFuncToString(ExecState* exec)
    6969{
    70     JSValue thisValue = exec->hostThisValue();
     70    JSValue thisValue = exec->thisValue();
    7171    if (!thisValue.isObject())
    7272        return throwVMTypeError(exec);

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

    r165047 r166493  
    368368{
    369369    double x;
    370     if (!toThisNumber(exec->hostThisValue(), x))
     370    if (!toThisNumber(exec->thisValue(), x))
    371371        return throwVMTypeError(exec);
    372372
    … …  
    399399{
    400400    double x;
    401     if (!toThisNumber(exec->hostThisValue(), x))
     401    if (!toThisNumber(exec->thisValue(), x))
    402402        return throwVMTypeError(exec);
    403403
    … …  
    432432{
    433433    double x;
    434     if (!toThisNumber(exec->hostThisValue(), x))
     434    if (!toThisNumber(exec->thisValue(), x))
    435435        return throwVMTypeError(exec);
    436436
    … …  
    470470{
    471471    double x;
    472     if (!toThisNumber(exec->hostThisValue(), x))
     472    if (!toThisNumber(exec->thisValue(), x))
    473473        return throwVMTypeError(exec);
    474474
    … …  
    524524{
    525525    double doubleValue;
    526     if (!toThisNumber(exec->hostThisValue(), doubleValue))
     526    if (!toThisNumber(exec->thisValue(), doubleValue))
    527527        return throwVMTypeError(exec);
    528528
    … …  
    550550{
    551551    double x;
    552     if (!toThisNumber(exec->hostThisValue(), x))
     552    if (!toThisNumber(exec->thisValue(), x))
    553553        return throwVMTypeError(exec);
    554554
    … …  
    559559{
    560560    double x;
    561     if (!toThisNumber(exec->hostThisValue(), x))
     561    if (!toThisNumber(exec->thisValue(), x))
    562562        return throwVMTypeError(exec);
    563563    return JSValue::encode(jsNumber(x));

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

    r165703 r166493  
    7979EncodedJSValue JSC_HOST_CALL objectProtoFuncValueOf(ExecState* exec)
    8080{
    81     JSValue thisValue = exec->hostThisValue().toThis(exec, StrictMode);
     81    JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
    8282    return JSValue::encode(thisValue.toObject(exec));
    8383}
    … …  
    8585EncodedJSValue JSC_HOST_CALL objectProtoFuncHasOwnProperty(ExecState* exec)
    8686{
    87     JSValue thisValue = exec->hostThisValue().toThis(exec, StrictMode);
     87    JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
    8888    return JSValue::encode(jsBoolean(thisValue.toObject(exec)->hasOwnProperty(exec, Identifier(exec, exec->argument(0).toString(exec)->value(exec)))));
    8989}
    … …  
    9191EncodedJSValue JSC_HOST_CALL objectProtoFuncIsPrototypeOf(ExecState* exec)
    9292{
    93     JSValue thisValue = exec->hostThisValue().toThis(exec, StrictMode);
     93    JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
    9494    JSObject* thisObj = thisValue.toObject(exec);
    9595
    … …  
    110110EncodedJSValue JSC_HOST_CALL objectProtoFuncDefineGetter(ExecState* exec)
    111111{
    112     JSObject* thisObject = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     112    JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    113113    if (exec->hadException())
    114114        return JSValue::encode(jsUndefined());
    … …  
    130130EncodedJSValue JSC_HOST_CALL objectProtoFuncDefineSetter(ExecState* exec)
    131131{
    132     JSObject* thisObject = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     132    JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    133133    if (exec->hadException())
    134134        return JSValue::encode(jsUndefined());
    … …  
    150150EncodedJSValue JSC_HOST_CALL objectProtoFuncLookupGetter(ExecState* exec)
    151151{
    152     JSObject* thisObject = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     152    JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    153153    if (exec->hadException())
    154154        return JSValue::encode(jsUndefined());
    … …  
    166166EncodedJSValue JSC_HOST_CALL objectProtoFuncLookupSetter(ExecState* exec)
    167167{
    168     JSObject* thisObject = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     168    JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    169169    if (exec->hadException())
    170170        return JSValue::encode(jsUndefined());
    … …  
    182182EncodedJSValue JSC_HOST_CALL objectProtoFuncPropertyIsEnumerable(ExecState* exec)
    183183{
    184     JSObject* thisObject = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     184    JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    185185    Identifier propertyName(exec, exec->argument(0).toString(exec)->value(exec));
    186186
    … …  
    194194{
    195195    // 1. Let O be the result of calling ToObject passing the this value as the argument.
    196     JSObject* object = exec->hostThisValue().toThis(exec, StrictMode).toObject(exec);
     196    JSObject* object = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
    197197    if (exec->hadException())
    198198        return JSValue::encode(jsUndefined());
    … …  
    214214{
    215215    VM& vm = exec->vm();
    216     JSValue thisValue = exec->hostThisValue().toThis(exec, StrictMode);
     216    JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
    217217    if (thisValue.isUndefinedOrNull())
    218218        return JSValue::encode(jsNontrivialString(&vm, String(thisValue.isUndefined() ? ASCIILiteral("[object Undefined]") : ASCIILiteral("[object Null]"))));

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

    r163844 r166493  
    7575EncodedJSValue JSC_HOST_CALL regExpProtoFuncTest(ExecState* exec)
    7676{
    77     JSValue thisValue = exec->hostThisValue();
     77    JSValue thisValue = exec->thisValue();
    7878    if (!thisValue.inherits(RegExpObject::info()))
    7979        return throwVMTypeError(exec);
    … …  
    8383EncodedJSValue JSC_HOST_CALL regExpProtoFuncExec(ExecState* exec)
    8484{
    85     JSValue thisValue = exec->hostThisValue();
     85    JSValue thisValue = exec->thisValue();
    8686    if (!thisValue.inherits(RegExpObject::info()))
    8787        return throwVMTypeError(exec);
    … …  
    9191EncodedJSValue JSC_HOST_CALL regExpProtoFuncCompile(ExecState* exec)
    9292{
    93     JSValue thisValue = exec->hostThisValue();
     93    JSValue thisValue = exec->thisValue();
    9494    if (!thisValue.inherits(RegExpObject::info()))
    9595        return throwVMTypeError(exec);
    … …  
    129129EncodedJSValue JSC_HOST_CALL regExpProtoFuncToString(ExecState* exec)
    130130{
    131     JSValue thisValue = exec->hostThisValue();
     131    JSValue thisValue = exec->thisValue();
    132132    if (!thisValue.inherits(RegExpObject::info()))
    133133        return throwVMTypeError(exec);

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

    r165703 r166493  
    669669EncodedJSValue JSC_HOST_CALL stringProtoFuncReplace(ExecState* exec)
    670670{
    671     JSValue thisValue = exec->hostThisValue();
     671    JSValue thisValue = exec->thisValue();
    672672    if (!checkObjectCoercible(thisValue))
    673673        return throwVMTypeError(exec);
    … …  
    682682EncodedJSValue JSC_HOST_CALL stringProtoFuncToString(ExecState* exec)
    683683{
    684     JSValue thisValue = exec->hostThisValue();
     684    JSValue thisValue = exec->thisValue();
    685685    // Also used for valueOf.
    686686
    … …  
    696696EncodedJSValue JSC_HOST_CALL stringProtoFuncCharAt(ExecState* exec)
    697697{
    698     JSValue thisValue = exec->hostThisValue();
     698    JSValue thisValue = exec->thisValue();
    699699    if (!checkObjectCoercible(thisValue))
    700700        return throwVMTypeError(exec);
    … …  
    716716EncodedJSValue JSC_HOST_CALL stringProtoFuncCharCodeAt(ExecState* exec)
    717717{
    718     JSValue thisValue = exec->hostThisValue();
     718    JSValue thisValue = exec->thisValue();
    719719    if (!checkObjectCoercible(thisValue))
    720720        return throwVMTypeError(exec);
    … …  
    739739EncodedJSValue JSC_HOST_CALL stringProtoFuncConcat(ExecState* exec)
    740740{
    741     JSValue thisValue = exec->hostThisValue();
     741    JSValue thisValue = exec->thisValue();
    742742    if (thisValue.isString() && exec->argumentCount() == 1)
    743743        return JSValue::encode(jsString(exec, asString(thisValue), exec->uncheckedArgument(0).toString(exec)));
    … …  
    750750EncodedJSValue JSC_HOST_CALL stringProtoFuncIndexOf(ExecState* exec)
    751751{
    752     JSValue thisValue = exec->hostThisValue();
     752    JSValue thisValue = exec->thisValue();
    753753    if (!checkObjectCoercible(thisValue))
    754754        return throwVMTypeError(exec);
    … …  
    786786EncodedJSValue JSC_HOST_CALL stringProtoFuncLastIndexOf(ExecState* exec)
    787787{
    788     JSValue thisValue = exec->hostThisValue();
     788    JSValue thisValue = exec->thisValue();
    789789    if (!checkObjectCoercible(thisValue))
    790790        return throwVMTypeError(exec);
    … …  
    823823EncodedJSValue JSC_HOST_CALL stringProtoFuncMatch(ExecState* exec)
    824824{
    825     JSValue thisValue = exec->hostThisValue();
     825    JSValue thisValue = exec->thisValue();
    826826    if (!checkObjectCoercible(thisValue))
    827827        return throwVMTypeError(exec);
    … …  
    882882EncodedJSValue JSC_HOST_CALL stringProtoFuncSearch(ExecState* exec)
    883883{
    884     JSValue thisValue = exec->hostThisValue();
     884    JSValue thisValue = exec->thisValue();
    885885    if (!checkObjectCoercible(thisValue))
    886886        return throwVMTypeError(exec);
    … …  
    912912EncodedJSValue JSC_HOST_CALL stringProtoFuncSlice(ExecState* exec)
    913913{
    914     JSValue thisValue = exec->hostThisValue();
     914    JSValue thisValue = exec->thisValue();
    915915    if (!checkObjectCoercible(thisValue))
    916916        return throwVMTypeError(exec);
    … …  
    970970{
    971971    // 1. Call CheckObjectCoercible passing the this value as its argument.
    972     JSValue thisValue = exec->hostThisValue();
     972    JSValue thisValue = exec->thisValue();
    973973    if (!checkObjectCoercible(thisValue))
    974974        return throwVMTypeError(exec);
    … …  
    11781178EncodedJSValue JSC_HOST_CALL stringProtoFuncSubstr(ExecState* exec)
    11791179{
    1180     JSValue thisValue = exec->hostThisValue();
     1180    JSValue thisValue = exec->thisValue();
    11811181    if (!checkObjectCoercible(thisValue))
    11821182        return throwVMTypeError(exec);
    … …  
    12171217EncodedJSValue JSC_HOST_CALL stringProtoFuncSubstring(ExecState* exec)
    12181218{
    1219     JSValue thisValue = exec->hostThisValue();
     1219    JSValue thisValue = exec->thisValue();
    12201220    if (!checkObjectCoercible(thisValue))
    12211221        return throwVMTypeError(exec);
    … …  
    12561256EncodedJSValue JSC_HOST_CALL stringProtoFuncToLowerCase(ExecState* exec)
    12571257{
    1258     JSValue thisValue = exec->hostThisValue();
     1258    JSValue thisValue = exec->thisValue();
    12591259    if (!checkObjectCoercible(thisValue))
    12601260        return throwVMTypeError(exec);
    … …  
    12751275EncodedJSValue JSC_HOST_CALL stringProtoFuncToUpperCase(ExecState* exec)
    12761276{
    1277     JSValue thisValue = exec->hostThisValue();
     1277    JSValue thisValue = exec->thisValue();
    12781278    if (!checkObjectCoercible(thisValue))
    12791279        return throwVMTypeError(exec);
    … …  
    12941294EncodedJSValue JSC_HOST_CALL stringProtoFuncLocaleCompare(ExecState* exec)
    12951295{
    1296     JSValue thisValue = exec->hostThisValue();
     1296    JSValue thisValue = exec->thisValue();
    12971297    if (!checkObjectCoercible(thisValue))
    12981298        return throwVMTypeError(exec);
    … …  
    13051305EncodedJSValue JSC_HOST_CALL stringProtoFuncBig(ExecState* exec)
    13061306{
    1307     JSValue thisValue = exec->hostThisValue();
     1307    JSValue thisValue = exec->thisValue();
    13081308    if (!checkObjectCoercible(thisValue))
    13091309        return throwVMTypeError(exec);
    … …  
    13141314EncodedJSValue JSC_HOST_CALL stringProtoFuncSmall(ExecState* exec)
    13151315{
    1316     JSValue thisValue = exec->hostThisValue();
     1316    JSValue thisValue = exec->thisValue();
    13171317    if (!checkObjectCoercible(thisValue))
    13181318        return throwVMTypeError(exec);
    … …  
    13231323EncodedJSValue JSC_HOST_CALL stringProtoFuncBlink(ExecState* exec)
    13241324{
    1325     JSValue thisValue = exec->hostThisValue();
     1325    JSValue thisValue = exec->thisValue();
    13261326    if (!checkObjectCoercible(thisValue))
    13271327        return throwVMTypeError(exec);
    … …  
    13321332EncodedJSValue JSC_HOST_CALL stringProtoFuncBold(ExecState* exec)
    13331333{
    1334     JSValue thisValue = exec->hostThisValue();
     1334    JSValue thisValue = exec->thisValue();
    13351335    if (!checkObjectCoercible(thisValue))
    13361336        return throwVMTypeError(exec);
    … …  
    13411341EncodedJSValue JSC_HOST_CALL stringProtoFuncFixed(ExecState* exec)
    13421342{
    1343     JSValue thisValue = exec->hostThisValue();
     1343    JSValue thisValue = exec->thisValue();
    13441344    if (!checkObjectCoercible(thisValue))
    13451345        return throwVMTypeError(exec);
    … …  
    13501350EncodedJSValue JSC_HOST_CALL stringProtoFuncItalics(ExecState* exec)
    13511351{
    1352     JSValue thisValue = exec->hostThisValue();
     1352    JSValue thisValue = exec->thisValue();
    13531353    if (!checkObjectCoercible(thisValue))
    13541354        return throwVMTypeError(exec);
    … …  
    13591359EncodedJSValue JSC_HOST_CALL stringProtoFuncStrike(ExecState* exec)
    13601360{
    1361     JSValue thisValue = exec->hostThisValue();
     1361    JSValue thisValue = exec->thisValue();
    13621362    if (!checkObjectCoercible(thisValue))
    13631363        return throwVMTypeError(exec);
    … …  
    13681368EncodedJSValue JSC_HOST_CALL stringProtoFuncSub(ExecState* exec)
    13691369{
    1370     JSValue thisValue = exec->hostThisValue();
     1370    JSValue thisValue = exec->thisValue();
    13711371    if (!checkObjectCoercible(thisValue))
    13721372        return throwVMTypeError(exec);
    … …  
    13771377EncodedJSValue JSC_HOST_CALL stringProtoFuncSup(ExecState* exec)
    13781378{
    1379     JSValue thisValue = exec->hostThisValue();
     1379    JSValue thisValue = exec->thisValue();
    13801380    if (!checkObjectCoercible(thisValue))
    13811381        return throwVMTypeError(exec);
    … …  
    13861386EncodedJSValue JSC_HOST_CALL stringProtoFuncFontcolor(ExecState* exec)
    13871387{
    1388     JSValue thisValue = exec->hostThisValue();
     1388    JSValue thisValue = exec->thisValue();
    13891389    if (!checkObjectCoercible(thisValue))
    13901390        return throwVMTypeError(exec);
    … …  
    13991399EncodedJSValue JSC_HOST_CALL stringProtoFuncFontsize(ExecState* exec)
    14001400{
    1401     JSValue thisValue = exec->hostThisValue();
     1401    JSValue thisValue = exec->thisValue();
    14021402    if (!checkObjectCoercible(thisValue))
    14031403        return throwVMTypeError(exec);
    … …  
    14481448EncodedJSValue JSC_HOST_CALL stringProtoFuncAnchor(ExecState* exec)
    14491449{
    1450     JSValue thisValue = exec->hostThisValue();
     1450    JSValue thisValue = exec->thisValue();
    14511451    if (!checkObjectCoercible(thisValue))
    14521452        return throwVMTypeError(exec);
    … …  
    14611461EncodedJSValue JSC_HOST_CALL stringProtoFuncLink(ExecState* exec)
    14621462{
    1463     JSValue thisValue = exec->hostThisValue();
     1463    JSValue thisValue = exec->thisValue();
    14641464    if (!checkObjectCoercible(thisValue))
    14651465        return throwVMTypeError(exec);
    … …  
    15321532EncodedJSValue JSC_HOST_CALL stringProtoFuncTrim(ExecState* exec)
    15331533{
    1534     JSValue thisValue = exec->hostThisValue();
     1534    JSValue thisValue = exec->thisValue();
    15351535    return JSValue::encode(trimString(exec, thisValue, TrimLeft | TrimRight));
    15361536}
    … …  
    15381538EncodedJSValue JSC_HOST_CALL stringProtoFuncTrimLeft(ExecState* exec)
    15391539{
    1540     JSValue thisValue = exec->hostThisValue();
     1540    JSValue thisValue = exec->thisValue();
    15411541    return JSValue::encode(trimString(exec, thisValue, TrimLeft));
    15421542}
    … …  
    15441544EncodedJSValue JSC_HOST_CALL stringProtoFuncTrimRight(ExecState* exec)
    15451545{
    1546     JSValue thisValue = exec->hostThisValue();
     1546    JSValue thisValue = exec->thisValue();
    15471547    return JSValue::encode(trimString(exec, thisValue, TrimRight));
    15481548}

  • trunk/Source/WebCore/ChangeLog

    r166491 r166493  
     12014-03-31  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
     2
     3        Remove hostThisRegister() and hostThisValue()
     4        https://bugs.webkit.org/show_bug.cgi?id=130895
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        Removed hostThisRegister() and hostThisValue() and instead use thisArgumentOffset() and thisValue() respectively.
     9
     10        No new tests, no behavior changes.
     11
     12        * bindings/js/JSNavigatorCustom.cpp:
     13        (WebCore::JSNavigator::webkitGetUserMedia):
     14        * bindings/js/JSPluginElementFunctions.cpp:
     15        (WebCore::callPlugin):
     16        * bindings/scripts/CodeGeneratorJS.pm:
     17        (GenerateImplementation):
     18        * bindings/scripts/test/JS/JSFloat64Array.cpp:
     19        (WebCore::jsFloat64ArrayPrototypeFunctionFoo):
     20        (WebCore::jsFloat64ArrayPrototypeFunctionSet):
     21        * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
     22        (WebCore::jsTestActiveDOMObjectPrototypeFunctionExcitingFunction):
     23        (WebCore::jsTestActiveDOMObjectPrototypeFunctionPostMessage):
     24        * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
     25        (WebCore::jsTestCustomNamedGetterPrototypeFunctionAnotherFunction):
     26        * bindings/scripts/test/JS/JSTestEventTarget.cpp:
     27        (WebCore::jsTestEventTargetPrototypeFunctionItem):
     28        (WebCore::jsTestEventTargetPrototypeFunctionAddEventListener):
     29        (WebCore::jsTestEventTargetPrototypeFunctionRemoveEventListener):
     30        (WebCore::jsTestEventTargetPrototypeFunctionDispatchEvent):
     31        * bindings/scripts/test/JS/JSTestInterface.cpp:
     32        (WebCore::jsTestInterfacePrototypeFunctionImplementsMethod1):
     33        (WebCore::jsTestInterfacePrototypeFunctionImplementsMethod2):
     34        (WebCore::jsTestInterfacePrototypeFunctionImplementsMethod3):
     35        (WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod1):
     36        (WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod2):
     37        (WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod3):
     38        * bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
     39        (WebCore::jsTestMediaQueryListListenerPrototypeFunctionMethod):
     40        * bindings/scripts/test/JS/JSTestObj.cpp:
     41        (WebCore::jsTestObjPrototypeFunctionVoidMethod):
     42        (WebCore::jsTestObjPrototypeFunctionVoidMethodWithArgs):
     43        (WebCore::jsTestObjPrototypeFunctionByteMethod):
     44        (WebCore::jsTestObjPrototypeFunctionByteMethodWithArgs):
     45        (WebCore::jsTestObjPrototypeFunctionOctetMethod):
     46        (WebCore::jsTestObjPrototypeFunctionOctetMethodWithArgs):
     47        (WebCore::jsTestObjPrototypeFunctionLongMethod):
     48        (WebCore::jsTestObjPrototypeFunctionLongMethodWithArgs):
     49        (WebCore::jsTestObjPrototypeFunctionObjMethod):
     50        (WebCore::jsTestObjPrototypeFunctionObjMethodWithArgs):
     51        (WebCore::jsTestObjPrototypeFunctionMethodWithSequenceArg):
     52        (WebCore::jsTestObjPrototypeFunctionMethodReturningSequence):
     53        (WebCore::jsTestObjPrototypeFunctionMethodWithEnumArg):
     54        (WebCore::jsTestObjPrototypeFunctionMethodThatRequiresAllArgsAndThrows):
     55        (WebCore::jsTestObjPrototypeFunctionSerializedValue):
     56        (WebCore::jsTestObjPrototypeFunctionOptionsObject):
     57        (WebCore::jsTestObjPrototypeFunctionMethodWithException):
     58        (WebCore::jsTestObjPrototypeFunctionCustomMethod):
     59        (WebCore::jsTestObjPrototypeFunctionCustomMethodWithArgs):
     60        (WebCore::jsTestObjPrototypeFunctionAddEventListener):
     61        (WebCore::jsTestObjPrototypeFunctionRemoveEventListener):
     62        (WebCore::jsTestObjPrototypeFunctionWithScriptStateVoid):
     63        (WebCore::jsTestObjPrototypeFunctionWithScriptStateObj):
     64        (WebCore::jsTestObjPrototypeFunctionWithScriptStateVoidException):
     65        (WebCore::jsTestObjPrototypeFunctionWithScriptStateObjException):
     66        (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContext):
     67        (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptState):
     68        (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException):
     69        (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces):
     70        (WebCore::jsTestObjPrototypeFunctionWithScriptArgumentsAndCallStack):
     71        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArg):
     72        (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg):
     73        (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
     74        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalString):
     75        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefined):
     76        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsNullString):
     77        (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackArg):
     78        (WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg):
     79        (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg):
     80        (WebCore::jsTestObjPrototypeFunctionConditionalMethod1):
     81        (WebCore::jsTestObjPrototypeFunctionConditionalMethod2):
     82        (WebCore::jsTestObjPrototypeFunctionConditionalMethod3):
     83        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod1):
     84        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod2):
     85        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod3):
     86        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod4):
     87        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod5):
     88        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod6):
     89        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod7):
     90        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod8):
     91        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod9):
     92        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod10):
     93        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod11):
     94        (WebCore::jsTestObjPrototypeFunctionClassMethodWithClamp):
     95        (WebCore::jsTestObjPrototypeFunctionMethodWithUnsignedLongSequence):
     96        (WebCore::jsTestObjPrototypeFunctionStringArrayFunction):
     97        (WebCore::jsTestObjPrototypeFunctionDomStringListFunction):
     98        (WebCore::jsTestObjPrototypeFunctionGetSVGDocument):
     99        (WebCore::jsTestObjPrototypeFunctionConvert1):
     100        (WebCore::jsTestObjPrototypeFunctionConvert2):
     101        (WebCore::jsTestObjPrototypeFunctionConvert4):
     102        (WebCore::jsTestObjPrototypeFunctionConvert5):
     103        (WebCore::jsTestObjPrototypeFunctionMutablePointFunction):
     104        (WebCore::jsTestObjPrototypeFunctionImmutablePointFunction):
     105        (WebCore::jsTestObjPrototypeFunctionOrange):
     106        (WebCore::jsTestObjPrototypeFunctionStrictFunction):
     107        (WebCore::jsTestObjPrototypeFunctionStrictFunctionWithSequence):
     108        (WebCore::jsTestObjPrototypeFunctionStrictFunctionWithArray):
     109        (WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
     110        (WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
     111        (WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):
     112        (WebCore::jsTestObjPrototypeFunctionAny):
     113        * bindings/scripts/test/JS/JSTestTypedefs.cpp:
     114        (WebCore::jsTestTypedefsPrototypeFunctionFunc):
     115        (WebCore::jsTestTypedefsPrototypeFunctionSetShadow):
     116        (WebCore::jsTestTypedefsPrototypeFunctionMethodWithSequenceArg):
     117        (WebCore::jsTestTypedefsPrototypeFunctionNullableArrayArg):
     118        (WebCore::jsTestTypedefsPrototypeFunctionFuncWithClamp):
     119        (WebCore::jsTestTypedefsPrototypeFunctionImmutablePointFunction):
     120        (WebCore::jsTestTypedefsPrototypeFunctionStringArrayFunction):
     121        (WebCore::jsTestTypedefsPrototypeFunctionStringArrayFunction2):
     122        (WebCore::jsTestTypedefsPrototypeFunctionCallWithSequenceThatRequiresInclude):
     123        (WebCore::jsTestTypedefsPrototypeFunctionMethodWithException):
     124        * bridge/objc/objc_runtime.mm:
     125        (JSC::Bindings::callObjCFallbackObject):
     126        * bridge/runtime_method.cpp:
     127        (JSC::callRuntimeMethod):
     128
    11292014-03-31  Zan Dobersek  <zdobersek@igalia.com>
    2130

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

    r166207 r166493  
    6060    }
    6161
    62     JSNavigator* castedThis = jsDynamicCast<JSNavigator*>(exec->hostThisValue());
     62    JSNavigator* castedThis = jsDynamicCast<JSNavigator*>(exec->thisValue());
    6363    RefPtr<NavigatorUserMediaErrorCallback> errorCallback;
    6464    if (!exec->argument(2).isUndefinedOrNull()) {

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

    r163496 r166493  
    155155
    156156    // Call the object.
    157     JSValue result = call(exec, scriptObject, callType, callData, exec->hostThisValue(), argumentList);
     157    JSValue result = call(exec, scriptObject, callType, callData, exec->thisValue(), argumentList);
    158158    return JSValue::encode(result);
    159159}

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

    r166413 r166493  
    27072707            } else {
    27082708                if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
    2709                     push(@implContent, "    $className* castedThis = to${className}(exec->hostThisValue().toThis(exec, NotStrictMode));\n");
     2709                    push(@implContent, "    $className* castedThis = to${className}(exec->thisValue().toThis(exec, NotStrictMode));\n");
    27102710                    push(@implContent, "    if (UNLIKELY(!castedThis))\n");
    27112711                    push(@implContent, "        return throwVMTypeError(exec);\n");
    27122712                } elsif ($interface->extendedAttributes->{"WorkerGlobalScope"}) {
    2713                     push(@implContent, "    $className* castedThis = to${className}(exec->hostThisValue().toThis(exec, NotStrictMode));\n");
     2713                    push(@implContent, "    $className* castedThis = to${className}(exec->thisValue().toThis(exec, NotStrictMode));\n");
    27142714                    push(@implContent, "    if (UNLIKELY(!castedThis))\n");
    27152715                    push(@implContent, "        return throwVMTypeError(exec);\n");
    27162716                } else {
    2717                     push(@implContent, "    JSValue thisValue = exec->hostThisValue();\n");
     2717                    push(@implContent, "    JSValue thisValue = exec->thisValue();\n");
    27182718                    push(@implContent, "    $className* castedThis = jsDynamicCast<$className*>(thisValue);\n");
    27192719                    my $domFunctionName = $function->signature->name;

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

    r154038 r166493  
    252252EncodedJSValue JSC_HOST_CALL jsFloat64ArrayPrototypeFunctionFoo(ExecState* exec)
    253253{
    254     JSValue thisValue = exec->hostThisValue();
     254    JSValue thisValue = exec->thisValue();
    255255    if (!thisValue.inherits(JSFloat64Array::info()))
    256256        return throwVMTypeError(exec);
    … …  
    270270EncodedJSValue JSC_HOST_CALL jsFloat64ArrayPrototypeFunctionSet(ExecState* exec)
    271271{
    272     JSValue thisValue = exec->hostThisValue();
     272    JSValue thisValue = exec->thisValue();
    273273    if (!thisValue.inherits(JSFloat64Array::info()))
    274274        return throwVMTypeError(exec);

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

    r166417 r166493  
    185185EncodedJSValue JSC_HOST_CALL jsTestActiveDOMObjectPrototypeFunctionExcitingFunction(ExecState* exec)
    186186{
    187     JSValue thisValue = exec->hostThisValue();
     187    JSValue thisValue = exec->thisValue();
    188188    JSTestActiveDOMObject* castedThis = jsDynamicCast<JSTestActiveDOMObject*>(thisValue);
    189189    if (UNLIKELY(!castedThis))
    … …  
    204204EncodedJSValue JSC_HOST_CALL jsTestActiveDOMObjectPrototypeFunctionPostMessage(ExecState* exec)
    205205{
    206     JSValue thisValue = exec->hostThisValue();
     206    JSValue thisValue = exec->thisValue();
    207207    JSTestActiveDOMObject* castedThis = jsDynamicCast<JSTestActiveDOMObject*>(thisValue);
    208208    if (UNLIKELY(!castedThis))

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

    r166417 r166493  
    171171EncodedJSValue JSC_HOST_CALL jsTestCustomNamedGetterPrototypeFunctionAnotherFunction(ExecState* exec)
    172172{
    173     JSValue thisValue = exec->hostThisValue();
     173    JSValue thisValue = exec->thisValue();
    174174    JSTestCustomNamedGetter* castedThis = jsDynamicCast<JSTestCustomNamedGetter*>(thisValue);
    175175    if (UNLIKELY(!castedThis))

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

    r166417 r166493  
    211211EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionItem(ExecState* exec)
    212212{
    213     JSValue thisValue = exec->hostThisValue();
     213    JSValue thisValue = exec->thisValue();
    214214    JSTestEventTarget* castedThis = jsDynamicCast<JSTestEventTarget*>(thisValue);
    215215    if (UNLIKELY(!castedThis))
    … …  
    232232EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionAddEventListener(ExecState* exec)
    233233{
    234     JSValue thisValue = exec->hostThisValue();
     234    JSValue thisValue = exec->thisValue();
    235235    JSTestEventTarget* castedThis = jsDynamicCast<JSTestEventTarget*>(thisValue);
    236236    if (UNLIKELY(!castedThis))
    … …  
    247247EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionRemoveEventListener(ExecState* exec)
    248248{
    249     JSValue thisValue = exec->hostThisValue();
     249    JSValue thisValue = exec->thisValue();
    250250    JSTestEventTarget* castedThis = jsDynamicCast<JSTestEventTarget*>(thisValue);
    251251    if (UNLIKELY(!castedThis))
    … …  
    262262EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionDispatchEvent(ExecState* exec)
    263263{
    264     JSValue thisValue = exec->hostThisValue();
     264    JSValue thisValue = exec->thisValue();
    265265    JSTestEventTarget* castedThis = jsDynamicCast<JSTestEventTarget*>(thisValue);
    266266    if (UNLIKELY(!castedThis))

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

    r166417 r166493  
    792792EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionImplementsMethod1(ExecState* exec)
    793793{
    794     JSValue thisValue = exec->hostThisValue();
     794    JSValue thisValue = exec->thisValue();
    795795    JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
    796796    if (UNLIKELY(!castedThis))
    … …  
    807807EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionImplementsMethod2(ExecState* exec)
    808808{
    809     JSValue thisValue = exec->hostThisValue();
     809    JSValue thisValue = exec->thisValue();
    810810    JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
    811811    if (UNLIKELY(!castedThis))
    … …  
    836836EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionImplementsMethod3(ExecState* exec)
    837837{
    838     JSValue thisValue = exec->hostThisValue();
     838    JSValue thisValue = exec->thisValue();
    839839    JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
    840840    if (UNLIKELY(!castedThis))
    … …  
    858858EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod1(ExecState* exec)
    859859{
    860     JSValue thisValue = exec->hostThisValue();
     860    JSValue thisValue = exec->thisValue();
    861861    JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
    862862    if (UNLIKELY(!castedThis))
    … …  
    873873EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod2(ExecState* exec)
    874874{
    875     JSValue thisValue = exec->hostThisValue();
     875    JSValue thisValue = exec->thisValue();
    876876    JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
    877877    if (UNLIKELY(!castedThis))
    … …  
    902902EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod3(ExecState* exec)
    903903{
    904     JSValue thisValue = exec->hostThisValue();
     904    JSValue thisValue = exec->thisValue();
    905905    JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(thisValue);
    906906    if (UNLIKELY(!castedThis))

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

    r166417 r166493  
    144144EncodedJSValue JSC_HOST_CALL jsTestMediaQueryListListenerPrototypeFunctionMethod(ExecState* exec)
    145145{
    146     JSValue thisValue = exec->hostThisValue();
     146    JSValue thisValue = exec->thisValue();
    147147    JSTestMediaQueryListListener* castedThis = jsDynamicCast<JSTestMediaQueryListListener*>(thisValue);
    148148    if (UNLIKELY(!castedThis))

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

    r166417 r166493  
    32463246EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVoidMethod(ExecState* exec)
    32473247{
    3248     JSValue thisValue = exec->hostThisValue();
     3248    JSValue thisValue = exec->thisValue();
    32493249    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    32503250    if (UNLIKELY(!castedThis))
    … …  
    32583258EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVoidMethodWithArgs(ExecState* exec)
    32593259{
    3260     JSValue thisValue = exec->hostThisValue();
     3260    JSValue thisValue = exec->thisValue();
    32613261    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    32623262    if (UNLIKELY(!castedThis))
    … …  
    32813281EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionByteMethod(ExecState* exec)
    32823282{
    3283     JSValue thisValue = exec->hostThisValue();
     3283    JSValue thisValue = exec->thisValue();
    32843284    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    32853285    if (UNLIKELY(!castedThis))
    … …  
    32933293EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionByteMethodWithArgs(ExecState* exec)
    32943294{
    3295     JSValue thisValue = exec->hostThisValue();
     3295    JSValue thisValue = exec->thisValue();
    32963296    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    32973297    if (UNLIKELY(!castedThis))
    … …  
    33163316EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOctetMethod(ExecState* exec)
    33173317{
    3318     JSValue thisValue = exec->hostThisValue();
     3318    JSValue thisValue = exec->thisValue();
    33193319    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    33203320    if (UNLIKELY(!castedThis))
    … …  
    33283328EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOctetMethodWithArgs(ExecState* exec)
    33293329{
    3330     JSValue thisValue = exec->hostThisValue();
     3330    JSValue thisValue = exec->thisValue();
    33313331    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    33323332    if (UNLIKELY(!castedThis))
    … …  
    33513351EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionLongMethod(ExecState* exec)
    33523352{
    3353     JSValue thisValue = exec->hostThisValue();
     3353    JSValue thisValue = exec->thisValue();
    33543354    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    33553355    if (UNLIKELY(!castedThis))
    … …  
    33633363EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionLongMethodWithArgs(ExecState* exec)
    33643364{
    3365     JSValue thisValue = exec->hostThisValue();
     3365    JSValue thisValue = exec->thisValue();
    33663366    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    33673367    if (UNLIKELY(!castedThis))
    … …  
    33863386EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionObjMethod(ExecState* exec)
    33873387{
    3388     JSValue thisValue = exec->hostThisValue();
     3388    JSValue thisValue = exec->thisValue();
    33893389    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    33903390    if (UNLIKELY(!castedThis))
    … …  
    33983398EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionObjMethodWithArgs(ExecState* exec)
    33993399{
    3400     JSValue thisValue = exec->hostThisValue();
     3400    JSValue thisValue = exec->thisValue();
    34013401    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    34023402    if (UNLIKELY(!castedThis))
    … …  
    34213421EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithSequenceArg(ExecState* exec)
    34223422{
    3423     JSValue thisValue = exec->hostThisValue();
     3423    JSValue thisValue = exec->thisValue();
    34243424    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    34253425    if (UNLIKELY(!castedThis))
    … …  
    34383438EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodReturningSequence(ExecState* exec)
    34393439{
    3440     JSValue thisValue = exec->hostThisValue();
     3440    JSValue thisValue = exec->thisValue();
    34413441    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    34423442    if (UNLIKELY(!castedThis))
    … …  
    34553455EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithEnumArg(ExecState* exec)
    34563456{
    3457     JSValue thisValue = exec->hostThisValue();
     3457    JSValue thisValue = exec->thisValue();
    34583458    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    34593459    if (UNLIKELY(!castedThis))
    … …  
    34743474EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodThatRequiresAllArgsAndThrows(ExecState* exec)
    34753475{
    3476     JSValue thisValue = exec->hostThisValue();
     3476    JSValue thisValue = exec->thisValue();
    34773477    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    34783478    if (UNLIKELY(!castedThis))
    … …  
    34973497EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionSerializedValue(ExecState* exec)
    34983498{
    3499     JSValue thisValue = exec->hostThisValue();
     3499    JSValue thisValue = exec->thisValue();
    35003500    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    35013501    if (UNLIKELY(!castedThis))
    … …  
    35143514EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOptionsObject(ExecState* exec)
    35153515{
    3516     JSValue thisValue = exec->hostThisValue();
     3516    JSValue thisValue = exec->thisValue();
    35173517    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    35183518    if (UNLIKELY(!castedThis))
    … …  
    35343534EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithException(ExecState* exec)
    35353535{
    3536     JSValue thisValue = exec->hostThisValue();
     3536    JSValue thisValue = exec->thisValue();
    35373537    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    35383538    if (UNLIKELY(!castedThis))
    … …  
    35483548EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionCustomMethod(ExecState* exec)
    35493549{
    3550     JSValue thisValue = exec->hostThisValue();
     3550    JSValue thisValue = exec->thisValue();
    35513551    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    35523552    if (UNLIKELY(!castedThis))
    … …  
    35583558EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionCustomMethodWithArgs(ExecState* exec)
    35593559{
    3560     JSValue thisValue = exec->hostThisValue();
     3560    JSValue thisValue = exec->thisValue();
    35613561    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    35623562    if (UNLIKELY(!castedThis))
    … …  
    35683568EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionAddEventListener(ExecState* exec)
    35693569{
    3570     JSValue thisValue = exec->hostThisValue();
     3570    JSValue thisValue = exec->thisValue();
    35713571    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    35723572    if (UNLIKELY(!castedThis))
    … …  
    35833583EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionRemoveEventListener(ExecState* exec)
    35843584{
    3585     JSValue thisValue = exec->hostThisValue();
     3585    JSValue thisValue = exec->thisValue();
    35863586    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    35873587    if (UNLIKELY(!castedThis))
    … …  
    35983598EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoid(ExecState* exec)
    35993599{
    3600     JSValue thisValue = exec->hostThisValue();
     3600    JSValue thisValue = exec->thisValue();
    36013601    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    36023602    if (UNLIKELY(!castedThis))
    … …  
    36103610EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateObj(ExecState* exec)
    36113611{
    3612     JSValue thisValue = exec->hostThisValue();
     3612    JSValue thisValue = exec->thisValue();
    36133613    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    36143614    if (UNLIKELY(!castedThis))
    … …  
    36243624EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoidException(ExecState* exec)
    36253625{
    3626     JSValue thisValue = exec->hostThisValue();
     3626    JSValue thisValue = exec->thisValue();
    36273627    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    36283628    if (UNLIKELY(!castedThis))
    … …  
    36383638EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateObjException(ExecState* exec)
    36393639{
    3640     JSValue thisValue = exec->hostThisValue();
     3640    JSValue thisValue = exec->thisValue();
    36413641    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    36423642    if (UNLIKELY(!castedThis))
    … …  
    36553655EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContext(ExecState* exec)
    36563656{
    3657     JSValue thisValue = exec->hostThisValue();
     3657    JSValue thisValue = exec->thisValue();
    36583658    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    36593659    if (UNLIKELY(!castedThis))
    … …  
    36703670EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptState(ExecState* exec)
    36713671{
    3672     JSValue thisValue = exec->hostThisValue();
     3672    JSValue thisValue = exec->thisValue();
    36733673    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    36743674    if (UNLIKELY(!castedThis))
    … …  
    36853685EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException(ExecState* exec)
    36863686{
    3687     JSValue thisValue = exec->hostThisValue();
     3687    JSValue thisValue = exec->thisValue();
    36883688    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    36893689    if (UNLIKELY(!castedThis))
    … …  
    37053705EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces(ExecState* exec)
    37063706{
    3707     JSValue thisValue = exec->hostThisValue();
     3707    JSValue thisValue = exec->thisValue();
    37083708    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    37093709    if (UNLIKELY(!castedThis))
    … …  
    37223722EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptArgumentsAndCallStack(ExecState* exec)
    37233723{
    3724     JSValue thisValue = exec->hostThisValue();
     3724    JSValue thisValue = exec->thisValue();
    37253725    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    37263726    if (UNLIKELY(!castedThis))
    … …  
    37353735EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalArg(ExecState* exec)
    37363736{
    3737     JSValue thisValue = exec->hostThisValue();
     3737    JSValue thisValue = exec->thisValue();
    37383738    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    37393739    if (UNLIKELY(!castedThis))
    … …  
    37573757EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg(ExecState* exec)
    37583758{
    3759     JSValue thisValue = exec->hostThisValue();
     3759    JSValue thisValue = exec->thisValue();
    37603760    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    37613761    if (UNLIKELY(!castedThis))
    … …  
    37843784EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs(ExecState* exec)
    37853785{
    3786     JSValue thisValue = exec->hostThisValue();
     3786    JSValue thisValue = exec->thisValue();
    37873787    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    37883788    if (UNLIKELY(!castedThis))
    … …  
    38193819EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalString(ExecState* exec)
    38203820{
    3821     JSValue thisValue = exec->hostThisValue();
     3821    JSValue thisValue = exec->thisValue();
    38223822    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    38233823    if (UNLIKELY(!castedThis))
    … …  
    38413841EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefined(ExecState* exec)
    38423842{
    3843     JSValue thisValue = exec->hostThisValue();
     3843    JSValue thisValue = exec->thisValue();
    38443844    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    38453845    if (UNLIKELY(!castedThis))
    … …  
    38563856EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalStringIsNullString(ExecState* exec)
    38573857{
    3858     JSValue thisValue = exec->hostThisValue();
     3858    JSValue thisValue = exec->thisValue();
    38593859    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    38603860    if (UNLIKELY(!castedThis))
    … …  
    38713871EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackArg(ExecState* exec)
    38723872{
    3873     JSValue thisValue = exec->hostThisValue();
     3873    JSValue thisValue = exec->thisValue();
    38743874    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    38753875    if (UNLIKELY(!castedThis))
    … …  
    38883888EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg(ExecState* exec)
    38893889{
    3890     JSValue thisValue = exec->hostThisValue();
     3890    JSValue thisValue = exec->thisValue();
    38913891    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    38923892    if (UNLIKELY(!castedThis))
    … …  
    39083908EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg(ExecState* exec)
    39093909{
    3910     JSValue thisValue = exec->hostThisValue();
     3910    JSValue thisValue = exec->thisValue();
    39113911    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    39123912    if (UNLIKELY(!castedThis))
    … …  
    39503950EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod1(ExecState* exec)
    39513951{
    3952     JSValue thisValue = exec->hostThisValue();
     3952    JSValue thisValue = exec->thisValue();
    39533953    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    39543954    if (UNLIKELY(!castedThis))
    … …  
    39653965EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod2(ExecState* exec)
    39663966{
    3967     JSValue thisValue = exec->hostThisValue();
     3967    JSValue thisValue = exec->thisValue();
    39683968    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    39693969    if (UNLIKELY(!castedThis))
    … …  
    39803980EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod3(ExecState* exec)
    39813981{
    3982     JSValue thisValue = exec->hostThisValue();
     3982    JSValue thisValue = exec->thisValue();
    39833983    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    39843984    if (UNLIKELY(!castedThis))
    … …  
    39943994static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod1(ExecState* exec)
    39953995{
    3996     JSValue thisValue = exec->hostThisValue();
     3996    JSValue thisValue = exec->thisValue();
    39973997    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    39983998    if (UNLIKELY(!castedThis))
    … …  
    40144014static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod2(ExecState* exec)
    40154015{
    4016     JSValue thisValue = exec->hostThisValue();
     4016    JSValue thisValue = exec->thisValue();
    40174017    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    40184018    if (UNLIKELY(!castedThis))
    … …  
    40414041static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod3(ExecState* exec)
    40424042{
    4043     JSValue thisValue = exec->hostThisValue();
     4043    JSValue thisValue = exec->thisValue();
    40444044    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    40454045    if (UNLIKELY(!castedThis))
    … …  
    40584058static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod4(ExecState* exec)
    40594059{
    4060     JSValue thisValue = exec->hostThisValue();
     4060    JSValue thisValue = exec->thisValue();
    40614061    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    40624062    if (UNLIKELY(!castedThis))
    … …  
    40754075static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod5(ExecState* exec)
    40764076{
    4077     JSValue thisValue = exec->hostThisValue();
     4077    JSValue thisValue = exec->thisValue();
    40784078    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    40794079    if (UNLIKELY(!castedThis))
    … …  
    40924092static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod6(ExecState* exec)
    40934093{
    4094     JSValue thisValue = exec->hostThisValue();
     4094    JSValue thisValue = exec->thisValue();
    40954095    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    40964096    if (UNLIKELY(!castedThis))
    … …  
    41094109static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod7(ExecState* exec)
    41104110{
    4111     JSValue thisValue = exec->hostThisValue();
     4111    JSValue thisValue = exec->thisValue();
    41124112    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    41134113    if (UNLIKELY(!castedThis))
    … …  
    41264126static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod8(ExecState* exec)
    41274127{
    4128     JSValue thisValue = exec->hostThisValue();
     4128    JSValue thisValue = exec->thisValue();
    41294129    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    41304130    if (UNLIKELY(!castedThis))
    … …  
    41434143static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod9(ExecState* exec)
    41444144{
    4145     JSValue thisValue = exec->hostThisValue();
     4145    JSValue thisValue = exec->thisValue();
    41464146    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    41474147    if (UNLIKELY(!castedThis))
    … …  
    41604160static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod10(ExecState* exec)
    41614161{
    4162     JSValue thisValue = exec->hostThisValue();
     4162    JSValue thisValue = exec->thisValue();
    41634163    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    41644164    if (UNLIKELY(!castedThis))
    … …  
    41774177static EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod11(ExecState* exec)
    41784178{
    4179     JSValue thisValue = exec->hostThisValue();
     4179    JSValue thisValue = exec->thisValue();
    41804180    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    41814181    if (UNLIKELY(!castedThis))
    … …  
    43024302EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionClassMethodWithClamp(ExecState* exec)
    43034303{
    4304     JSValue thisValue = exec->hostThisValue();
     4304    JSValue thisValue = exec->thisValue();
    43054305    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    43064306    if (UNLIKELY(!castedThis))
    … …  
    43324332EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithUnsignedLongSequence(ExecState* exec)
    43334333{
    4334     JSValue thisValue = exec->hostThisValue();
     4334    JSValue thisValue = exec->thisValue();
    43354335    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    43364336    if (UNLIKELY(!castedThis))
    … …  
    43494349EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionStringArrayFunction(ExecState* exec)
    43504350{
    4351     JSValue thisValue = exec->hostThisValue();
     4351    JSValue thisValue = exec->thisValue();
    43524352    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    43534353    if (UNLIKELY(!castedThis))
    … …  
    43694369EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionDomStringListFunction(ExecState* exec)
    43704370{
    4371     JSValue thisValue = exec->hostThisValue();
     4371    JSValue thisValue = exec->thisValue();
    43724372    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    43734373    if (UNLIKELY(!castedThis))
    … …  
    43894389EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetSVGDocument(ExecState* exec)
    43904390{
    4391     JSValue thisValue = exec->hostThisValue();
     4391    JSValue thisValue = exec->thisValue();
    43924392    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    43934393    if (UNLIKELY(!castedThis))
    … …  
    44064406EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert1(ExecState* exec)
    44074407{
    4408     JSValue thisValue = exec->hostThisValue();
     4408    JSValue thisValue = exec->thisValue();
    44094409    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    44104410    if (UNLIKELY(!castedThis))
    … …  
    44234423EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert2(ExecState* exec)
    44244424{
    4425     JSValue thisValue = exec->hostThisValue();
     4425    JSValue thisValue = exec->thisValue();
    44264426    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    44274427    if (UNLIKELY(!castedThis))
    … …  
    44404440EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert4(ExecState* exec)
    44414441{
    4442     JSValue thisValue = exec->hostThisValue();
     4442    JSValue thisValue = exec->thisValue();
    44434443    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    44444444    if (UNLIKELY(!castedThis))
    … …  
    44574457EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert5(ExecState* exec)
    44584458{
    4459     JSValue thisValue = exec->hostThisValue();
     4459    JSValue thisValue = exec->thisValue();
    44604460    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    44614461    if (UNLIKELY(!castedThis))
    … …  
    44744474EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMutablePointFunction(ExecState* exec)
    44754475{
    4476     JSValue thisValue = exec->hostThisValue();
     4476    JSValue thisValue = exec->thisValue();
    44774477    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    44784478    if (UNLIKELY(!castedThis))
    … …  
    44864486EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionImmutablePointFunction(ExecState* exec)
    44874487{
    4488     JSValue thisValue = exec->hostThisValue();
     4488    JSValue thisValue = exec->thisValue();
    44894489    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    44904490    if (UNLIKELY(!castedThis))
    … …  
    44984498EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOrange(ExecState* exec)
    44994499{
    4500     JSValue thisValue = exec->hostThisValue();
     4500    JSValue thisValue = exec->thisValue();
    45014501    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    45024502    if (UNLIKELY(!castedThis))
    … …  
    45104510EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionStrictFunction(ExecState* exec)
    45114511{
    4512     JSValue thisValue = exec->hostThisValue();
     4512    JSValue thisValue = exec->thisValue();
    45134513    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    45144514    if (UNLIKELY(!castedThis))
    … …  
    45364536EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionStrictFunctionWithSequence(ExecState* exec)
    45374537{
    4538     JSValue thisValue = exec->hostThisValue();
     4538    JSValue thisValue = exec->thisValue();
    45394539    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    45404540    if (UNLIKELY(!castedThis))
    … …  
    45614561EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionStrictFunctionWithArray(ExecState* exec)
    45624562{
    4563     JSValue thisValue = exec->hostThisValue();
     4563    JSValue thisValue = exec->thisValue();
    45644564    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    45654565    if (UNLIKELY(!castedThis))
    … …  
    45864586EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicStringMethod(ExecState* exec)
    45874587{
    4588     JSValue thisValue = exec->hostThisValue();
     4588    JSValue thisValue = exec->thisValue();
    45894589    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    45904590    if (UNLIKELY(!castedThis))
    … …  
    46064606EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicDoubleMethod(ExecState* exec)
    46074607{
    4608     JSValue thisValue = exec->hostThisValue();
     4608    JSValue thisValue = exec->thisValue();
    46094609    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    46104610    if (UNLIKELY(!castedThis))
    … …  
    46264626EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionVariadicNodeMethod(ExecState* exec)
    46274627{
    4628     JSValue thisValue = exec->hostThisValue();
     4628    JSValue thisValue = exec->thisValue();
    46294629    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    46304630    if (UNLIKELY(!castedThis))
    … …  
    46494649EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionAny(ExecState* exec)
    46504650{
    4651     JSValue thisValue = exec->hostThisValue();
     4651    JSValue thisValue = exec->thisValue();
    46524652    JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
    46534653    if (UNLIKELY(!castedThis))

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

    r166417 r166493  
    506506EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionFunc(ExecState* exec)
    507507{
    508     JSValue thisValue = exec->hostThisValue();
     508    JSValue thisValue = exec->thisValue();
    509509    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    510510    if (UNLIKELY(!castedThis))
    … …  
    528528EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionSetShadow(ExecState* exec)
    529529{
    530     JSValue thisValue = exec->hostThisValue();
     530    JSValue thisValue = exec->thisValue();
    531531    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    532532    if (UNLIKELY(!castedThis))
    … …  
    569569EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMethodWithSequenceArg(ExecState* exec)
    570570{
    571     JSValue thisValue = exec->hostThisValue();
     571    JSValue thisValue = exec->thisValue();
    572572    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    573573    if (UNLIKELY(!castedThis))
    … …  
    586586EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionNullableArrayArg(ExecState* exec)
    587587{
    588     JSValue thisValue = exec->hostThisValue();
     588    JSValue thisValue = exec->thisValue();
    589589    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    590590    if (UNLIKELY(!castedThis))
    … …  
    603603EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionFuncWithClamp(ExecState* exec)
    604604{
    605     JSValue thisValue = exec->hostThisValue();
     605    JSValue thisValue = exec->thisValue();
    606606    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    607607    if (UNLIKELY(!castedThis))
    … …  
    640640EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionImmutablePointFunction(ExecState* exec)
    641641{
    642     JSValue thisValue = exec->hostThisValue();
     642    JSValue thisValue = exec->thisValue();
    643643    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    644644    if (UNLIKELY(!castedThis))
    … …  
    652652EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringArrayFunction(ExecState* exec)
    653653{
    654     JSValue thisValue = exec->hostThisValue();
     654    JSValue thisValue = exec->thisValue();
    655655    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    656656    if (UNLIKELY(!castedThis))
    … …  
    672672EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionStringArrayFunction2(ExecState* exec)
    673673{
    674     JSValue thisValue = exec->hostThisValue();
     674    JSValue thisValue = exec->thisValue();
    675675    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    676676    if (UNLIKELY(!castedThis))
    … …  
    692692EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionCallWithSequenceThatRequiresInclude(ExecState* exec)
    693693{
    694     JSValue thisValue = exec->hostThisValue();
     694    JSValue thisValue = exec->thisValue();
    695695    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    696696    if (UNLIKELY(!castedThis))
    … …  
    709709EncodedJSValue JSC_HOST_CALL jsTestTypedefsPrototypeFunctionMethodWithException(ExecState* exec)
    710710{
    711     JSValue thisValue = exec->hostThisValue();
     711    JSValue thisValue = exec->thisValue();
    712712    JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(thisValue);
    713713    if (UNLIKELY(!castedThis))

  • trunk/Source/WebCore/bridge/objc/objc_runtime.mm

    r165676 r166493  
    222222static EncodedJSValue JSC_HOST_CALL callObjCFallbackObject(ExecState* exec)
    223223{
    224     JSValue thisValue = exec->hostThisValue();
     224    JSValue thisValue = exec->thisValue();
    225225    if (!thisValue.inherits(ObjCRuntimeObject::info()))
    226226        return throwVMTypeError(exec);

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

    r165676 r166493  
    8383    RefPtr<Instance> instance;
    8484
    85     JSValue thisValue = exec->hostThisValue();
     85    JSValue thisValue = exec->thisValue();
    8686    if (thisValue.inherits(RuntimeObject::info())) {
    8787        RuntimeObject* runtimeObject = static_cast<RuntimeObject*>(asObject(thisValue));

  • trunk/Source/WebKit2/ChangeLog

    r166492 r166493  
     12014-03-31  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
     2
     3        Remove hostThisRegister() and hostThisValue()
     4        https://bugs.webkit.org/show_bug.cgi?id=130895
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        Removed hostThisRegister() and hostThisValue() and instead use thisArgumentOffset() and thisValue() respectively.
     9
     10        * WebProcess/Plugins/Netscape/JSNPMethod.cpp:
     11        (WebKit::callMethod):
     12
    1132014-03-31  Carlos Garcia Campos  <cgarcia@igalia.com>
    214

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

    r160208 r166493  
    6262    JSNPMethod* jsNPMethod = jsCast<JSNPMethod*>(exec->callee());
    6363
    64     JSValue thisValue = exec->hostThisValue();
     64    JSValue thisValue = exec->thisValue();
    6565
    6666    // Check if we're calling a method on the plug-in script object.
Note: See TracChangeset for help on using the changeset viewer.