Changeset 233759 in webkit

Timestamp:

Jul 11, 2018 10:13:56 PM (6 years ago)

Author:

Carlos Garcia Campos

Message:

[GLIB] Add jsc_context_get_global_object() to GLib API
​https://bugs.webkit.org/show_bug.cgi?id=187515

Reviewed by Michael Catanzaro.

Source/JavaScriptCore:

This wasn't exposed because we have convenient methods in JSCContext to get and set properties on the global
object. However, getting the global object could be useful in some cases, for example to give it a well known
name like 'window' in browsers and GJS.

• API/glib/JSCContext.cpp:

(jsc_context_get_global_object):

• API/glib/JSCContext.h:
• API/glib/docs/jsc-glib-4.0-sections.txt:

Tools:

Add test cases.

• TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:

(testJSCGlobalObject):
(main):

Location:

trunk

Files:

• Source/JavaScriptCore/API/glib/JSCContext.cpp (modified) (1 diff)
• Source/JavaScriptCore/API/glib/JSCContext.h (modified) (1 diff)
• Source/JavaScriptCore/API/glib/docs/jsc-glib-4.0-sections.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/glib/JSCContext.cpp

@@ -787 +787 @@
 
 /**
+ * jsc_context_get_global_object:
+ * @context: a #JSCContext
+ *
+ * Get a #JSCValue referencing the @context global object
+ *
+ * Returns: (transfer full): a #JSCValue
+ */
+JSCValue* jsc_context_get_global_object(JSCContext* context)
+{
+    g_return_val_if_fail(JSC_IS_CONTEXT(context), nullptr);
+
+    return jscContextGetOrCreateValue(context, JSContextGetGlobalObject(context->priv->jsContext.get())).leakRef();
+}
+
+/**
  * jsc_context_set_value:
  * @context: a #JSCContext

trunk/Source/JavaScriptCore/API/glib/JSCContext.h

@@ -114 +114 @@
                                       const char         *uri);
 
+JSC_API JSCValue *
+jsc_context_get_global_object        (JSCContext         *context);
+
 JSC_API void
 jsc_context_set_value                (JSCContext         *context,

trunk/Source/JavaScriptCore/API/glib/docs/jsc-glib-4.0-sections.txt

@@ -39 +39 @@
 jsc_context_evaluate
 jsc_context_evaluate_with_source_uri
+jsc_context_get_global_object
 jsc_context_set_value
 jsc_context_get_value

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-07-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GLIB] Add jsc_context_get_global_object() to GLib API
+        https://bugs.webkit.org/show_bug.cgi?id=187515
+
+        Reviewed by Michael Catanzaro.
+
+        This wasn't exposed because we have convenient methods in JSCContext to get and set properties on the global
+        object. However, getting the global object could be useful in some cases, for example to give it a well known
+        name like 'window' in browsers and GJS.
+
+        * API/glib/JSCContext.cpp:
+        (jsc_context_get_global_object):
+        * API/glib/JSCContext.h:
+        * API/glib/docs/jsc-glib-4.0-sections.txt:
+
 2018-07-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2018-07-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GLIB] Add jsc_context_get_global_object() to GLib API
+        https://bugs.webkit.org/show_bug.cgi?id=187515
+
+        Reviewed by Michael Catanzaro.
+
+        Add test cases.
+
+        * TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:
+        (testJSCGlobalObject):
+        (main):
+
 2018-07-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp

@@ -546 +546 @@
 }
 
+static void testJSCGlobalObject()
+{
+    LeakChecker checker;
+    GRefPtr<JSCContext> context = adoptGRef(jsc_context_new());
+    checker.watch(context.get());
+    ExceptionHandler exceptionHandler(context.get());
+
+    GRefPtr<JSCValue> globalObject = adoptGRef(jsc_context_get_global_object(context.get()));
+    checker.watch(globalObject.get());
+    g_assert_true(jsc_value_is_object(globalObject.get()));
+
+    GRefPtr<JSCValue> foo = adoptGRef(jsc_value_new_number(context.get(), 25));
+    checker.watch(foo.get());
+    jsc_value_object_set_property(globalObject.get(), "foo", foo.get());
+
+    GRefPtr<JSCValue> foo2 = adoptGRef(jsc_context_get_value(context.get(), "foo"));
+    checker.watch(foo2.get());
+    g_assert_true(foo.get() == foo2.get());
+
+    GRefPtr<JSCValue> bar = adoptGRef(jsc_value_new_number(context.get(), 50));
+    checker.watch(bar.get());
+    jsc_context_set_value(context.get(), "bar", bar.get());
+
+    GRefPtr<JSCValue> bar2 = adoptGRef(jsc_value_object_get_property(globalObject.get(), "bar"));
+    checker.watch(bar2.get());
+    g_assert_true(bar.get() == bar2.get());
+
+    GRefPtr<JSCValue> baz = adoptGRef(jsc_context_evaluate(context.get(), "baz = 75", -1));
+    checker.watch(baz.get());
+
+    GRefPtr<JSCValue> baz2 = adoptGRef(jsc_value_object_get_property(globalObject.get(), "baz"));
+    checker.watch(baz2.get());
+    g_assert_true(baz.get() == baz2.get());
+
+    jsc_context_set_value(context.get(), "window", globalObject.get());
+    GRefPtr<JSCValue> window = adoptGRef(jsc_context_evaluate(context.get(), "window", -1));
+    checker.watch(window.get());
+    g_assert_true(window.get() == globalObject.get());
+
+    foo2 = adoptGRef(jsc_context_evaluate(context.get(), "window.foo", -1));
+    checker.watch(foo2.get());
+    g_assert_true(foo.get() == foo2.get());
+
+    GRefPtr<JSCValue> global = adoptGRef(jsc_context_evaluate(context.get(), "window.global = 100", -1));
+    checker.watch(global.get());
+    g_assert_true(jsc_value_is_number(global.get()));
+    g_assert_cmpint(jsc_value_to_int32(global.get()), ==, 100);
+
+    GRefPtr<JSCValue> global2 = adoptGRef(jsc_context_get_value(context.get(), "global"));
+    checker.watch(global2.get());
+    g_assert_true(global.get() == global2.get());
+
+    global2 = adoptGRef(jsc_value_object_get_property(globalObject.get(), "global"));
+    checker.watch(global2.get());
+    g_assert_true(global.get() == global2.get());
+
+    jsc_value_object_define_property_data(globalObject.get(), "window2", static_cast<JSCValuePropertyFlags>(0), globalObject.get());
+    GRefPtr<JSCValue> window2 = adoptGRef(jsc_context_evaluate(context.get(), "window2", -1));
+    checker.watch(window2.get());
+    g_assert_true(window2.get() == globalObject.get());
+}
+
 static int foo(int n)
 {
@@ -2739 +2801 @@
     g_test_add_func("/jsc/basic", testJSCBasic);
     g_test_add_func("/jsc/types", testJSCTypes);
+    g_test_add_func("/jsc/global-object", testJSCGlobalObject);
     g_test_add_func("/jsc/function", testJSCFunction);
     g_test_add_func("/jsc/object", testJSCObject);