qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Smaller optimisations 

Change-Id: Idb35d57801472e73b4e77b83e129dbb2a484b734
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Lars Knoll 2013-11-02 21:41:58 +01:00 committed by The Qt Project
parent 9ca52f32e9
commit 83947c2544
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qml/jsruntime/qv4runtime.cpp
View File

@ -892,14 +892,13 @@ ReturnedValue __qmljs_call_property(ExecutionContext *context, const StringRef n
ReturnedValue __qmljs_call_property_lookup(ExecutionContext *context, uint index, CallDataRef callData)
{
Scope scope(context);
Lookup *l = context->lookups + index;
Scoped<Object> o(scope, l->getter(l, callData->thisObject));
if (!o)
SafeValue v;
v = l->getter(l, callData->thisObject);
if (!v.isManaged())
return context->throwTypeError();
return o->call(callData);
return v.managed()->call(callData);
}
ReturnedValue __qmljs_call_element(ExecutionContext *context, const ValueRef index, CallDataRef callData)
@ -921,11 +920,10 @@ ReturnedValue __qmljs_call_element(ExecutionContext *context, const ValueRef ind
ReturnedValue __qmljs_call_value(ExecutionContext *context, const ValueRef func, CallDataRef callData)
{
Object *o = func->asObject();
if (!o)
if (!func->isManaged())
return context->throwTypeError();
return o->call(callData);
return func->managed()->call(callData);
}