Changeset 34334 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp
- Timestamp:
- Jun 2, 2008, 11:26:54 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/kjs/array_object.cpp
r34316 r34334 164 164 UString str; 165 165 if (conversionFunction->isObject() && static_cast<JSObject*>(conversionFunction)->implementsCall()) 166 str = static_cast<JSObject*>(conversionFunction)->call (exec, o, exec->emptyList())->toString(exec);166 str = static_cast<JSObject*>(conversionFunction)->callAsFunction(exec, o, exec->emptyList())->toString(exec); 167 167 else 168 168 str = element->toString(exec); … … 410 410 l.append(jObj); 411 411 l.append(minObj); 412 compareResult = sortFunction->call (exec, exec->globalThisValue(), l)->toNumber(exec);412 compareResult = sortFunction->callAsFunction(exec, exec->globalThisValue(), l)->toNumber(exec); 413 413 } else 414 414 compareResult = (jObj->toString(exec) < minObj->toString(exec)) ? -1 : 1; … … 527 527 eachArguments.append(thisObj); 528 528 529 JSValue* result = eachFunction->call (exec, applyThis, eachArguments);529 JSValue* result = eachFunction->callAsFunction(exec, applyThis, eachArguments); 530 530 531 531 if (result->toBoolean(exec)) … … 562 562 eachArguments.append(thisObj); 563 563 564 JSValue* result = eachFunction->call (exec, applyThis, eachArguments);564 JSValue* result = eachFunction->callAsFunction(exec, applyThis, eachArguments); 565 565 resultArray->put(exec, k, result); 566 566 } … … 598 598 eachArguments.append(thisObj); 599 599 600 bool predicateResult = eachFunction->call (exec, applyThis, eachArguments)->toBoolean(exec);600 bool predicateResult = eachFunction->callAsFunction(exec, applyThis, eachArguments)->toBoolean(exec); 601 601 602 602 if (!predicateResult) { … … 629 629 eachArguments.append(thisObj); 630 630 631 eachFunction->call (exec, applyThis, eachArguments);631 eachFunction->callAsFunction(exec, applyThis, eachArguments); 632 632 } 633 633 return jsUndefined(); … … 656 656 eachArguments.append(thisObj); 657 657 658 bool predicateResult = eachFunction->call (exec, applyThis, eachArguments)->toBoolean(exec);658 bool predicateResult = eachFunction->callAsFunction(exec, applyThis, eachArguments)->toBoolean(exec); 659 659 660 660 if (predicateResult) {
Note:
See TracChangeset
for help on using the changeset viewer.