Changeset 56686 in webkit

Timestamp:

Mar 28, 2010 3:03:50 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-28 Jedrzej Nowacki <​jedrzej.nowacki@nokia.com>

Reviewed by Simon Hausmann.

QScriptEngine API was enriched by globalObject() method
which give an access to the global object.

[Qt] QScriptEngine doesn't give an access to global object
​https://bugs.webkit.org/show_bug.cgi?id=36603

• qt/api/qscriptengine.cpp: (QScriptEngine::globalObject):
• qt/api/qscriptengine.h:
• qt/api/qscriptengine_p.cpp: (QScriptEnginePrivate::globalObject):
• qt/api/qscriptengine_p.h:
• qt/tests/qscriptengine/tst_qscriptengine.cpp: (tst_QScriptEngine::globalObject):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• qt/api/qscriptengine.cpp (modified) (1 diff)
• qt/api/qscriptengine.h (modified) (1 diff)
• qt/api/qscriptengine_p.cpp (modified) (1 diff)
• qt/api/qscriptengine_p.h (modified) (1 diff)
• qt/tests/qscriptengine/tst_qscriptengine.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-03-28  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        QScriptEngine API was enriched by globalObject() method
+        which give an access to the global object.
+
+        [Qt] QScriptEngine doesn't give an access to global object
+        https://bugs.webkit.org/show_bug.cgi?id=36603
+
+        * qt/api/qscriptengine.cpp:
+        (QScriptEngine::globalObject):
+        * qt/api/qscriptengine.h:
+        * qt/api/qscriptengine_p.cpp:
+        (QScriptEnginePrivate::globalObject):
+        * qt/api/qscriptengine_p.h:
+        * qt/tests/qscriptengine/tst_qscriptengine.cpp:
+        (tst_QScriptEngine::globalObject):
+
 2010-03-26  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/JavaScriptCore/qt/api/qscriptengine.cpp

@@ -144 +144 @@
     return QScriptValue(this, QScriptValue::UndefinedValue);
 }
+
+/*!
+  Returns this engine's Global Object.
+
+  By default, the Global Object contains the built-in objects that are
+  part of \l{ECMA-262}, such as Math, Date and String. Additionally,
+  you can set properties of the Global Object to make your own
+  extensions available to all script code. Non-local variables in
+  script code will be created as properties of the Global Object, as
+  well as local variables in global code.
+*/
+QScriptValue QScriptEngine::globalObject() const
+{
+    return QScriptValuePrivate::get(d_ptr->globalObject());
+}

trunk/JavaScriptCore/qt/api/qscriptengine.h

@@ -48 +48 @@
     QScriptValue nullValue();
     QScriptValue undefinedValue();
+    QScriptValue globalObject() const;
 private:
     friend class QScriptEnginePrivate;

trunk/JavaScriptCore/qt/api/qscriptengine_p.cpp

@@ -70 +70 @@
     return new QScriptValuePrivate(this, evaluate(program->program(), program->file(), program->line()));
 }
+
+QScriptValuePrivate* QScriptEnginePrivate::globalObject() const
+{
+    JSObjectRef globalObject = JSContextGetGlobalObject(context());
+    return new QScriptValuePrivate(this, globalObject, globalObject);
+}

trunk/JavaScriptCore/qt/api/qscriptengine_p.h

@@ -53 +53 @@
     inline JSValueRef makeJSValue(bool number) const;
     inline JSValueRef makeJSValue(QScriptValue::SpecialValue value) const;
+
+    QScriptValuePrivate* globalObject() const;
 
     inline QScriptStringPrivate* toStringHandle(const QString& str) const;

trunk/JavaScriptCore/qt/tests/qscriptengine/tst_qscriptengine.cpp

@@ -36 +36 @@
 
 private slots:
+    void globalObject();
     void evaluate();
     void collectGarbage();
@@ -51 +52 @@
     QVERIFY2(engine.evaluate("1+1").isValid(), "the expression should be evaluated and an valid result should be returned");
     QVERIFY2(engine.evaluate("ping").isValid(), "Script throwing an unhandled exception should return an exception value");
+}
+
+void tst_QScriptEngine::globalObject()
+{
+    QScriptEngine engine;
+    QScriptValue global = engine.globalObject();
+    QScriptValue self = engine.evaluate("this");
+    QVERIFY(global.isObject());
+    QVERIFY(engine.globalObject().equals(engine.evaluate("this")));
+    QEXPECT_FAIL("", "strictlyEquals is broken - bug 36600 in bugs.webkit.org", Continue);
+    QVERIFY(engine.globalObject().strictlyEquals(self));
 }