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

Directly store the referenced QV4::Function pointer in the binding function 

There's no need to store a pointer to the original function here, we
can simplify the code when storing the pointer to the QV4::Function
directly.

Change-Id: I377aaecf56a0118606713c26cc7da4da001766b1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Lars Knoll 2016-12-05 14:23:09 +01:00
parent ef90db10a8
commit a11be5881a
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qml/qml/qqmljavascriptexpression.cpp
View File

@ -462,10 +462,6 @@ void QQmlJavaScriptExpression::setFunctionObject(const QV4::FunctionObject *o)
m_qmlScope.set(o->engine(), o->d()->scope);
m_v4Function = o->d()->function;
if (o->isBinding()) {
const QV4::QQmlBindingFunction *b = static_cast<const QV4::QQmlBindingFunction *>(o);
m_v4Function = b->d()->originalFunction->function;
}
Q_ASSERT(m_v4Function);
m_compilationUnit = m_v4Function->compilationUnit;
}

19
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
View File

@ -1303,8 +1303,9 @@ ReturnedValue QtObject::method_locale(CallContext *ctx)
void Heap::QQmlBindingFunction::init(const QV4::FunctionObject *originalFunction)
{
QV4::Heap::FunctionObject::init(originalFunction->scope(), originalFunction->name());
this->originalFunction = originalFunction->d();
Scope scope(originalFunction->engine());
ScopedContext context(scope, originalFunction->scope());
FunctionObject::init(context, originalFunction->function());
}
QQmlSourceLocation QQmlBindingFunction::currentLocation() const
@ -1313,20 +1314,6 @@ QQmlSourceLocation QQmlBindingFunction::currentLocation() const
return QQmlSourceLocation(frame.source, frame.line, 0);
}
void QQmlBindingFunction::call(const Managed *that, Scope &scope, CallData *callData)
{
ScopedFunctionObject function(scope, static_cast<const QQmlBindingFunction*>(that)->d()->originalFunction);
function->call(scope, callData);
}
void QQmlBindingFunction::markObjects(Heap::Base *that, ExecutionEngine *e)
{
QQmlBindingFunction::Data *This = static_cast<QQmlBindingFunction::Data *>(that);
if (This->originalFunction)
This->originalFunction->mark(e);
QV4::FunctionObject::markObjects(that, e);
}
DEFINE_OBJECT_VTABLE(QQmlBindingFunction);
/*!

6
src/qml/qml/v8/qqmlbuiltinfunctions_p.h
View File

@ -82,7 +82,6 @@ struct ConsoleObject : Object {
struct QQmlBindingFunction : FunctionObject {
void init(const QV4::FunctionObject *originalFunction);
Pointer<FunctionObject> originalFunction;
};
}
@ -179,13 +178,8 @@ struct Q_QML_PRIVATE_EXPORT GlobalExtensions {
struct QQmlBindingFunction : public QV4::FunctionObject
{
V4_OBJECT2(QQmlBindingFunction, FunctionObject)
V4_NEEDS_DESTROY
QQmlSourceLocation currentLocation() const; // from caller stack trace
static void call(const Managed *that, Scope &scope, CallData *callData);
static void markObjects(Heap::Base *that, ExecutionEngine *e);
};
}