<!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>[186496] 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/186496">186496</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-07-08 03:34:41 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Deactivate GObject bindings for static methods
https://bugs.webkit.org/show_bug.cgi?id=146717
Reviewed by Carlos Garcia Campos.
Static methods are currently not supported by GObject bindings so we deactivate them from the generation.
Current tests suffice. Expectations updated.
* bindings/scripts/CodeGeneratorGObject.pm:
(SkipFunction): Skip isStatic functions.
* bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
* bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
(webkit_dom_test_interface_implements_method4): Deleted.
(webkit_dom_test_interface_supplemental_method4): Deleted.
* bindings/scripts/test/GObject/WebKitDOMTestObj.h:
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
(webkit_dom_test_obj_class_method): Deleted.
(webkit_dom_test_obj_class_method_with_optional): Deleted.
(webkit_dom_test_obj_overloaded_method1): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfaceh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186495 => 186496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-08 10:28:23 UTC (rev 186495)
+++ trunk/Source/WebCore/ChangeLog 2015-07-08 10:34:41 UTC (rev 186496)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-07-08 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] Deactivate GObject bindings for static methods
+ https://bugs.webkit.org/show_bug.cgi?id=146717
+
+ Reviewed by Carlos Garcia Campos.
+
+ Static methods are currently not supported by GObject bindings so we deactivate them from the generation.
+
+ Current tests suffice. Expectations updated.
+
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (SkipFunction): Skip isStatic functions.
+ * bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
+ (webkit_dom_test_interface_implements_method4): Deleted.
+ (webkit_dom_test_interface_supplemental_method4): Deleted.
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ (webkit_dom_test_obj_class_method): Deleted.
+ (webkit_dom_test_obj_class_method_with_optional): Deleted.
+ (webkit_dom_test_obj_overloaded_method1): Deleted.
+
</ins><span class="cx"> 2015-07-07 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the overflow checks from the important vectors used by the content extensions machines
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (186495 => 186496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2015-07-08 10:28:23 UTC (rev 186495)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2015-07-08 10:34:41 UTC (rev 186496)
</span><span class="lines">@@ -287,6 +287,9 @@
</span><span class="cx"> my $callWith = $function->signature->extendedAttributes->{"CallWith"};
</span><span class="cx"> my $isUnsupportedCallWith = $codeGenerator->ExtendedAttributeContains($callWith, "ScriptArguments") || $codeGenerator->ExtendedAttributeContains($callWith, "CallStack");
</span><span class="cx">
</span><ins>+ # Static methods are unsupported
+ return 1 if $function->isStatic;
+
</ins><span class="cx"> if (($isCustomFunction || $isUnsupportedCallWith) &&
</span><span class="cx"> $functionName ne "webkit_dom_node_replace_child" &&
</span><span class="cx"> $functionName ne "webkit_dom_node_insert_before" &&
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp (186495 => 186496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp 2015-07-08 10:28:23 UTC (rev 186495)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp 2015-07-08 10:34:41 UTC (rev 186496)
</span><span class="lines">@@ -289,26 +289,6 @@
</span><span class="cx"> #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_interface_implements_method4(WebKitDOMTestInterface* self)
-{
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition22) || ENABLE(Condition23)
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_INTERFACE(self));
- WebCore::TestInterface* item = WebKit::core(self);
- item->implementsMethod4();
-#else
- UNUSED_PARAM(self);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition22")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition23")
-#endif /* ENABLE(Condition22) || ENABLE(Condition23) */
-#else
- UNUSED_PARAM(self);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-}
-
</del><span class="cx"> void webkit_dom_test_interface_supplemental_method1(WebKitDOMTestInterface* self)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><span class="lines">@@ -368,26 +348,6 @@
</span><span class="cx"> #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_interface_supplemental_method4(WebKitDOMTestInterface* self)
-{
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition11) || ENABLE(Condition12)
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_INTERFACE(self));
- WebCore::TestInterface* item = WebKit::core(self);
- WebCore::TestSupplemental::supplementalMethod4(item);
-#else
- UNUSED_PARAM(self);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#else
- UNUSED_PARAM(self);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-}
-
</del><span class="cx"> gchar* webkit_dom_test_interface_get_implements_str1(WebKitDOMTestInterface* self)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h (186495 => 186496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h 2015-07-08 10:28:23 UTC (rev 186495)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h 2015-07-08 10:34:41 UTC (rev 186496)
</span><span class="lines">@@ -99,15 +99,6 @@
</span><span class="cx"> webkit_dom_test_interface_implements_method2(WebKitDOMTestInterface* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error);
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * webkit_dom_test_interface_implements_method4:
- * @self: A #WebKitDOMTestInterface
- *
- * Stability: Unstable
-**/
-WEBKIT_API void
-webkit_dom_test_interface_implements_method4(WebKitDOMTestInterface* self);
-
-/**
</del><span class="cx"> * webkit_dom_test_interface_supplemental_method1:
</span><span class="cx"> * @self: A #WebKitDOMTestInterface
</span><span class="cx"> *
</span><span class="lines">@@ -131,15 +122,6 @@
</span><span class="cx"> webkit_dom_test_interface_supplemental_method2(WebKitDOMTestInterface* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error);
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * webkit_dom_test_interface_supplemental_method4:
- * @self: A #WebKitDOMTestInterface
- *
- * Stability: Unstable
-**/
-WEBKIT_API void
-webkit_dom_test_interface_supplemental_method4(WebKitDOMTestInterface* self);
-
-/**
</del><span class="cx"> * webkit_dom_test_interface_get_implements_str1:
</span><span class="cx"> * @self: A #WebKitDOMTestInterface
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (186495 => 186496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2015-07-08 10:28:23 UTC (rev 186495)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2015-07-08 10:34:41 UTC (rev 186496)
</span><span class="lines">@@ -1362,53 +1362,6 @@
</span><span class="cx"> #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_obj_class_method(WebKitDOMTestObj* self)
-{
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
- WebCore::TestObj* item = WebKit::core(self);
- item->classMethod();
-}
-
-glong webkit_dom_test_obj_class_method_with_optional(WebKitDOMTestObj* self, glong arg)
-{
- WebCore::JSMainThreadNullState state;
- g_return_val_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self), 0);
- WebCore::TestObj* item = WebKit::core(self);
- glong result = item->classMethodWithOptional(arg);
- return result;
-}
-
-void webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, glong arg)
-{
-#if ENABLE(Condition1)
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
- WebCore::TestObj* item = WebKit::core(self);
- item->overloadedMethod1(arg);
-#else
- UNUSED_PARAM(self);
- UNUSED_PARAM(arg);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-#endif /* ENABLE(Condition1) */
-}
-
-void webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, const gchar* type)
-{
-#if ENABLE(Condition1)
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
- g_return_if_fail(type);
- WebCore::TestObj* item = WebKit::core(self);
- WTF::String convertedType = WTF::String::fromUTF8(type);
- item->overloadedMethod1(convertedType);
-#else
- UNUSED_PARAM(self);
- UNUSED_PARAM(type);
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-#endif /* ENABLE(Condition1) */
-}
-
</del><span class="cx"> void webkit_dom_test_obj_convert1(WebKitDOMTestObj* self, WebKitDOMTestNode* value)
</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 (186495 => 186496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2015-07-08 10:28:23 UTC (rev 186495)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2015-07-08 10:34:41 UTC (rev 186496)
</span><span class="lines">@@ -466,47 +466,6 @@
</span><span class="cx"> webkit_dom_test_obj_conditional_method3(WebKitDOMTestObj* self);
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * webkit_dom_test_obj_class_method:
- * @self: A #WebKitDOMTestObj
- *
- * Stability: Unstable
-**/
-WEBKIT_API void
-webkit_dom_test_obj_class_method(WebKitDOMTestObj* self);
-
-/**
- * webkit_dom_test_obj_class_method_with_optional:
- * @self: A #WebKitDOMTestObj
- * @arg: A #glong
- *
- * Returns: A #glong
- *
- * Stability: Unstable
-**/
-WEBKIT_API glong
-webkit_dom_test_obj_class_method_with_optional(WebKitDOMTestObj* self, glong arg);
-
-/**
- * webkit_dom_test_obj_overloaded_method1:
- * @self: A #WebKitDOMTestObj
- * @arg: A #glong
- *
- * Stability: Unstable
-**/
-WEBKIT_API void
-webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, glong arg);
-
-/**
- * webkit_dom_test_obj_overloaded_method1:
- * @self: A #WebKitDOMTestObj
- * @type: A #gchar
- *
- * Stability: Unstable
-**/
-WEBKIT_API void
-webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, const gchar* type);
-
-/**
</del><span class="cx"> * webkit_dom_test_obj_convert1:
</span><span class="cx"> * @self: A #WebKitDOMTestObj
</span><span class="cx"> * @value: A #WebKitDOMTestNode
</span></span></pre>
</div>
</div>
</body>
</html>