<!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>[171181] trunk/Source/WebCore</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/171181">171181</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-17 02:29:49 -0700 (Thu, 17 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GObject] StrictTypeChecking extended attribute fails for methods with sequence<T>.
https://bugs.webkit.org/show_bug.cgi?id=121698
Patch by Vineet Chaudhary <code.vineet@gmail.com> on 2014-07-17
Reviewed by Antonio Gomes.
GodeGenerator was including wrong heeaders as WebKitDOMlong[] for methods with
array parameters and StrictTypeChecking extended attribute.
No new tests. TestObj.idl covers the tests.
* bindings/scripts/CodeGenerator.pm:
(GetArrayOrSequenceType):
* bindings/scripts/CodeGeneratorGObject.pm:
(GenerateFunction):
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
(webkit_dom_test_obj_strict_function_with_array):
* bindings/scripts/test/GObject/WebKitDOMTestObj.h:
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
(webkit_dom_test_typedefs_func):
(webkit_dom_test_typedefs_nullable_array_arg):
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
* bindings/scripts/test/TestObj.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorpm">trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefsh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171180 => 171181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-17 08:13:18 UTC (rev 171180)
+++ trunk/Source/WebCore/ChangeLog 2014-07-17 09:29:49 UTC (rev 171181)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-07-17 Vineet Chaudhary <code.vineet@gmail.com>
+
+ [GObject] StrictTypeChecking extended attribute fails for methods with sequence<T>.
+ https://bugs.webkit.org/show_bug.cgi?id=121698
+
+ Reviewed by Antonio Gomes.
+
+ GodeGenerator was including wrong heeaders as WebKitDOMlong[] for methods with
+ array parameters and StrictTypeChecking extended attribute.
+ No new tests. TestObj.idl covers the tests.
+
+ * bindings/scripts/CodeGenerator.pm:
+ (GetArrayOrSequenceType):
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (GenerateFunction):
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ (webkit_dom_test_obj_strict_function_with_array):
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
+ (webkit_dom_test_typedefs_func):
+ (webkit_dom_test_typedefs_nullable_array_arg):
+ * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
+ * bindings/scripts/test/TestObj.idl:
+
</ins><span class="cx"> 2014-07-17 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> CSS JIT: Clean up return path
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (171180 => 171181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2014-07-17 08:13:18 UTC (rev 171180)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2014-07-17 09:29:49 UTC (rev 171181)
</span><span class="lines">@@ -450,6 +450,14 @@
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub GetArrayOrSequenceType
+{
+ my $object = shift;
+ my $type = shift;
+
+ return $object->GetArrayType($type) || $object->GetSequenceType($type);
+}
+
</ins><span class="cx"> sub AssertNotSequenceType
</span><span class="cx"> {
</span><span class="cx"> my $object = shift;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (171180 => 171181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2014-07-17 08:13:18 UTC (rev 171180)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2014-07-17 09:29:49 UTC (rev 171181)
</span><span class="lines">@@ -968,6 +968,8 @@
</span><span class="cx"> my @callImplParams;
</span><span class="cx"> foreach my $param (@{$function->parameters}) {
</span><span class="cx"> my $paramIDLType = $param->type;
</span><ins>+ my $arrayOrSequenceType = $codeGenerator->GetArrayOrSequenceType($paramIDLType);
+ $paramIDLType = $arrayOrSequenceType if $arrayOrSequenceType ne "";
</ins><span class="cx"> my $paramType = GetGlibTypeName($paramIDLType);
</span><span class="cx"> my $const = $paramType eq "gchar*" ? "const " : "";
</span><span class="cx"> my $paramName = $param->name;
</span><span class="lines">@@ -1011,7 +1013,10 @@
</span><span class="cx"> push(@functionHeader, " * \@self: A #${className}");
</span><span class="cx">
</span><span class="cx"> foreach my $param (@{$function->parameters}) {
</span><del>- my $paramType = GetGlibTypeName($param->type);
</del><ins>+ my $paramIDLType = $param->type;
+ my $arrayOrSequenceType = $codeGenerator->GetArrayOrSequenceType($paramIDLType);
+ $paramIDLType = $arrayOrSequenceType if $arrayOrSequenceType ne "";
+ my $paramType = GetGlibTypeName($paramIDLType);
</ins><span class="cx"> # $paramType can have a trailing * in some cases
</span><span class="cx"> $paramType =~ s/\*$//;
</span><span class="cx"> my $paramName = $param->name;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (171180 => 171181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2014-07-17 08:13:18 UTC (rev 171180)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2014-07-17 09:29:49 UTC (rev 171181)
</span><span class="lines">@@ -1492,6 +1492,25 @@
</span><span class="cx"> return WebKit::kit(gobjectResult.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WebKitDOMbool* webkit_dom_test_obj_strict_function_with_array(WebKitDOMTestObj* self, WebKitDOMTestObj* objArg, glong array, GError** error)
+{
+ WebCore::JSMainThreadNullState state;
+ g_return_val_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self), 0);
+ g_return_val_if_fail(WEBKIT_DOM_IS_TEST_OBJ(objArg), 0);
+ g_return_val_if_fail(WEBKIT_DOM_IS_LONG[](array), 0);
+ g_return_val_if_fail(!error || !*error, 0);
+ WebCore::TestObj* item = WebKit::core(self);
+ WebCore::TestObj* convertedObjArg = WebKit::core(objArg);
+ WebCore::long[]* convertedArray = WebKit::core(array);
+ WebCore::ExceptionCode ec = 0;
+ RefPtr<WebCore::bool> gobjectResult = WTF::getPtr(item->strictFunctionWithArray(convertedObjArg, array, ec));
+ if (ec) {
+ WebCore::ExceptionCodeDescription ecdesc(ec);
+ g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
+ }
+ return WebKit::kit(gobjectResult.get());
+}
+
</ins><span class="cx"> void webkit_dom_test_obj_variadic_string_method(WebKitDOMTestObj* self, const gchar* head, const gchar* tail)
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h (171180 => 171181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2014-07-17 08:13:18 UTC (rev 171180)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2014-07-17 09:29:49 UTC (rev 171181)
</span><span class="lines">@@ -593,6 +593,20 @@
</span><span class="cx"> webkit_dom_test_obj_strict_function(WebKitDOMTestObj* self, const gchar* str, gfloat a, glong b, GError** error);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * webkit_dom_test_obj_strict_function_with_array:
+ * @self: A #WebKitDOMTestObj
+ * @objArg: A #WebKitDOMTestObj
+ * @array: A #glong
+ * @error: #GError
+ *
+ * Returns: (transfer none): A #WebKitDOMbool
+ *
+ * Stability: Unstable
+**/
+WEBKIT_API WebKitDOMbool*
+webkit_dom_test_obj_strict_function_with_array(WebKitDOMTestObj* self, WebKitDOMTestObj* objArg, glong array, GError** error);
+
+/**
</ins><span class="cx"> * webkit_dom_test_obj_variadic_string_method:
</span><span class="cx"> * @self: A #WebKitDOMTestObj
</span><span class="cx"> * @head: A #gchar
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp (171180 => 171181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp 2014-07-17 08:13:18 UTC (rev 171180)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp 2014-07-17 09:29:49 UTC (rev 171181)
</span><span class="lines">@@ -26,12 +26,10 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><del>-#include "WebKitDOMDOMString[]Private.h"
</del><span class="cx"> #include "WebKitDOMPrivate.h"
</span><span class="cx"> #include "WebKitDOMSVGPointPrivate.h"
</span><span class="cx"> #include "WebKitDOMSerializedScriptValuePrivate.h"
</span><span class="cx"> #include "WebKitDOMTestTypedefsPrivate.h"
</span><del>-#include "WebKitDOMlong[]Private.h"
</del><span class="cx"> #include "gobject/ConvertToUTF8String.h"
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -233,14 +231,14 @@
</span><span class="cx"> new (priv) WebKitDOMTestTypedefsPrivate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, WebKitDOMlong[]* x)
</del><ins>+void webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, glong x)
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_LONG[](x));
</span><span class="cx"> WebCore::TestTypedefs* item = WebKit::core(self);
</span><span class="cx"> WebCore::long[]* convertedX = WebKit::core(x);
</span><del>- item->func(convertedX);
</del><ins>+ item->func(x);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webkit_dom_test_typedefs_set_shadow(WebKitDOMTestTypedefs* self, gfloat width, gfloat height, gfloat blur, const gchar* color, gfloat alpha)
</span><span class="lines">@@ -253,7 +251,7 @@
</span><span class="cx"> item->setShadow(width, height, blur, convertedColor, alpha);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_typedefs_nullable_array_arg(WebKitDOMTestTypedefs* self, WebKitDOMDOMString[]* arrayArg)
</del><ins>+void webkit_dom_test_typedefs_nullable_array_arg(WebKitDOMTestTypedefs* self, const gchar* arrayArg)
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h (171180 => 171181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h 2014-07-17 08:13:18 UTC (rev 171180)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h 2014-07-17 09:29:49 UTC (rev 171181)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_typedefs_func:
</span><span class="cx"> * @self: A #WebKitDOMTestTypedefs
</span><del>- * @x: A #WebKitDOMlong[]
</del><ins>+ * @x: A #glong
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><span class="cx"> WEBKIT_API void
</span><del>-webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, WebKitDOMlong[]* x);
</del><ins>+webkit_dom_test_typedefs_func(WebKitDOMTestTypedefs* self, glong x);
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_typedefs_set_shadow:
</span><span class="lines">@@ -74,12 +74,12 @@
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_typedefs_nullable_array_arg:
</span><span class="cx"> * @self: A #WebKitDOMTestTypedefs
</span><del>- * @arrayArg: A #WebKitDOMDOMString[]
</del><ins>+ * @arrayArg: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><span class="cx"> WEBKIT_API void
</span><del>-webkit_dom_test_typedefs_nullable_array_arg(WebKitDOMTestTypedefs* self, WebKitDOMDOMString[]* arrayArg);
</del><ins>+webkit_dom_test_typedefs_nullable_array_arg(WebKitDOMTestTypedefs* self, const gchar* arrayArg);
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_typedefs_immutable_point_function:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (171180 => 171181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2014-07-17 08:13:18 UTC (rev 171180)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2014-07-17 09:29:49 UTC (rev 171181)
</span><span class="lines">@@ -231,10 +231,8 @@
</span><span class="cx"> [StrictTypeChecking] attribute unrestricted float strictFloat;
</span><span class="cx"> [StrictTypeChecking, RaisesException] bool strictFunction(DOMString str, unrestricted float a, long b);
</span><span class="cx">
</span><del>-#if defined(TESTING_JS)
</del><span class="cx"> [StrictTypeChecking, RaisesException] bool strictFunctionWithSequence(TestObj objArg, sequence<unsigned long> a);
</span><span class="cx"> [StrictTypeChecking, RaisesException] bool strictFunctionWithArray(TestObj objArg, long[] array);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // ObjectiveC reserved words.
</span><span class="cx"> readonly attribute long description;
</span></span></pre>
</div>
</div>
</body>
</html>