<!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>[52120] trunk/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/52120">52120</a></dd>
<dt>Author</dt> <dd>dglazkov@chromium.org</dd>
<dt>Date</dt> <dd>2009-12-14 14:17:19 -0800 (Mon, 14 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-12-14  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;

        Reviewed by Eric Seidel.

        [V8] Generate bindings for trivial indexers.
        https://bugs.webkit.org/show_bug.cgi?id=32455

        Covered by existing tests.

        * bindings/scripts/CodeGeneratorV8.pm:
            Added detecting indexers and generating code for them.
        * bindings/v8/V8Collection.h: Removed code that's now generated.
        * bindings/v8/V8DOMWrapper.cpp:
        (WebCore::V8DOMWrapper::getTemplate): Ditto.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsscriptsCodeGeneratorV8pm">trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm</a></li>
<li><a href="#trunkWebCorebindingsv8V8Collectionh">trunk/WebCore/bindings/v8/V8Collection.h</a></li>
<li><a href="#trunkWebCorebindingsv8V8DOMWrappercpp">trunk/WebCore/bindings/v8/V8DOMWrapper.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (52119 => 52120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-12-14 22:16:33 UTC (rev 52119)
+++ trunk/WebCore/ChangeLog        2009-12-14 22:17:19 UTC (rev 52120)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2009-12-14  Dimitri Glazkov  &lt;dglazkov@chromium.org&gt;
+
+        Reviewed by Eric Seidel.
+
+        [V8] Generate bindings for trivial indexers.
+        https://bugs.webkit.org/show_bug.cgi?id=32455
+
+        Covered by existing tests.
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+            Added detecting indexers and generating code for them.
+        * bindings/v8/V8Collection.h: Removed code that's now generated.
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::getTemplate): Ditto.
+
</ins><span class="cx"> 2009-12-14  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dave Hyatt.
</span></span></pre></div>
<a id="trunkWebCorebindingsscriptsCodeGeneratorV8pm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm (52119 => 52120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm        2009-12-14 22:16:33 UTC (rev 52119)
+++ trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm        2009-12-14 22:17:19 UTC (rev 52120)
</span><span class="lines">@@ -1127,6 +1127,37 @@
</span><span class="cx"> END
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+sub GenerateImplementationIndexer
+{
+    my $dataNode = shift;
+    my $indexer = shift;
+    my $interfaceName = $dataNode-&gt;name;
+
+    if ($dataNode-&gt;extendedAttributes-&gt;{&quot;HasIndexGetter&quot;}) {
+        $implIncludes{&quot;V8Collection.h&quot;} = 1;
+        if (!$dataNode-&gt;extendedAttributes-&gt;{&quot;HasCustomIndexGetter&quot;}) {
+            if ($indexer-&gt;type eq &quot;DOMString&quot;) {
+                my $conversion = $indexer-&gt;extendedAttributes-&gt;{&quot;ConvertNullStringTo&quot;};
+                if ($conversion &amp;&amp; $conversion eq &quot;Null&quot;) {
+                    push(@implContent, &lt;&lt;END);
+  setCollectionStringOrNullIndexedGetter&lt;${interfaceName}&gt;(desc);
+END
+                } else {
+                    push(@implContent, &lt;&lt;END);
+  setCollectionStringIndexedGetter&lt;${interfaceName}&gt;(desc);
+END
+                }
+            } else {
+                my $indexerType = $indexer-&gt;type;
+                my $indexerClassIndex = uc($indexerType);
+                push(@implContent, &lt;&lt;END);
+  setCollectionIndexedGetter&lt;${interfaceName}, ${indexerType}&gt;(desc, V8ClassIndex::${indexerClassIndex});
+END
+            }
+        }
+    }
+}
+
</ins><span class="cx"> sub GenerateImplementation
</span><span class="cx"> {
</span><span class="cx">     my $object = shift;
</span><span class="lines">@@ -1165,7 +1196,6 @@
</span><span class="cx">     push(@implContentDecls, &quot;template &lt;typename T&gt; void V8_USE(T) { }\n\n&quot;);
</span><span class="cx"> 
</span><span class="cx">     my $hasConstructors = 0;
</span><del>-
</del><span class="cx">     # Generate property accessors for attributes.
</span><span class="cx">     for ($index = 0; $index &lt; @{$dataNode-&gt;attributes}; $index++) {
</span><span class="cx">         $attribute = @{$dataNode-&gt;attributes}[$index];
</span><span class="lines">@@ -1216,6 +1246,7 @@
</span><span class="cx">         GenerateConstructorGetter($implClassName, $classIndex);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    my $indexer;
</ins><span class="cx">     # Generate methods for functions.
</span><span class="cx">     foreach my $function (@{$dataNode-&gt;functions}) {
</span><span class="cx">         # hack for addEventListener/RemoveEventListener
</span><span class="lines">@@ -1226,6 +1257,10 @@
</span><span class="cx">             GenerateFunctionCallback($function, $dataNode, $classIndex, $implClassName);
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        if ($function-&gt;signature-&gt;name eq &quot;item&quot;) {
+            $indexer = $function-&gt;signature;
+        }
+
</ins><span class="cx">         # If the function does not need domain security check, we need to
</span><span class="cx">         # generate an access getter that returns different function objects
</span><span class="cx">         # for different calling context.
</span><span class="lines">@@ -1244,6 +1279,7 @@
</span><span class="cx">     my @enabledAtRuntime;
</span><span class="cx">     my @normal;
</span><span class="cx">     foreach my $attribute (@$attributes) {
</span><ins>+
</ins><span class="cx">         if ($interfaceName eq &quot;DOMWindow&quot; &amp;&amp; $attribute-&gt;signature-&gt;extendedAttributes-&gt;{&quot;V8DisallowShadowing&quot;}) {
</span><span class="cx">             push(@disallowsShadowing, $attribute);
</span><span class="cx">         } elsif ($attribute-&gt;signature-&gt;extendedAttributes-&gt;{&quot;EnabledAtRuntime&quot;}) {
</span><span class="lines">@@ -1409,6 +1445,8 @@
</span><span class="cx">         push(@implContent, &quot;\n#endif // ${conditionalString}\n&quot;) if $conditionalString;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    GenerateImplementationIndexer($dataNode, $indexer) if $indexer;
+
</ins><span class="cx">     # Define our functions with Set() or SetAccessor()
</span><span class="cx">     $total_functions = 0;
</span><span class="cx">     foreach my $function (@{$dataNode-&gt;functions}) {
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8Collectionh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8Collection.h (52119 => 52120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8Collection.h        2009-12-14 22:16:33 UTC (rev 52119)
+++ trunk/WebCore/bindings/v8/V8Collection.h        2009-12-14 22:17:19 UTC (rev 52120)
</span><span class="lines">@@ -203,17 +203,6 @@
</span><span class="cx">         desc-&gt;InstanceTemplate()-&gt;SetNamedPropertyHandler(collectionNamedPropertyGetter&lt;Collection, ItemType&gt;, 0, 0, 0, 0, v8::Integer::New(V8ClassIndex::ToInt(type)));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-
-    // Add named and indexed getters to the function template for a collection.
-    template&lt;class Collection, class ItemType&gt; static void setCollectionIndexedAndNamedGetters(v8::Handle&lt;v8::FunctionTemplate&gt; desc, V8ClassIndex::V8WrapperType type)
-    {
-        // If we interceptor before object, accessing 'length' can trigger a webkit assertion error (see fast/dom/HTMLDocument/document-special-properties.html).
-        desc-&gt;InstanceTemplate()-&gt;SetNamedPropertyHandler(collectionNamedPropertyGetter&lt;Collection, ItemType&gt;, 0, 0, 0, 0, v8::Integer::New(V8ClassIndex::ToInt(type)));
-        desc-&gt;InstanceTemplate()-&gt;SetIndexedPropertyHandler(collectionIndexedPropertyGetter&lt;Collection, ItemType&gt;, 0, 0, 0, collectionIndexedPropertyEnumerator&lt;Collection&gt;,
-                                                            v8::Integer::New(V8ClassIndex::ToInt(type)));
-    }
-
-
</del><span class="cx">     // Add indexed getter returning a string or null to a function template for a collection.
</span><span class="cx">     template&lt;class Collection&gt; static void setCollectionStringOrNullIndexedGetter(v8::Handle&lt;v8::FunctionTemplate&gt; desc)
</span><span class="cx">     {
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8DOMWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8DOMWrapper.cpp (52119 => 52120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8DOMWrapper.cpp        2009-12-14 22:16:33 UTC (rev 52119)
+++ trunk/WebCore/bindings/v8/V8DOMWrapper.cpp        2009-12-14 22:17:19 UTC (rev 52120)
</span><span class="lines">@@ -276,26 +276,12 @@
</span><span class="cx">         // setter. Therefore, the interceptor has to be on the object
</span><span class="cx">         // itself and not on the prototype object.
</span><span class="cx">         descriptor-&gt;InstanceTemplate()-&gt;SetNamedPropertyHandler( USE_NAMED_PROPERTY_GETTER(CSSStyleDeclaration), USE_NAMED_PROPERTY_SETTER(CSSStyleDeclaration));
</span><del>-        setCollectionStringIndexedGetter&lt;CSSStyleDeclaration&gt;(descriptor);
</del><span class="cx">         break;
</span><del>-    case V8ClassIndex::CSSRULELIST:
-        setCollectionIndexedGetter&lt;CSSRuleList, CSSRule&gt;(descriptor,  V8ClassIndex::CSSRULE);
-        break;
-    case V8ClassIndex::CSSVALUELIST:
-        setCollectionIndexedGetter&lt;CSSValueList, CSSValue&gt;(descriptor, V8ClassIndex::CSSVALUE);
-        break;
-    case V8ClassIndex::CSSVARIABLESDECLARATION:
-        setCollectionStringIndexedGetter&lt;CSSVariablesDeclaration&gt;(descriptor);
-        break;
-    case V8ClassIndex::WEBKITCSSTRANSFORMVALUE:
-        setCollectionIndexedGetter&lt;WebKitCSSTransformValue, CSSValue&gt;(descriptor, V8ClassIndex::CSSVALUE);
-        break;
</del><span class="cx">     case V8ClassIndex::HTMLALLCOLLECTION:
</span><span class="cx">         descriptor-&gt;InstanceTemplate()-&gt;MarkAsUndetectable(); // fall through
</span><span class="cx">     case V8ClassIndex::HTMLCOLLECTION:
</span><span class="cx">         descriptor-&gt;InstanceTemplate()-&gt;SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLCollection));
</span><span class="cx">         descriptor-&gt;InstanceTemplate()-&gt;SetCallAsFunctionHandler(USE_CALLBACK(HTMLCollectionCallAsFunction));
</span><del>-        setCollectionIndexedGetter&lt;HTMLCollection, Node&gt;(descriptor, V8ClassIndex::NODE);
</del><span class="cx">         break;
</span><span class="cx">     case V8ClassIndex::HTMLOPTIONSCOLLECTION:
</span><span class="cx">         descriptor-&gt;InstanceTemplate()-&gt;SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(HTMLCollection));
</span><span class="lines">@@ -361,11 +347,8 @@
</span><span class="cx">         instanceTemplate-&gt;SetInternalFieldCount(V8Custom::kStyleSheetInternalFieldCount);
</span><span class="cx">         break;
</span><span class="cx">     }
</span><del>-    case V8ClassIndex::MEDIALIST:
-        setCollectionStringOrNullIndexedGetter&lt;MediaList&gt;(descriptor);
-        break;
</del><span class="cx">     case V8ClassIndex::MIMETYPEARRAY:
</span><del>-        setCollectionIndexedAndNamedGetters&lt;MimeTypeArray, MimeType&gt;(descriptor, V8ClassIndex::MIMETYPE);
</del><ins>+        setCollectionNamedGetter&lt;MimeTypeArray, MimeType&gt;(descriptor, V8ClassIndex::MIMETYPE);
</ins><span class="cx">         break;
</span><span class="cx">     case V8ClassIndex::NAMEDNODEMAP: {
</span><span class="cx">         // We add an extra internal field to hold a reference to the owner node.
</span><span class="lines">@@ -383,18 +366,16 @@
</span><span class="cx">         break;
</span><span class="cx"> #endif
</span><span class="cx">     case V8ClassIndex::NODELIST:
</span><del>-        setCollectionIndexedGetter&lt;NodeList, Node&gt;(descriptor, V8ClassIndex::NODE);
</del><span class="cx">         descriptor-&gt;InstanceTemplate()-&gt;SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(NodeList));
</span><span class="cx">         break;
</span><span class="cx">     case V8ClassIndex::PLUGIN:
</span><del>-        setCollectionIndexedAndNamedGetters&lt;Plugin, MimeType&gt;(descriptor, V8ClassIndex::MIMETYPE);
</del><ins>+        setCollectionNamedGetter&lt;Plugin, MimeType&gt;(descriptor, V8ClassIndex::MIMETYPE);
</ins><span class="cx">         break;
</span><span class="cx">     case V8ClassIndex::PLUGINARRAY:
</span><del>-        setCollectionIndexedAndNamedGetters&lt;PluginArray, Plugin&gt;(descriptor, V8ClassIndex::PLUGIN);
</del><ins>+        setCollectionNamedGetter&lt;PluginArray, Plugin&gt;(descriptor, V8ClassIndex::PLUGIN);
</ins><span class="cx">         break;
</span><span class="cx">     case V8ClassIndex::STYLESHEETLIST:
</span><span class="cx">         descriptor-&gt;InstanceTemplate()-&gt;SetNamedPropertyHandler(USE_NAMED_PROPERTY_GETTER(StyleSheetList));
</span><del>-        setCollectionIndexedGetter&lt;StyleSheetList, StyleSheet&gt;(descriptor, V8ClassIndex::STYLESHEET);
</del><span class="cx">         break;
</span><span class="cx">     case V8ClassIndex::DOMWINDOW: {
</span><span class="cx">         v8::Local&lt;v8::Signature&gt; defaultSignature = v8::Signature::New(descriptor);
</span></span></pre>
</div>
</div>

</body>
</html>