<!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>[152154] 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/152154">152154</a></dd>
<dt>Author</dt> <dd>ch.dumez@sisa.samsung.com</dd>
<dt>Date</dt> <dd>2013-06-28 01:20:19 -0700 (Fri, 28 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use &amp; instead of | in the value of [CallWith]
https://bugs.webkit.org/show_bug.cgi?id=118054

Reviewed by Kentaro Hara.

[CallWith=ScriptExecutionContext|ScriptState] meant that both the
ScriptExecutionContext AND the ScriptState would be passed as
arguments to the implementation (not one OR the other).

This patch changes the semantics for those IDL extended attributes
to make it less confusing. Proper usage is now:
[CallWith=ScriptExecutionContext&amp;ScriptState]

No new tests, covered by existing bindings tests.

* bindings/scripts/CodeGenerator.pm:
(ExtendedAttributeContains):
* bindings/scripts/test/TestObj.idl:
* page/Console.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="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
<li><a href="#trunkSourceWebCorepageConsoleidl">trunk/Source/WebCore/page/Console.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (152153 => 152154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-06-28 07:34:43 UTC (rev 152153)
+++ trunk/Source/WebCore/ChangeLog        2013-06-28 08:20:19 UTC (rev 152154)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2013-06-28  Christophe Dumez  &lt;ch.dumez@sisa.samsung.com&gt;
+
+        Use &amp; instead of | in the value of [CallWith]
+        https://bugs.webkit.org/show_bug.cgi?id=118054
+
+        Reviewed by Kentaro Hara.
+
+        [CallWith=ScriptExecutionContext|ScriptState] meant that both the
+        ScriptExecutionContext AND the ScriptState would be passed as
+        arguments to the implementation (not one OR the other).
+
+        This patch changes the semantics for those IDL extended attributes
+        to make it less confusing. Proper usage is now:
+        [CallWith=ScriptExecutionContext&amp;ScriptState]
+
+        No new tests, covered by existing bindings tests.
+
+        * bindings/scripts/CodeGenerator.pm:
+        (ExtendedAttributeContains):
+        * bindings/scripts/test/TestObj.idl:
+        * page/Console.idl:
+
</ins><span class="cx"> 2013-06-27  Kangil Han  &lt;kangil.han@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         HTMLAudioElement doesn't have to know about isVideo function
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (152153 => 152154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm        2013-06-28 07:34:43 UTC (rev 152153)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm        2013-06-28 08:20:19 UTC (rev 152154)
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx">     return 0 unless $callWith;
</span><span class="cx">     my $keyword = shift;
</span><span class="cx"> 
</span><del>-    my @callWithKeywords = split /\s*\|\s*/, $callWith;
</del><ins>+    my @callWithKeywords = split /\s*\&amp;\s*/, $callWith;
</ins><span class="cx">     return grep { $_ eq $keyword } @callWithKeywords;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (152153 => 152154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl        2013-06-28 07:34:43 UTC (rev 152153)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl        2013-06-28 08:20:19 UTC (rev 152154)
</span><span class="lines">@@ -119,19 +119,19 @@
</span><span class="cx">     [CallWith=ScriptState, RaisesException] void withScriptStateVoidException();
</span><span class="cx">     [CallWith=ScriptState, RaisesException] TestObj withScriptStateObjException();
</span><span class="cx">     [CallWith=ScriptExecutionContext] void withScriptExecutionContext();
</span><del>-    [CallWith=ScriptExecutionContext|ScriptState] void withScriptExecutionContextAndScriptState();
-    [CallWith=ScriptExecutionContext|ScriptState, RaisesException] TestObj withScriptExecutionContextAndScriptStateObjException();
-    [CallWith=  ScriptExecutionContext  |  ScriptState  ] TestObj withScriptExecutionContextAndScriptStateWithSpaces();
-    [CallWith=ScriptArguments|CallStack] void withScriptArgumentsAndCallStack();
</del><ins>+    [CallWith=ScriptExecutionContext&amp;ScriptState] void withScriptExecutionContextAndScriptState();
+    [CallWith=ScriptExecutionContext&amp;ScriptState, RaisesException] TestObj withScriptExecutionContextAndScriptStateObjException();
+    [CallWith=  ScriptExecutionContext  &amp;  ScriptState  ] TestObj withScriptExecutionContextAndScriptStateWithSpaces();
+    [CallWith=ScriptArguments&amp;CallStack] void withScriptArgumentsAndCallStack();
</ins><span class="cx"> 
</span><span class="cx">     [CallWith=ScriptState] attribute long withScriptStateAttribute;
</span><span class="cx">     [CallWith=ScriptExecutionContext] attribute TestObj withScriptExecutionContextAttribute;
</span><span class="cx">     [CallWith=ScriptState, GetterRaisesException] attribute TestObj withScriptStateAttributeRaises;
</span><span class="cx">     [CallWith=ScriptExecutionContext, GetterRaisesException] attribute TestObj withScriptExecutionContextAttributeRaises;
</span><del>-    [CallWith=ScriptExecutionContext|ScriptState] attribute TestObj withScriptExecutionContextAndScriptStateAttribute;
-    [CallWith=ScriptExecutionContext|ScriptState,GetterRaisesException] attribute TestObj withScriptExecutionContextAndScriptStateAttributeRaises;
-    [CallWith=  ScriptExecutionContext  |  ScriptState  ] attribute TestObj withScriptExecutionContextAndScriptStateWithSpacesAttribute;
-    [CallWith=ScriptArguments|CallStack] attribute TestObj withScriptArgumentsAndCallStackAttribute;
</del><ins>+    [CallWith=ScriptExecutionContext&amp;ScriptState] attribute TestObj withScriptExecutionContextAndScriptStateAttribute;
+    [CallWith=ScriptExecutionContext&amp;ScriptState,GetterRaisesException] attribute TestObj withScriptExecutionContextAndScriptStateAttributeRaises;
+    [CallWith=  ScriptExecutionContext  &amp;  ScriptState  ] attribute TestObj withScriptExecutionContextAndScriptStateWithSpacesAttribute;
+    [CallWith=ScriptArguments&amp;CallStack] attribute TestObj withScriptArgumentsAndCallStackAttribute;
</ins><span class="cx"> 
</span><span class="cx">     // 'Optional' extended attribute
</span><span class="cx">     void    methodWithOptionalArg(optional long opt);
</span></span></pre></div>
<a id="trunkSourceWebCorepageConsoleidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Console.idl (152153 => 152154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Console.idl        2013-06-28 07:34:43 UTC (rev 152153)
+++ trunk/Source/WebCore/page/Console.idl        2013-06-28 08:20:19 UTC (rev 152154)
</span><span class="lines">@@ -31,17 +31,17 @@
</span><span class="cx">     GenerateIsReachable=ImplFrame,
</span><span class="cx"> ] interface Console {
</span><span class="cx"> 
</span><del>-    [CallWith=ScriptArguments|ScriptState] void debug();
-    [CallWith=ScriptArguments|ScriptState] void error();
-    [CallWith=ScriptArguments|ScriptState] void info();
-    [CallWith=ScriptArguments|ScriptState] void log();
-    [CallWith=ScriptArguments|ScriptState] void warn();
-    [CallWith=ScriptArguments|ScriptState] void dir();
-    [CallWith=ScriptArguments|ScriptState] void dirxml();
-    [CallWith=ScriptArguments|ScriptState] void table();
-    [CallWith=ScriptArguments|ScriptState] void trace();
-    [CallWith=ScriptArguments|ScriptState, ImplementedAs=assertCondition] void assert(boolean condition);
-    [CallWith=ScriptArguments|ScriptState] void count();
</del><ins>+    [CallWith=ScriptArguments&amp;ScriptState] void debug();
+    [CallWith=ScriptArguments&amp;ScriptState] void error();
+    [CallWith=ScriptArguments&amp;ScriptState] void info();
+    [CallWith=ScriptArguments&amp;ScriptState] void log();
+    [CallWith=ScriptArguments&amp;ScriptState] void warn();
+    [CallWith=ScriptArguments&amp;ScriptState] void dir();
+    [CallWith=ScriptArguments&amp;ScriptState] void dirxml();
+    [CallWith=ScriptArguments&amp;ScriptState] void table();
+    [CallWith=ScriptArguments&amp;ScriptState] void trace();
+    [CallWith=ScriptArguments&amp;ScriptState, ImplementedAs=assertCondition] void assert(boolean condition);
+    [CallWith=ScriptArguments&amp;ScriptState] void count();
</ins><span class="cx"> 
</span><span class="cx">     // As per spec: http://www.w3.org/TR/WebIDL/#idl-sequence
</span><span class="cx">     // &quot;Sequences must not be used as the type of an attribute, constant or exception field.&quot;
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx">     void time([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);
</span><span class="cx">     [CallWith=ScriptState] void timeEnd([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);
</span><span class="cx">     [CallWith=ScriptArguments] void timeStamp();
</span><del>-    [CallWith=ScriptArguments|ScriptState] void group();
-    [CallWith=ScriptArguments|ScriptState] void groupCollapsed();
</del><ins>+    [CallWith=ScriptArguments&amp;ScriptState] void group();
+    [CallWith=ScriptArguments&amp;ScriptState] void groupCollapsed();
</ins><span class="cx">     void groupEnd();
</span><del>-    [CallWith=ScriptArguments|ScriptState] void clear();
</del><ins>+    [CallWith=ScriptArguments&amp;ScriptState] void clear();
</ins><span class="cx"> };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>