<!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>[170475] 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/170475">170475</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-26 00:45:38 -0700 (Thu, 26 Jun 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Add support for constants in GObject DOM bindings
https://bugs.webkit.org/show_bug.cgi?id=133983

Reviewed by Martin Robinson.

* bindings/gobject/webkitdom.symbols: Add stable constants.
* bindings/scripts/CodeGeneratorGObject.pm:
(GenerateHeader): Add constants to the header.
(Generate): Pass the interface object to GenerateHeader to get the constants
(IsInterfaceSymbol): Helper function that returns whether the given
symbol belongs to the interface. Check also constants now.
(ReadStableSymbols): Use IsInterfaceSymbol().
* bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
* bindings/scripts/test/GObject/WebKitDOMTestObj.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectwebkitdomsymbols">trunk/Source/WebCore/bindings/gobject/webkitdom.symbols</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfaceh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h</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 (170474 => 170475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-06-26 07:30:01 UTC (rev 170474)
+++ trunk/Source/WebCore/ChangeLog        2014-06-26 07:45:38 UTC (rev 170475)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-06-25  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        [GTK] Add support for constants in GObject DOM bindings
+        https://bugs.webkit.org/show_bug.cgi?id=133983
+
+        Reviewed by Martin Robinson.
+
+        * bindings/gobject/webkitdom.symbols: Add stable constants.
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (GenerateHeader): Add constants to the header.
+        (Generate): Pass the interface object to GenerateHeader to get the constants
+        (IsInterfaceSymbol): Helper function that returns whether the given
+        symbol belongs to the interface. Check also constants now.
+        (ReadStableSymbols): Use IsInterfaceSymbol().
+        * bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+
</ins><span class="cx"> 2014-06-26  Manuel Rego Casasnovas  &lt;rego@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [CSS Grid Layout] Properly support for z-index on grid items
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectwebkitdomsymbols"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/webkitdom.symbols (170474 => 170475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/webkitdom.symbols        2014-06-26 07:30:01 UTC (rev 170474)
+++ trunk/Source/WebCore/bindings/gobject/webkitdom.symbols        2014-06-26 07:45:38 UTC (rev 170475)
</span><span class="lines">@@ -176,6 +176,24 @@
</span><span class="cx"> WebKitDOMNode* webkit_dom_named_node_map_remove_named_item_ns(WebKitDOMNamedNodeMap*, const gchar*, const gchar*, GError**)
</span><span class="cx"> WebKitDOMNode* webkit_dom_named_node_map_item(WebKitDOMNamedNodeMap*, gulong)
</span><span class="cx"> GType webkit_dom_node_get_type(void)
</span><ins>+WEBKIT_DOM_NODE_ELEMENT_NODE
+WEBKIT_DOM_NODE_ATTRIBUTE_NODE
+WEBKIT_DOM_NODE_TEXT_NODE
+WEBKIT_DOM_NODE_CDATA_SECTION_NODE
+WEBKIT_DOM_NODE_ENTITY_REFERENCE_NODE
+WEBKIT_DOM_NODE_ENTITY_NODE
+WEBKIT_DOM_NODE_PROCESSING_INSTRUCTION_NODE
+WEBKIT_DOM_NODE_COMMENT_NODE
+WEBKIT_DOM_NODE_DOCUMENT_NODE
+WEBKIT_DOM_NODE_DOCUMENT_TYPE_NODE
+WEBKIT_DOM_NODE_DOCUMENT_FRAGMENT_NODE
+WEBKIT_DOM_NODE_NOTATION_NODE
+WEBKIT_DOM_NODE_DOCUMENT_POSITION_DISCONNECTED
+WEBKIT_DOM_NODE_DOCUMENT_POSITION_PRECEDING
+WEBKIT_DOM_NODE_DOCUMENT_POSITION_FOLLOWING
+WEBKIT_DOM_NODE_DOCUMENT_POSITION_CONTAINS
+WEBKIT_DOM_NODE_DOCUMENT_POSITION_CONTAINED_BY
+WEBKIT_DOM_NODE_DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC
</ins><span class="cx"> gushort webkit_dom_node_get_node_type(WebKitDOMNode*)
</span><span class="cx"> gchar* webkit_dom_node_get_node_name(WebKitDOMNode*)
</span><span class="cx"> gchar* webkit_dom_node_get_local_name(WebKitDOMNode*)
</span><span class="lines">@@ -939,10 +957,18 @@
</span><span class="cx"> gulong webkit_dom_css_style_sheet_insert_rule(WebKitDOMCSSStyleSheet*, const gchar*, gulong, GError**)
</span><span class="cx"> void webkit_dom_css_style_sheet_remove_rule(WebKitDOMCSSStyleSheet*, gulong, GError**)
</span><span class="cx"> GType webkit_dom_css_value_get_type(void)
</span><ins>+WEBKIT_DOM_CSS_VALUE_CSS_INHERIT
+WEBKIT_DOM_CSS_VALUE_CSS_PRIMITIVE_VALUE
+WEBKIT_DOM_CSS_VALUE_CSS_VALUE_LIST
+WEBKIT_DOM_CSS_VALUE_CSS_CUSTOM
</ins><span class="cx"> gchar* webkit_dom_css_value_get_css_text(WebKitDOMCSSValue*)
</span><span class="cx"> gushort webkit_dom_css_value_get_css_value_type(WebKitDOMCSSValue*)
</span><span class="cx"> void webkit_dom_css_value_set_css_text(WebKitDOMCSSValue*, const gchar*, GError**)
</span><span class="cx"> GType webkit_dom_event_get_type(void)
</span><ins>+WEBKIT_DOM_EVENT_NONE
+WEBKIT_DOM_EVENT_CAPTURING_PHASE
+WEBKIT_DOM_EVENT_AT_TARGET
+WEBKIT_DOM_EVENT_BUBBLING_PHASE
</ins><span class="cx"> gboolean webkit_dom_event_get_bubbles(WebKitDOMEvent*)
</span><span class="cx"> gboolean webkit_dom_event_get_cancelable(WebKitDOMEvent*)
</span><span class="cx"> gboolean webkit_dom_event_get_cancel_bubble(WebKitDOMEvent*)
</span><span class="lines">@@ -973,6 +999,10 @@
</span><span class="cx"> glong webkit_dom_wheel_event_get_wheel_delta_y(WebKitDOMWheelEvent*)
</span><span class="cx"> void webkit_dom_wheel_event_init_wheel_event(WebKitDOMWheelEvent*, glong, glong, WebKitDOMDOMWindow*, glong, glong, glong, glong, gboolean, gboolean, gboolean, gboolean)
</span><span class="cx"> GType webkit_dom_keyboard_event_get_type(void)
</span><ins>+WEBKIT_DOM_KEYBOARD_EVENT_KEY_LOCATION_STANDARD
+WEBKIT_DOM_KEYBOARD_EVENT_KEY_LOCATION_LEFT
+WEBKIT_DOM_KEYBOARD_EVENT_KEY_LOCATION_RIGHT
+WEBKIT_DOM_KEYBOARD_EVENT_KEY_LOCATION_NUMPAD
</ins><span class="cx"> gboolean webkit_dom_keyboard_event_get_alt_graph_key(WebKitDOMKeyboardEvent*)
</span><span class="cx"> gboolean webkit_dom_keyboard_event_get_alt_key(WebKitDOMKeyboardEvent*)
</span><span class="cx"> gboolean webkit_dom_keyboard_event_get_ctrl_key(WebKitDOMKeyboardEvent*)
</span><span class="lines">@@ -1002,6 +1032,14 @@
</span><span class="cx"> void webkit_dom_mouse_event_init_mouse_event(WebKitDOMMouseEvent*, const gchar*, gboolean, gboolean, WebKitDOMDOMWindow*, glong, glong, glong, glong, glong, gboolean, gboolean, gboolean, gboolean, gushort, WebKitDOMEventTarget*)
</span><span class="cx"> GType webkit_dom_object_get_type(void)
</span><span class="cx"> GType webkit_dom_range_get_type(void)
</span><ins>+WEBKIT_DOM_RANGE_START_TO_START
+WEBKIT_DOM_RANGE_START_TO_END
+WEBKIT_DOM_RANGE_END_TO_END
+WEBKIT_DOM_RANGE_END_TO_START
+WEBKIT_DOM_RANGE_NODE_BEFORE
+WEBKIT_DOM_RANGE_NODE_AFTER
+WEBKIT_DOM_RANGE_NODE_BEFORE_AND_AFTER
+WEBKIT_DOM_RANGE_NODE_INSIDE
</ins><span class="cx"> WebKitDOMDocumentFragment* webkit_dom_range_clone_contents(WebKitDOMRange*, GError**)
</span><span class="cx"> WebKitDOMRange* webkit_dom_range_clone_range(WebKitDOMRange*, GError**)
</span><span class="cx"> void webkit_dom_range_collapse(WebKitDOMRange*, gboolean, GError**)
</span><span class="lines">@@ -1064,6 +1102,16 @@
</span><span class="cx"> WebKitDOMNode* webkit_dom_tree_walker_previous_sibling(WebKitDOMTreeWalker*)
</span><span class="cx"> void webkit_dom_tree_walker_set_current_node(WebKitDOMTreeWalker*, WebKitDOMNode*, GError**)
</span><span class="cx"> GType webkit_dom_xpath_result_get_type(void)
</span><ins>+WEBKIT_DOM_XPATH_RESULT_ANY_TYPE
+WEBKIT_DOM_XPATH_RESULT_NUMBER_TYPE
+WEBKIT_DOM_XPATH_RESULT_STRING_TYPE
+WEBKIT_DOM_XPATH_RESULT_BOOLEAN_TYPE
+WEBKIT_DOM_XPATH_RESULT_UNORDERED_NODE_ITERATOR_TYPE
+WEBKIT_DOM_XPATH_RESULT_ORDERED_NODE_ITERATOR_TYPE
+WEBKIT_DOM_XPATH_RESULT_UNORDERED_NODE_SNAPSHOT_TYPE
+WEBKIT_DOM_XPATH_RESULT_ORDERED_NODE_SNAPSHOT_TYPE
+WEBKIT_DOM_XPATH_RESULT_ANY_UNORDERED_NODE_TYPE
+WEBKIT_DOM_XPATH_RESULT_FIRST_ORDERED_NODE_TYPE
</ins><span class="cx"> gboolean webkit_dom_xpath_result_get_boolean_value(WebKitDOMXPathResult*, GError**)
</span><span class="cx"> gboolean webkit_dom_xpath_result_get_invalid_iterator_state(WebKitDOMXPathResult*)
</span><span class="cx"> gdouble webkit_dom_xpath_result_get_number_value(WebKitDOMXPathResult*, GError**)
</span><span class="lines">@@ -1082,6 +1130,22 @@
</span><span class="cx"> gboolean webkit_dom_event_target_remove_event_listener(WebKitDOMEventTarget*, const char*, GCallback, gboolean)
</span><span class="cx"> gboolean webkit_dom_event_target_remove_event_listener_with_closure(WebKitDOMEventTarget*, const char*, GClosure*, gboolean)
</span><span class="cx"> GType webkit_dom_node_filter_get_type(void)
</span><ins>+WEBKIT_DOM_NODE_FILTER_ACCEPT
+WEBKIT_DOM_NODE_FILTER_REJECT
+WEBKIT_DOM_NODE_FILTER_SKIP
+WEBKIT_DOM_NODE_FILTER_SHOW_ALL
+WEBKIT_DOM_NODE_FILTER_SHOW_ELEMENT
+WEBKIT_DOM_NODE_FILTER_SHOW_ATTRIBUTE
+WEBKIT_DOM_NODE_FILTER_SHOW_TEXT
+WEBKIT_DOM_NODE_FILTER_SHOW_CDATA_SECTION
+WEBKIT_DOM_NODE_FILTER_SHOW_ENTITY_REFERENCE
+WEBKIT_DOM_NODE_FILTER_SHOW_ENTITY
+WEBKIT_DOM_NODE_FILTER_SHOW_PROCESSING_INSTRUCTION
+WEBKIT_DOM_NODE_FILTER_SHOW_COMMENT
+WEBKIT_DOM_NODE_FILTER_SHOW_DOCUMENT
+WEBKIT_DOM_NODE_FILTER_SHOW_DOCUMENT_TYPE
+WEBKIT_DOM_NODE_FILTER_SHOW_DOCUMENT_FRAGMENT
+WEBKIT_DOM_NODE_FILTER_SHOW_NOTATION
</ins><span class="cx"> gshort webkit_dom_node_filter_accept_node(WebKitDOMNodeFilter*, WebKitDOMNode*)
</span><span class="cx"> GType webkit_dom_xpath_ns_resolver_get_type(void)
</span><span class="cx"> gchar* webkit_dom_xpath_ns_resolver_lookup_namespace_uri(WebKitDOMXPathNSResolver*, const gchar*)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (170474 => 170475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm        2014-06-26 07:30:01 UTC (rev 170474)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm        2014-06-26 07:45:38 UTC (rev 170475)
</span><span class="lines">@@ -815,8 +815,42 @@
</span><span class="cx">     push(@cBodyProperties, $implContent);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+sub GenerateConstants {
+    my ($interface, $prefix) = @_;
+
+    my $isStableClass = scalar(@stableSymbols);
+
+    if (@{$interface-&gt;constants}) {
+        my @constants = @{$interface-&gt;constants};
+        foreach my $constant (@constants) {
+            my $conditionalString = $codeGenerator-&gt;GenerateConditionalString($constant);
+            my $constantName = $prefix . $constant-&gt;name;
+            my $constantValue = $constant-&gt;value;
+            my $isStableSymbol = grep {$_ eq $constantName} @stableSymbols;
+            if ($isStableSymbol) {
+                push(@symbols, &quot;$constantName\n&quot;);
+            }
+
+            my @constantHeader = ();
+            push(@constantHeader, &quot;#if ${conditionalString}&quot;) if $conditionalString;
+            push(@constantHeader, &quot;/**&quot;);
+            push(@constantHeader, &quot; * ${constantName}:&quot;);
+            push(@constantHeader, &quot; */&quot;);
+            push(@constantHeader, &quot;#define $constantName $constantValue&quot;);
+            push(@constantHeader, &quot;#endif /* ${conditionalString} */&quot;) if $conditionalString;
+            push(@constantHeader, &quot;\n&quot;);
+
+            if ($isStableSymbol or !$isStableClass) {
+                push(@hBody, join(&quot;\n&quot;, @constantHeader));
+            } else {
+                push(@hBodyUnstable, join(&quot;\n&quot;, @constantHeader));
+            }
+        }
+    }
+}
+
</ins><span class="cx"> sub GenerateHeader {
</span><del>-    my ($object, $interfaceName, $parentClassName) = @_;
</del><ins>+    my ($object, $interfaceName, $parentClassName, $interface) = @_;
</ins><span class="cx"> 
</span><span class="cx">     my $implContent = &quot;&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -868,6 +902,17 @@
</span><span class="cx"> #define WEBKIT_DOM_IS_${clsCaps}_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_${clsCaps}))
</span><span class="cx"> #define WEBKIT_DOM_${clsCaps}_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_${clsCaps}, ${className}Class))
</span><span class="cx"> 
</span><ins>+EOF
+
+    push(@hBody, $implContent);
+
+    if ($isStableClass) {
+        push(@symbols, &quot;GType ${lowerCaseIfaceName}_get_type(void)\n&quot;);
+    }
+
+    GenerateConstants($interface, &quot;WEBKIT_DOM_${clsCaps}_&quot;);
+
+    $implContent = &lt;&lt; &quot;EOF&quot;;
</ins><span class="cx"> struct _${className} {
</span><span class="cx">     ${parentClassName} parent_instance;
</span><span class="cx"> };
</span><span class="lines">@@ -880,9 +925,6 @@
</span><span class="cx"> 
</span><span class="cx">     push(@hBody, $implContent);
</span><span class="cx"> 
</span><del>-    if ($isStableClass) {
-        push(@symbols, &quot;GType ${lowerCaseIfaceName}_get_type(void)\n&quot;);
-    }
</del><span class="cx">     push(@hBody, &quot;WEBKIT_API GType\n${lowerCaseIfaceName}_get_type(void);\n&quot;);
</span><span class="cx">     push(@hBody, &quot;\n&quot;);
</span><span class="cx"> }
</span><span class="lines">@@ -1549,7 +1591,7 @@
</span><span class="cx"> 
</span><span class="cx">     $hdrIncludes{&quot;webkitdom/${parentClassName}.h&quot;} = 1;
</span><span class="cx"> 
</span><del>-    $object-&gt;GenerateHeader($interfaceName, $parentClassName);
</del><ins>+    $object-&gt;GenerateHeader($interfaceName, $parentClassName, $interface);
</ins><span class="cx">     $object-&gt;GenerateCFile($interfaceName, $parentClassName, $parentGObjType, $interface);
</span><span class="cx">     $object-&gt;GenerateEndHeader();
</span><span class="cx"> }
</span><span class="lines">@@ -1713,6 +1755,18 @@
</span><span class="cx">     @stableSymbols = ();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+sub IsInterfaceSymbol {
+    my ($line, $lowerCaseIfaceName) = @_;
+
+    # Function.
+    return 1 if $line =~ /^[a-zA-Z0-9\*]+\s${lowerCaseIfaceName}_.+$/;
+
+    # Constant.
+    my $prefix = uc($lowerCaseIfaceName);
+    return 1 if $line =~ /^${prefix}_[A-Z_]+$/;
+    return 0;
+}
+
</ins><span class="cx"> sub ReadStableSymbols {
</span><span class="cx">     my $interfaceName = shift;
</span><span class="cx"> 
</span><span class="lines">@@ -1735,7 +1789,7 @@
</span><span class="cx">             next;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (scalar(@stableSymbols) and $line =~ /^[a-zA-Z0-9\*]+\s${lowerCaseIfaceName}_.+$/ and $line !~ /^GType/) {
</del><ins>+        if (scalar(@stableSymbols) and IsInterfaceSymbol($line, $lowerCaseIfaceName) and $line !~ /^GType/) {
</ins><span class="cx">             push(@stableSymbols, $line);
</span><span class="cx">             next;
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h (170474 => 170475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h        2014-06-26 07:30:01 UTC (rev 170474)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h        2014-06-26 07:45:38 UTC (rev 170475)
</span><span class="lines">@@ -36,6 +36,34 @@
</span><span class="cx"> #define WEBKIT_DOM_IS_TEST_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_INTERFACE))
</span><span class="cx"> #define WEBKIT_DOM_TEST_INTERFACE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_INTERFACE, WebKitDOMTestInterfaceClass))
</span><span class="cx"> 
</span><ins>+#if ENABLE(Condition22) || ENABLE(Condition23)
+/**
+ * WEBKIT_DOM_TEST_INTERFACE_IMPLEMENTSCONSTANT1:
+ */
+#define WEBKIT_DOM_TEST_INTERFACE_IMPLEMENTSCONSTANT1 1
+#endif /* ENABLE(Condition22) || ENABLE(Condition23) */
+
+#if ENABLE(Condition22) || ENABLE(Condition23)
+/**
+ * WEBKIT_DOM_TEST_INTERFACE_IMPLEMENTSCONSTANT2:
+ */
+#define WEBKIT_DOM_TEST_INTERFACE_IMPLEMENTSCONSTANT2 2
+#endif /* ENABLE(Condition22) || ENABLE(Condition23) */
+
+#if ENABLE(Condition11) || ENABLE(Condition12)
+/**
+ * WEBKIT_DOM_TEST_INTERFACE_SUPPLEMENTALCONSTANT1:
+ */
+#define WEBKIT_DOM_TEST_INTERFACE_SUPPLEMENTALCONSTANT1 1
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+
+#if ENABLE(Condition11) || ENABLE(Condition12)
+/**
+ * WEBKIT_DOM_TEST_INTERFACE_SUPPLEMENTALCONSTANT2:
+ */
+#define WEBKIT_DOM_TEST_INTERFACE_SUPPLEMENTALCONSTANT2 2
+#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
+
</ins><span class="cx"> struct _WebKitDOMTestInterface {
</span><span class="cx">     WebKitDOMObject parent_instance;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h (170474 => 170475)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h        2014-06-26 07:30:01 UTC (rev 170474)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h        2014-06-26 07:45:38 UTC (rev 170475)
</span><span class="lines">@@ -36,6 +36,73 @@
</span><span class="cx"> #define WEBKIT_DOM_IS_TEST_OBJ_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  WEBKIT_DOM_TYPE_TEST_OBJ))
</span><span class="cx"> #define WEBKIT_DOM_TEST_OBJ_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_DOM_TYPE_TEST_OBJ, WebKitDOMTestObjClass))
</span><span class="cx"> 
</span><ins>+#if ENABLE(Condition1)
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONDITIONAL_CONST:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONDITIONAL_CONST 0
+#endif /* ENABLE(Condition1) */
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_0:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_0 0
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_1:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_1 1
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_2:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_2 2
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_4:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_4 4
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_8:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_8 8
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_9:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_9 -1
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_11:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_11 0xffffffff
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_12:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_12 0x01
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_13:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_13 0X20
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_VALUE_14:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_VALUE_14 0x1abc
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_CONST_JAVASCRIPT:
+ */
+#define WEBKIT_DOM_TEST_OBJ_CONST_JAVASCRIPT 15
+
+/**
+ * WEBKIT_DOM_TEST_OBJ_readonly:
+ */
+#define WEBKIT_DOM_TEST_OBJ_readonly 0
+
</ins><span class="cx"> struct _WebKitDOMTestObj {
</span><span class="cx">     WebKitDOMObject parent_instance;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>