From 7025e0d29b653b575ad28556c9b78f7a8e040b49 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 4 Aug 2009 17:14:02 +0200 Subject: move Global Object to its own file --- src/script/api/qscriptengine.cpp | 133 +----------------------------- src/script/bridge/bridge.pri | 2 + src/script/bridge/qscriptglobalobject.cpp | 131 +++++++++++++++++++++++++++++ src/script/bridge/qscriptglobalobject_p.h | 133 ++++++++++++++++++++++++++++++ 4 files changed, 267 insertions(+), 132 deletions(-) create mode 100644 src/script/bridge/qscriptglobalobject.cpp create mode 100644 src/script/bridge/qscriptglobalobject_p.h diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 088cf77..179a49f 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -79,6 +79,7 @@ #include "bridge/qscriptclassobject_p.h" #include "bridge/qscriptvariant_p.h" #include "bridge/qscriptqobject_p.h" +#include "bridge/qscriptglobalobject_p.h" #include "bridge/qscriptactivationobject_p.h" #ifndef QT_NO_QOBJECT @@ -352,66 +353,6 @@ struct GlobalClientData : public JSC::JSGlobalData::ClientData QScriptEnginePrivate *engine; }; -class GlobalObject : public JSC::JSGlobalObject -{ -public: - GlobalObject(); - virtual ~GlobalObject(); - virtual JSC::UString className() const { return "global"; } - virtual void mark(); - virtual bool getOwnPropertySlot(JSC::ExecState*, - const JSC::Identifier& propertyName, - JSC::PropertySlot&); - virtual void put(JSC::ExecState* exec, const JSC::Identifier& propertyName, - JSC::JSValue, JSC::PutPropertySlot&); - virtual bool deleteProperty(JSC::ExecState*, - const JSC::Identifier& propertyName, - bool checkDontDelete = true); - virtual bool getPropertyAttributes(JSC::ExecState*, const JSC::Identifier&, - unsigned&) const; - virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, bool includeNonEnumerable = false); - -public: - JSC::JSObject *customGlobalObject; -}; - -class OriginalGlobalObjectProxy : public JSC::JSObject -{ -public: - explicit OriginalGlobalObjectProxy(WTF::PassRefPtr sid, - JSC::JSGlobalObject *object) - : JSC::JSObject(sid), originalGlobalObject(object) - {} - virtual ~OriginalGlobalObjectProxy() - {} - virtual JSC::UString className() const - { return originalGlobalObject->className(); } - virtual void mark() - { - Q_ASSERT(!marked()); - if (!originalGlobalObject->marked()) - originalGlobalObject->JSC::JSGlobalObject::mark(); - JSC::JSObject::mark(); - } - virtual bool getOwnPropertySlot(JSC::ExecState* exec, - const JSC::Identifier& propertyName, - JSC::PropertySlot& slot) - { return originalGlobalObject->JSC::JSGlobalObject::getOwnPropertySlot(exec, propertyName, slot); } - virtual void put(JSC::ExecState* exec, const JSC::Identifier& propertyName, - JSC::JSValue value, JSC::PutPropertySlot& slot) - { originalGlobalObject->JSC::JSGlobalObject::put(exec, propertyName, value, slot); } - virtual bool deleteProperty(JSC::ExecState* exec, - const JSC::Identifier& propertyName, bool checkDontDelete = true) - { return originalGlobalObject->JSC::JSGlobalObject::deleteProperty(exec, propertyName, checkDontDelete); } - virtual bool getPropertyAttributes(JSC::ExecState* exec, const JSC::Identifier& propertyName, - unsigned& attributes) const - { return originalGlobalObject->JSC::JSGlobalObject::getPropertyAttributes(exec, propertyName, attributes); } - virtual void getPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames, bool includeNonEnumerable = false) - { originalGlobalObject->JSC::JSGlobalObject::getPropertyNames(exec, propertyNames, includeNonEnumerable); } -private: - JSC::JSGlobalObject *originalGlobalObject; -}; - class TimeoutCheckerProxy : public JSC::TimeoutChecker { public: @@ -686,71 +627,6 @@ JSC::JSValue functionConnect(JSC::ExecState *exec, JSC::JSObject */*callee*/, JS #endif // QT_NO_QOBJECT } -GlobalObject::GlobalObject() - : JSC::JSGlobalObject(), customGlobalObject(0) -{ -} - -GlobalObject::~GlobalObject() -{ -} - -void GlobalObject::mark() -{ - Q_ASSERT(!marked()); - JSC::JSGlobalObject::mark(); - if (customGlobalObject && !customGlobalObject->marked()) - customGlobalObject->mark(); -} - -bool GlobalObject::getOwnPropertySlot(JSC::ExecState* exec, - const JSC::Identifier& propertyName, - JSC::PropertySlot& slot) -{ - QScriptEnginePrivate *engine = scriptEngineFromExec(exec); - if (propertyName == exec->propertyNames().arguments && engine->currentFrame->argumentCount() > 0) { - JSC::JSValue args = engine->scriptValueToJSCValue(engine->contextForFrame(engine->currentFrame)->argumentsObject()); - slot.setValue(args); - return true; - } - if (customGlobalObject) - return customGlobalObject->getOwnPropertySlot(exec, propertyName, slot); - return JSC::JSGlobalObject::getOwnPropertySlot(exec, propertyName, slot); -} - -void GlobalObject::put(JSC::ExecState* exec, const JSC::Identifier& propertyName, - JSC::JSValue value, JSC::PutPropertySlot& slot) -{ - if (customGlobalObject) - customGlobalObject->put(exec, propertyName, value, slot); - else - JSC::JSGlobalObject::put(exec, propertyName, value, slot); -} - -bool GlobalObject::deleteProperty(JSC::ExecState* exec, - const JSC::Identifier& propertyName, bool checkDontDelete) -{ - if (customGlobalObject) - return customGlobalObject->deleteProperty(exec, propertyName, checkDontDelete); - return JSC::JSGlobalObject::deleteProperty(exec, propertyName, checkDontDelete); -} - -bool GlobalObject::getPropertyAttributes(JSC::ExecState* exec, const JSC::Identifier& propertyName, - unsigned& attributes) const -{ - if (customGlobalObject) - return customGlobalObject->getPropertyAttributes(exec, propertyName, attributes); - return JSC::JSGlobalObject::getPropertyAttributes(exec, propertyName, attributes); -} - -void GlobalObject::getPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames, bool includeNonEnumerable) -{ - if (customGlobalObject) - customGlobalObject->getPropertyNames(exec, propertyNames, includeNonEnumerable); - else - JSC::JSGlobalObject::getPropertyNames(exec, propertyNames, includeNonEnumerable); -} - static JSC::JSValue JSC_HOST_CALL functionPrint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); static JSC::JSValue JSC_HOST_CALL functionGC(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); static JSC::JSValue JSC_HOST_CALL functionVersion(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); @@ -924,13 +800,6 @@ QScriptPushScopeHelper::~QScriptPushScopeHelper() } // namespace QScript -namespace JSC { - -ASSERT_CLASS_FITS_IN_CELL(QScript::GlobalObject); -ASSERT_CLASS_FITS_IN_CELL(QScript::OriginalGlobalObjectProxy); - -} // namespace JSC - QScriptEnginePrivate::QScriptEnginePrivate() : idGenerator(1) { qMetaTypeId(); diff --git a/src/script/bridge/bridge.pri b/src/script/bridge/bridge.pri index f2883e7..666a07e 100644 --- a/src/script/bridge/bridge.pri +++ b/src/script/bridge/bridge.pri @@ -4,6 +4,7 @@ SOURCES += \ $$PWD/qscriptclassobject.cpp \ $$PWD/qscriptvariant.cpp \ $$PWD/qscriptqobject.cpp \ + $$PWD/qscriptglobalobject.cpp \ $$PWD/qscriptactivationobject.cpp HEADERS += \ @@ -12,4 +13,5 @@ HEADERS += \ $$PWD/qscriptclassobject_p.h \ $$PWD/qscriptvariant_p.h \ $$PWD/qscriptqobject_p.h \ + $$PWD/qscriptglobalobject_p.h \ $$PWD/qscriptactivationobject_p.h diff --git a/src/script/bridge/qscriptglobalobject.cpp b/src/script/bridge/qscriptglobalobject.cpp new file mode 100644 index 0000000..2da7a98 --- /dev/null +++ b/src/script/bridge/qscriptglobalobject.cpp @@ -0,0 +1,131 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtScript module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qscriptglobalobject_p.h" + +#ifndef QT_NO_SCRIPT + +#include "../api/qscriptengine.h" +#include "../api/qscriptengine_p.h" + +QT_BEGIN_NAMESPACE + +namespace JSC +{ + +ASSERT_CLASS_FITS_IN_CELL(QScript::GlobalObject); +ASSERT_CLASS_FITS_IN_CELL(QScript::OriginalGlobalObjectProxy); + +} // namespace JSC + +namespace QScript +{ + +GlobalObject::GlobalObject() + : JSC::JSGlobalObject(), customGlobalObject(0) +{ +} + +GlobalObject::~GlobalObject() +{ +} + +void GlobalObject::mark() +{ + Q_ASSERT(!marked()); + JSC::JSGlobalObject::mark(); + if (customGlobalObject && !customGlobalObject->marked()) + customGlobalObject->mark(); +} + +bool GlobalObject::getOwnPropertySlot(JSC::ExecState* exec, + const JSC::Identifier& propertyName, + JSC::PropertySlot& slot) +{ + QScriptEnginePrivate *engine = scriptEngineFromExec(exec); + if (propertyName == exec->propertyNames().arguments && engine->currentFrame->argumentCount() > 0) { + JSC::JSValue args = engine->scriptValueToJSCValue(engine->contextForFrame(engine->currentFrame)->argumentsObject()); + slot.setValue(args); + return true; + } + if (customGlobalObject) + return customGlobalObject->getOwnPropertySlot(exec, propertyName, slot); + return JSC::JSGlobalObject::getOwnPropertySlot(exec, propertyName, slot); +} + +void GlobalObject::put(JSC::ExecState* exec, const JSC::Identifier& propertyName, + JSC::JSValue value, JSC::PutPropertySlot& slot) +{ + if (customGlobalObject) + customGlobalObject->put(exec, propertyName, value, slot); + else + JSC::JSGlobalObject::put(exec, propertyName, value, slot); +} + +bool GlobalObject::deleteProperty(JSC::ExecState* exec, + const JSC::Identifier& propertyName, bool checkDontDelete) +{ + if (customGlobalObject) + return customGlobalObject->deleteProperty(exec, propertyName, checkDontDelete); + return JSC::JSGlobalObject::deleteProperty(exec, propertyName, checkDontDelete); +} + +bool GlobalObject::getPropertyAttributes(JSC::ExecState* exec, const JSC::Identifier& propertyName, + unsigned& attributes) const +{ + if (customGlobalObject) + return customGlobalObject->getPropertyAttributes(exec, propertyName, attributes); + return JSC::JSGlobalObject::getPropertyAttributes(exec, propertyName, attributes); +} + +void GlobalObject::getPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames, bool includeNonEnumerable) +{ + if (customGlobalObject) + customGlobalObject->getPropertyNames(exec, propertyNames, includeNonEnumerable); + else + JSC::JSGlobalObject::getPropertyNames(exec, propertyNames, includeNonEnumerable); +} + +} // namespace QScript + +QT_END_NAMESPACE + +#endif // QT_NO_SCRIPT diff --git a/src/script/bridge/qscriptglobalobject_p.h b/src/script/bridge/qscriptglobalobject_p.h new file mode 100644 index 0000000..8b44693 --- /dev/null +++ b/src/script/bridge/qscriptglobalobject_p.h @@ -0,0 +1,133 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtScript module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSCRIPTGLOBALOBJECT_P_H +#define QSCRIPTGLOBALOBJECT_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include + +#ifndef QT_NO_SCRIPT + +#include "JSGlobalObject.h" + +QT_BEGIN_NAMESPACE + +namespace QScript +{ + +class GlobalObject : public JSC::JSGlobalObject +{ +public: + GlobalObject(); + virtual ~GlobalObject(); + virtual JSC::UString className() const { return "global"; } + virtual void mark(); + virtual bool getOwnPropertySlot(JSC::ExecState*, + const JSC::Identifier& propertyName, + JSC::PropertySlot&); + virtual void put(JSC::ExecState* exec, const JSC::Identifier& propertyName, + JSC::JSValue, JSC::PutPropertySlot&); + virtual bool deleteProperty(JSC::ExecState*, + const JSC::Identifier& propertyName, + bool checkDontDelete = true); + virtual bool getPropertyAttributes(JSC::ExecState*, const JSC::Identifier&, + unsigned&) const; + virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, bool includeNonEnumerable = false); + +public: + JSC::JSObject *customGlobalObject; +}; + +class OriginalGlobalObjectProxy : public JSC::JSObject +{ +public: + explicit OriginalGlobalObjectProxy(WTF::PassRefPtr sid, + JSC::JSGlobalObject *object) + : JSC::JSObject(sid), originalGlobalObject(object) + {} + virtual ~OriginalGlobalObjectProxy() + {} + virtual JSC::UString className() const + { return originalGlobalObject->className(); } + virtual void mark() + { + Q_ASSERT(!marked()); + if (!originalGlobalObject->marked()) + originalGlobalObject->JSC::JSGlobalObject::mark(); + JSC::JSObject::mark(); + } + virtual bool getOwnPropertySlot(JSC::ExecState* exec, + const JSC::Identifier& propertyName, + JSC::PropertySlot& slot) + { return originalGlobalObject->JSC::JSGlobalObject::getOwnPropertySlot(exec, propertyName, slot); } + virtual void put(JSC::ExecState* exec, const JSC::Identifier& propertyName, + JSC::JSValue value, JSC::PutPropertySlot& slot) + { originalGlobalObject->JSC::JSGlobalObject::put(exec, propertyName, value, slot); } + virtual bool deleteProperty(JSC::ExecState* exec, + const JSC::Identifier& propertyName, bool checkDontDelete = true) + { return originalGlobalObject->JSC::JSGlobalObject::deleteProperty(exec, propertyName, checkDontDelete); } + virtual bool getPropertyAttributes(JSC::ExecState* exec, const JSC::Identifier& propertyName, + unsigned& attributes) const + { return originalGlobalObject->JSC::JSGlobalObject::getPropertyAttributes(exec, propertyName, attributes); } + virtual void getPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames, bool includeNonEnumerable = false) + { originalGlobalObject->JSC::JSGlobalObject::getPropertyNames(exec, propertyNames, includeNonEnumerable); } +private: + JSC::JSGlobalObject *originalGlobalObject; +}; + +} // namespace QScript + +QT_END_NAMESPACE + +#endif // QT_NO_SCRIPT + +#endif -- cgit v0.12