<!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>[190620] 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/190620">190620</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-10-06 09:50:22 -0700 (Tue, 06 Oct 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Binding generator should add builtin header for JSBuiltin attributes
https://bugs.webkit.org/show_bug.cgi?id=149837

Reviewed by Darin Adler.

Ensured XXBuiltins.h header is included for builtin attributes.
Renamed AddIncludesForJSBuiltinMethods as AddJSBuiltinIncludesIfNeeded.
Test loop is done through all functions and attributes to handle conditional correctly.

Covered by existing and added binding tests.

* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
(AddJSBuiltinIncludesIfNeeded):
* bindings/scripts/test/JS/JSTestObj.cpp:
* bindings/scripts/test/ObjC/DOMTestObj.h:
* bindings/scripts/test/ObjC/DOMTestObj.mm:
* bindings/scripts/test/TestObj.idl:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestObjh">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestObjmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm</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 (190619 => 190620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-10-06 16:37:31 UTC (rev 190619)
+++ trunk/Source/WebCore/ChangeLog        2015-10-06 16:50:22 UTC (rev 190620)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-10-06  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
</span><span class="cx"> 
</span><ins>+        Binding generator should add builtin header for JSBuiltin attributes
+        https://bugs.webkit.org/show_bug.cgi?id=149837
+
+        Reviewed by Darin Adler.
+
+        Ensured XXBuiltins.h header is included for builtin attributes.
+        Renamed AddIncludesForJSBuiltinMethods as AddJSBuiltinIncludesIfNeeded.
+        Test loop is done through all functions and attributes to handle conditional correctly.
+
+        Covered by existing and added binding tests.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateImplementation):
+        (AddJSBuiltinIncludesIfNeeded):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        * bindings/scripts/test/ObjC/DOMTestObj.h:
+        * bindings/scripts/test/ObjC/DOMTestObj.mm:
+        * bindings/scripts/test/TestObj.idl:
+
+2015-10-06  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
+
</ins><span class="cx">         Binding generator XXConstructor::finishCreation should take references as parameters
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=149838
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (190619 => 190620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm        2015-10-06 16:37:31 UTC (rev 190619)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm        2015-10-06 16:50:22 UTC (rev 190620)
</span><span class="lines">@@ -1794,7 +1794,7 @@
</span><span class="cx"> 
</span><span class="cx">     my $implType = GetImplClassName($interfaceName);
</span><span class="cx"> 
</span><del>-    AddIncludesForJSBuiltinMethods($interface);
</del><ins>+    AddJSBuiltinIncludesIfNeeded($interface);
</ins><span class="cx"> 
</span><span class="cx">     @implContent = ();
</span><span class="cx"> 
</span><span class="lines">@@ -5100,35 +5100,23 @@
</span><span class="cx">     return (@specials &gt; 0) ? join(&quot; | &quot;, @specials) : &quot;0&quot;;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-sub UseJSBuiltins
</del><ins>+sub AddJSBuiltinIncludesIfNeeded()
</ins><span class="cx"> {
</span><span class="cx">     my $interface = shift;
</span><del>-    foreach my $function (@{$interface-&gt;functions}) {
-        if ($function-&gt;signature-&gt;extendedAttributes-&gt;{&quot;JSBuiltin&quot;}) {
-            return 1;
-        }
-    }
-    return 0
-}
</del><span class="cx"> 
</span><del>-sub AddIncludesForJSBuiltinMethods()
-{
-    my $interface = shift;
</del><ins>+    my $include = $interface-&gt;name . &quot;Builtins.h&quot;;
</ins><span class="cx"> 
</span><span class="cx">     if ($interface-&gt;extendedAttributes-&gt;{&quot;JSBuiltinConstructor&quot;}) {
</span><del>-        AddToImplIncludes($interface-&gt;name . &quot;Builtins.h&quot;);
-        return 1;
</del><ins>+        AddToImplIncludes($include);
+        return;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     foreach my $function (@{$interface-&gt;functions}) {
</span><del>-        next unless ($function-&gt;signature-&gt;extendedAttributes-&gt;{&quot;JSBuiltin&quot;});
-        my $scopeName = $function-&gt;signature-&gt;extendedAttributes-&gt;{&quot;ImplementedBy&quot;};
-        if (!$scopeName) {
-            $scopeName = $interface-&gt;name;
-        }
-        AddToImplIncludes($scopeName . &quot;Builtins.h&quot;, $function-&gt;signature-&gt;extendedAttributes-&gt;{&quot;Conditional&quot;});
</del><ins>+        AddToImplIncludes($include, $function-&gt;signature-&gt;extendedAttributes-&gt;{&quot;Conditional&quot;}) if $function-&gt;signature-&gt;extendedAttributes-&gt;{&quot;JSBuiltin&quot;};
+    }
</ins><span class="cx"> 
</span><del>-        return 1;
</del><ins>+    foreach my $attribute (@{$interface-&gt;attributes}) {
+        AddToImplIncludes($include, $attribute-&gt;signature-&gt;extendedAttributes-&gt;{&quot;Conditional&quot;}) if $attribute-&gt;signature-&gt;extendedAttributes-&gt;{&quot;JSBuiltin&quot;};
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (190619 => 190620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp        2015-10-06 16:37:31 UTC (rev 190619)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp        2015-10-06 16:50:22 UTC (rev 190620)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx"> #include &quot;Settings.h&quot;
</span><span class="cx"> #include &quot;TestNode.h&quot;
</span><span class="cx"> #include &quot;TestObj.h&quot;
</span><del>-#include &quot;TestObjBuiltins.h&quot;
</del><span class="cx"> #include &quot;URL.h&quot;
</span><span class="cx"> #include &quot;bool.h&quot;
</span><span class="cx"> #include &lt;bindings/ScriptValue.h&gt;
</span><span class="lines">@@ -74,6 +73,10 @@
</span><span class="cx"> #include &quot;JSTestObjectC.h&quot;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if ENABLE(Condition3) || ENABLE(Condition4)
+#include &quot;TestObjBuiltins.h&quot;
+#endif
+
</ins><span class="cx"> using namespace JSC;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -538,8 +541,16 @@
</span><span class="cx">     { &quot;stringAttrWithGetterException&quot;, CustomAccessor, NoIntrinsic, { (intptr_t)static_cast&lt;PropertySlot::GetValueFunc&gt;(jsTestObjStringAttrWithGetterException), (intptr_t) static_cast&lt;PutPropertySlot::PutValueFunc&gt;(setJSTestObjStringAttrWithGetterException) } },
</span><span class="cx">     { &quot;stringAttrWithSetterException&quot;, CustomAccessor, NoIntrinsic, { (intptr_t)static_cast&lt;PropertySlot::GetValueFunc&gt;(jsTestObjStringAttrWithSetterException), (intptr_t) static_cast&lt;PutPropertySlot::PutValueFunc&gt;(setJSTestObjStringAttrWithSetterException) } },
</span><span class="cx">     { &quot;strictTypeCheckingAttribute&quot;, CustomAccessor, NoIntrinsic, { (intptr_t)static_cast&lt;PropertySlot::GetValueFunc&gt;(jsTestObjStrictTypeCheckingAttribute), (intptr_t) static_cast&lt;PutPropertySlot::PutValueFunc&gt;(setJSTestObjStrictTypeCheckingAttribute) } },
</span><ins>+#if ENABLE(Condition4)
</ins><span class="cx">     { &quot;jsBuiltinAttribute&quot;, Accessor | Builtin, NoIntrinsic, { (intptr_t)static_cast&lt;BuiltinGenerator&gt;(testObjJsBuiltinAttributeCodeGenerator), (intptr_t) (setTestObjJsBuiltinAttributeCodeGenerator) } },
</span><ins>+#else
+    { 0, 0, NoIntrinsic, { 0, 0 } },
+#endif
+#if ENABLE(Condition4)
</ins><span class="cx">     { &quot;jsBuiltinReadOnlyAttribute&quot;, ReadOnly | Accessor | Builtin, NoIntrinsic, { (intptr_t)static_cast&lt;BuiltinGenerator&gt;(testObjJsBuiltinReadOnlyAttributeCodeGenerator), (intptr_t) (0) } },
</span><ins>+#else
+    { 0, 0, NoIntrinsic, { 0, 0 } },
+#endif
</ins><span class="cx">     { &quot;onfoo&quot;, CustomAccessor, NoIntrinsic, { (intptr_t)static_cast&lt;PropertySlot::GetValueFunc&gt;(jsTestObjOnfoo), (intptr_t) static_cast&lt;PutPropertySlot::PutValueFunc&gt;(setJSTestObjOnfoo) } },
</span><span class="cx">     { &quot;withScriptStateAttribute&quot;, CustomAccessor, NoIntrinsic, { (intptr_t)static_cast&lt;PropertySlot::GetValueFunc&gt;(jsTestObjWithScriptStateAttribute), (intptr_t) static_cast&lt;PutPropertySlot::PutValueFunc&gt;(setJSTestObjWithScriptStateAttribute) } },
</span><span class="cx">     { &quot;withCallWithAndSetterCallWithAttribute&quot;, CustomAccessor, NoIntrinsic, { (intptr_t)static_cast&lt;PropertySlot::GetValueFunc&gt;(jsTestObjWithCallWithAndSetterCallWithAttribute), (intptr_t) static_cast&lt;PutPropertySlot::PutValueFunc&gt;(setJSTestObjWithCallWithAndSetterCallWithAttribute) } },
</span><span class="lines">@@ -625,8 +636,16 @@
</span><span class="cx">     { &quot;customMethodWithArgs&quot;, JSC::Function, NoIntrinsic, { (intptr_t)static_cast&lt;NativeFunction&gt;(jsTestObjPrototypeFunctionCustomMethodWithArgs), (intptr_t) (3) } },
</span><span class="cx">     { &quot;customBindingMethod&quot;, JSC::Function, NoIntrinsic, { (intptr_t)static_cast&lt;NativeFunction&gt;(jsTestObjPrototypeFunctionCustomBindingMethod), (intptr_t) (0) } },
</span><span class="cx">     { &quot;customBindingMethodWithArgs&quot;, JSC::Function, NoIntrinsic, { (intptr_t)static_cast&lt;NativeFunction&gt;(jsTestObjPrototypeFunctionCustomBindingMethodWithArgs), (intptr_t) (3) } },
</span><ins>+#if ENABLE(Condition3)
</ins><span class="cx">     { &quot;jsBuiltinMethod&quot;, JSC::Builtin, NoIntrinsic, { (intptr_t)static_cast&lt;BuiltinGenerator&gt;(testObjJsBuiltinMethodCodeGenerator), (intptr_t) (0) } },
</span><ins>+#else
+    { 0, 0, NoIntrinsic, { 0, 0 } },
+#endif
+#if ENABLE(Condition3)
</ins><span class="cx">     { &quot;jsBuiltinMethodWithArgs&quot;, JSC::Builtin, NoIntrinsic, { (intptr_t)static_cast&lt;BuiltinGenerator&gt;(testObjJsBuiltinMethodWithArgsCodeGenerator), (intptr_t) (3) } },
</span><ins>+#else
+    { 0, 0, NoIntrinsic, { 0, 0 } },
+#endif
</ins><span class="cx">     { &quot;addEventListener&quot;, JSC::Function, NoIntrinsic, { (intptr_t)static_cast&lt;NativeFunction&gt;(jsTestObjPrototypeFunctionAddEventListener), (intptr_t) (2) } },
</span><span class="cx">     { &quot;removeEventListener&quot;, JSC::Function, NoIntrinsic, { (intptr_t)static_cast&lt;NativeFunction&gt;(jsTestObjPrototypeFunctionRemoveEventListener), (intptr_t) (2) } },
</span><span class="cx">     { &quot;withScriptStateVoid&quot;, JSC::Function, NoIntrinsic, { (intptr_t)static_cast&lt;NativeFunction&gt;(jsTestObjPrototypeFunctionWithScriptStateVoid), (intptr_t) (0) } },
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h (190619 => 190620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h        2015-10-06 16:37:31 UTC (rev 190619)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h        2015-10-06 16:50:22 UTC (rev 190620)
</span><span class="lines">@@ -145,8 +145,6 @@
</span><span class="cx"> - (void)methodWithException;
</span><span class="cx"> - (void)customMethod;
</span><span class="cx"> - (void)customMethodWithArgs:(int)longArg strArg:(NSString *)strArg objArg:(DOMTestObj *)objArg;
</span><del>-- (void)jsBuiltinMethod;
-- (void)jsBuiltinMethodWithArgs:(int)longArg strArg:(NSString *)strArg objArg:(DOMTestObj *)objArg;
</del><span class="cx"> - (void)addEventListener:(NSString *)type listener:(id &lt;DOMEventListener&gt;)listener useCapture:(BOOL)useCapture;
</span><span class="cx"> - (void)removeEventListener:(NSString *)type listener:(id &lt;DOMEventListener&gt;)listener useCapture:(BOOL)useCapture;
</span><span class="cx"> - (void)withScriptStateVoid;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestObjmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (190619 => 190620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm        2015-10-06 16:37:31 UTC (rev 190619)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm        2015-10-06 16:50:22 UTC (rev 190620)
</span><span class="lines">@@ -450,6 +450,7 @@
</span><span class="cx">     IMPL-&gt;setCustomAttr(newCustomAttr);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if ENABLE(Condition4)
</ins><span class="cx"> - (DOMTestObj *)jsBuiltinAttribute
</span><span class="cx"> {
</span><span class="cx">     WebCore::JSMainThreadNullState state;
</span><span class="lines">@@ -463,12 +464,15 @@
</span><span class="cx"> 
</span><span class="cx">     IMPL-&gt;setJsBuiltinAttribute(core(newJsBuiltinAttribute));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> 
</span><ins>+#if ENABLE(Condition4)
</ins><span class="cx"> - (DOMTestObj *)jsBuiltinReadOnlyAttribute
</span><span class="cx"> {
</span><span class="cx">     WebCore::JSMainThreadNullState state;
</span><span class="cx">     return kit(WTF::getPtr(IMPL-&gt;jsBuiltinReadOnlyAttribute()));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> - (int)withScriptStateAttribute
</span><span class="cx"> {
</span><span class="lines">@@ -975,18 +979,26 @@
</span><span class="cx">     IMPL-&gt;customMethodWithArgs(longArg, strArg, core(objArg));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+
+#if ENABLE(Condition3)
</ins><span class="cx"> - (void)jsBuiltinMethod
</span><span class="cx"> {
</span><span class="cx">     WebCore::JSMainThreadNullState state;
</span><span class="cx">     IMPL-&gt;jsBuiltinMethod();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#endif
+
+
+#if ENABLE(Condition3)
</ins><span class="cx"> - (void)jsBuiltinMethodWithArgs:(int)longArg strArg:(NSString *)strArg objArg:(DOMTestObj *)objArg
</span><span class="cx"> {
</span><span class="cx">     WebCore::JSMainThreadNullState state;
</span><span class="cx">     IMPL-&gt;jsBuiltinMethodWithArgs(longArg, strArg, core(objArg));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#endif
+
</ins><span class="cx"> - (void)addEventListener:(NSString *)type listener:(id &lt;DOMEventListener&gt;)listener useCapture:(BOOL)useCapture
</span><span class="cx"> {
</span><span class="cx">     WebCore::JSMainThreadNullState state;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (190619 => 190620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl        2015-10-06 16:37:31 UTC (rev 190619)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl        2015-10-06 16:50:22 UTC (rev 190620)
</span><span class="lines">@@ -118,10 +118,10 @@
</span><span class="cx">     [CustomBinding] void customBindingMethodWithArgs(long longArg, DOMString strArg, TestObj objArg);
</span><span class="cx"> 
</span><span class="cx">     // 'JSBuiltin' extended attribute
</span><del>-    [JSBuiltin] void jsBuiltinMethod();
-    [JSBuiltin] void jsBuiltinMethodWithArgs(long longArg, DOMString strArg, TestObj objArg);
-    [JSBuiltin] attribute TestObj jsBuiltinAttribute;
-    [JSBuiltin] readonly attribute TestObj jsBuiltinReadOnlyAttribute;
</del><ins>+    [Conditional=Condition3, JSBuiltin] void jsBuiltinMethod();
+    [Conditional=Condition3, JSBuiltin] void jsBuiltinMethodWithArgs(long longArg, DOMString strArg, TestObj objArg);
+    [Conditional=Condition4, JSBuiltin] attribute TestObj jsBuiltinAttribute;
+    [Conditional=Condition4, JSBuiltin] readonly attribute TestObj jsBuiltinReadOnlyAttribute;
</ins><span class="cx"> 
</span><span class="cx">     void addEventListener(DOMString type, EventListener listener, optional boolean useCapture);
</span><span class="cx">     void removeEventListener(DOMString type, EventListener listener, optional boolean useCapture);
</span></span></pre>
</div>
</div>

</body>
</html>