<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[242349] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/242349">242349</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-04 02:34:04 -0800 (Mon, 04 Mar 2019)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GLib] Returning G_TYPE_OBJECT from a constructor does not work
https://bugs.webkit.org/show_bug.cgi?id=195206
Reviewed by Žan Doberšek.
Source/JavaScriptCore:
We are freeing the newly created object before returning from the constructor.
* API/glib/JSCCallbackFunction.cpp:
(JSC::JSCCallbackFunction::construct):
Tools:
Add a new test case.
* TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:
(testJSCClass):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIglibJSCCallbackFunctioncpp">trunk/Source/JavaScriptCore/API/glib/JSCCallbackFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsJavaScriptCoreglibTestJSCcpp">trunk/Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIglibJSCCallbackFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/glib/JSCCallbackFunction.cpp (242348 => 242349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/glib/JSCCallbackFunction.cpp 2019-03-04 10:30:46 UTC (rev 242348)
+++ trunk/Source/JavaScriptCore/API/glib/JSCCallbackFunction.cpp 2019-03-04 10:34:04 UTC (rev 242349)
</span><span class="lines">@@ -205,11 +205,8 @@
</span><span class="cx"> switch (g_type_fundamental(G_VALUE_TYPE(&returnValue))) {
</span><span class="cx"> case G_TYPE_POINTER:
</span><span class="cx"> case G_TYPE_OBJECT:
</span><del>- if (auto* ptr = returnValue.data[0].v_pointer) {
- auto* retval = jscClassGetOrCreateJSWrapper(m_class.get(), ptr);
- g_value_unset(&returnValue);
- return toRef(retval);
- }
</del><ins>+ if (auto* ptr = returnValue.data[0].v_pointer)
+ return toRef(jscClassGetOrCreateJSWrapper(m_class.get(), ptr));
</ins><span class="cx"> *exception = toRef(JSC::createTypeError(toJS(jsContext), "constructor returned null"_s));
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -216,6 +213,7 @@
</span><span class="cx"> *exception = toRef(JSC::createTypeError(toJS(jsContext), makeString("invalid type ", g_type_name(G_VALUE_TYPE(&returnValue)), " returned by constructor")));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ g_value_unset(&returnValue);
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (242348 => 242349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2019-03-04 10:30:46 UTC (rev 242348)
+++ trunk/Source/JavaScriptCore/ChangeLog 2019-03-04 10:34:04 UTC (rev 242349)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-03-04 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLib] Returning G_TYPE_OBJECT from a constructor does not work
+ https://bugs.webkit.org/show_bug.cgi?id=195206
+
+ Reviewed by Žan Doberšek.
+
+ We are freeing the newly created object before returning from the constructor.
+
+ * API/glib/JSCCallbackFunction.cpp:
+ (JSC::JSCCallbackFunction::construct):
+
</ins><span class="cx"> 2019-03-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Retire legacy dtoa function and DecimalNumber class
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (242348 => 242349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2019-03-04 10:30:46 UTC (rev 242348)
+++ trunk/Tools/ChangeLog 2019-03-04 10:34:04 UTC (rev 242349)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-03-04 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLib] Returning G_TYPE_OBJECT from a constructor does not work
+ https://bugs.webkit.org/show_bug.cgi?id=195206
+
+ Reviewed by Žan Doberšek.
+
+ Add a new test case.
+
+ * TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:
+ (testJSCClass):
+
</ins><span class="cx"> 2019-03-04 Charlie Turner <cturner@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WPE] Inline wl_array_for_each to workaround C++ compatibility issue
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsJavaScriptCoreglibTestJSCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp (242348 => 242349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp 2019-03-04 10:30:46 UTC (rev 242348)
+++ trunk/Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp 2019-03-04 10:34:04 UTC (rev 242349)
</span><span class="lines">@@ -1589,6 +1589,14 @@
</span><span class="cx"> nullptr, nullptr, nullptr, nullptr
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+static GFile* createGFile(const char* path)
+{
+ GFile* file = g_file_new_for_path(path);
+ auto* checker = static_cast<LeakChecker*>(g_object_get_data(G_OBJECT(jsc_context_get_current()), "leak-checker"));
+ checker->watch(file);
+ return file;
+}
+
</ins><span class="cx"> static void testJSCClass()
</span><span class="cx"> {
</span><span class="cx"> {
</span><span class="lines">@@ -2248,6 +2256,47 @@
</span><span class="cx"> g_assert_did_throw(exceptionHandler, didThrow);
</span><span class="cx"> g_assert_true(jsc_context_get_exception(context.get()) == previousException.get());
</span><span class="cx"> }
</span><ins>+
+ {
+ LeakChecker checker;
+ GRefPtr<JSCContext> context = adoptGRef(jsc_context_new());
+ checker.watch(context.get());
+ g_object_set_data(G_OBJECT(context.get()), "leak-checker", &checker);
+ ExceptionHandler exceptionHandler(context.get());
+
+ JSCClass* jscClass = jsc_context_register_class(context.get(), "GFile", nullptr, nullptr, reinterpret_cast<GDestroyNotify>(g_object_unref));
+ checker.watch(jscClass);
+
+ GRefPtr<JSCValue> constructor = adoptGRef(jsc_class_add_constructor(jscClass, nullptr, G_CALLBACK(createGFile), nullptr, nullptr, G_TYPE_OBJECT, 1, G_TYPE_STRING));
+ checker.watch(constructor.get());
+ g_assert_true(jsc_value_is_constructor(constructor.get()));
+ jsc_class_add_method(jscClass, "getPath", G_CALLBACK(g_file_get_path), nullptr, nullptr, G_TYPE_STRING, 0, G_TYPE_NONE);
+
+ jsc_context_set_value(context.get(), jsc_class_get_name(jscClass), constructor.get());
+
+ GRefPtr<JSCValue> file = adoptGRef(jsc_context_evaluate(context.get(), "f = new GFile('.');", -1));
+ checker.watch(file.get());
+ g_assert_true(jsc_value_is_object(file.get()));
+ g_assert_true(jsc_value_object_is_instance_of(file.get(), jsc_class_get_name(jscClass)));
+ GRefPtr<JSCValue> result = adoptGRef(jsc_context_evaluate(context.get(), "f instanceof GFile;", -1));
+ checker.watch(result.get());
+ g_assert_true(jsc_value_is_boolean(result.get()));
+ g_assert_true(jsc_value_to_boolean(result.get()));
+
+ g_assert_true(jsc_value_object_has_property(file.get(), "getPath"));
+ GRefPtr<JSCValue> value = adoptGRef(jsc_value_object_invoke_method(file.get(), "getPath", G_TYPE_NONE));
+ checker.watch(value.get());
+ g_assert_true(jsc_value_is_string(value.get()));
+ GUniquePtr<char> resultString(jsc_value_to_string(value.get()));
+ GUniquePtr<char> currentDirectory(g_get_current_dir());
+ g_assert_cmpstr(resultString.get(), ==, currentDirectory.get());
+
+ GRefPtr<JSCValue> value2 = adoptGRef(jsc_context_evaluate(context.get(), "f.getPath('.');", -1));
+ checker.watch(value2.get());
+ g_assert_true(jsc_value_is_string(value2.get()));
+ resultString.reset(jsc_value_to_string(value2.get()));
+ g_assert_cmpstr(resultString.get(), ==, currentDirectory.get());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef struct {
</span></span></pre>
</div>
</div>
</body>
</html>