<!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>[185907] trunk/Source</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/185907">185907</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-24 06:09:46 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/185906">r185906</a>.
https://bugs.webkit.org/show_bug.cgi?id=146276
MSVC doesn't yet provide a const-qualified std::array<T,
N>::size(), failing to compile the static_assert (Requested by
zdobersek on #webkit).
Reverted changeset:
"Improve the source code generated by make_names.pl"
https://bugs.webkit.org/show_bug.cgi?id=146208
http://trac.webkit.org/changeset/185906</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplh">trunk/Source/WTF/wtf/text/StringImpl.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsStaticStringpm">trunk/Source/WebCore/bindings/scripts/StaticString.pm</a></li>
<li><a href="#trunkSourceWebCoredommake_namespl">trunk/Source/WebCore/dom/make_names.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (185906 => 185907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2015-06-24 12:19:19 UTC (rev 185906)
+++ trunk/Source/WTF/ChangeLog        2015-06-24 13:09:46 UTC (rev 185907)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r185906.
+ https://bugs.webkit.org/show_bug.cgi?id=146276
+
+ MSVC doesn't yet provide a const-qualified std::array<T,
+ N>::size(), failing to compile the static_assert (Requested by
+ zdobersek on #webkit).
+
+ Reverted changeset:
+
+ "Improve the source code generated by make_names.pl"
+ https://bugs.webkit.org/show_bug.cgi?id=146208
+ http://trac.webkit.org/changeset/185906
+
</ins><span class="cx"> 2015-06-24 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Improve the source code generated by make_names.pl
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (185906 => 185907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h        2015-06-24 12:19:19 UTC (rev 185906)
+++ trunk/Source/WTF/wtf/text/StringImpl.h        2015-06-24 13:09:46 UTC (rev 185907)
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- void assertHashIsCorrect() const
</del><ins>+ void assertHashIsCorrect()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasHash());
</span><span class="cx"> ASSERT(existingHash() == StringHasher::computeHashAndMaskTop8Bits(characters8(), length()));
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185906 => 185907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-06-24 12:19:19 UTC (rev 185906)
+++ trunk/Source/WebCore/ChangeLog        2015-06-24 13:09:46 UTC (rev 185907)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r185906.
+ https://bugs.webkit.org/show_bug.cgi?id=146276
+
+ MSVC doesn't yet provide a const-qualified std::array<T,
+ N>::size(), failing to compile the static_assert (Requested by
+ zdobersek on #webkit).
+
+ Reverted changeset:
+
+ "Improve the source code generated by make_names.pl"
+ https://bugs.webkit.org/show_bug.cgi?id=146208
+ http://trac.webkit.org/changeset/185906
+
</ins><span class="cx"> 2015-06-24 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Improve the source code generated by make_names.pl
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsStaticStringpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/StaticString.pm (185906 => 185907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/StaticString.pm        2015-06-24 12:19:19 UTC (rev 185906)
+++ trunk/Source/WebCore/bindings/scripts/StaticString.pm        2015-06-24 13:09:46 UTC (rev 185907)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> use strict;
</span><span class="cx"> use Hasher;
</span><span class="cx">
</span><del>-sub GenerateStringData($)
</del><ins>+sub GenerateStrings($)
</ins><span class="cx"> {
</span><span class="cx"> my $stringsRef = shift;
</span><span class="cx"> my %strings = %$stringsRef;
</span><span class="lines">@@ -37,34 +37,20 @@
</span><span class="cx"> push(@result, "static const LChar ${name}String8[] = \"$strings{$name}\";\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return join "", @result;
-}
-
-sub GenerateASCIILiteral($$)
-{
- my $name = shift;
- my $value = shift;
-
- my $length = length($value);
- my $hash = Hasher::GenerateHashValue($value);
- return "{ StaticASCIILiteral::s_initialRefCount, $length, ${name}String8, StaticASCIILiteral::s_initialFlags | (${hash} << StaticASCIILiteral::s_hashShift) }";
-}
-
-sub GenerateStrings($)
-{
- my $stringsRef = shift;
- my %strings = %$stringsRef;
-
- my @result = ();
-
- push(@result, GenerateStringData($stringsRef));
</del><span class="cx"> push(@result, "\n");
</span><span class="cx">
</span><span class="cx"> for my $name (sort keys %strings) {
</span><span class="cx"> my $value = $strings{$name};
</span><del>- push(@result, "static StaticASCIILiteral ${name}Data = ");
- push(@result, GenerateASCIILiteral($name, $strings{$name}));
- push(@result, ";\n");
</del><ins>+ my $length = length($value);
+ my $hash = Hasher::GenerateHashValue($value);
+ push(@result, <<END);
+static StringImpl::StaticASCIILiteral ${name}Data = {
+ StringImpl::StaticASCIILiteral::s_initialRefCount,
+ $length,
+ ${name}String8,
+ StringImpl::StaticASCIILiteral::s_initialFlags | (${hash} << StringImpl::StaticASCIILiteral::s_hashShift)
+};
+END
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@result, "\n");
</span></span></pre></div>
<a id="trunkSourceWebCoredommake_namespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/make_names.pl (185906 => 185907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/make_names.pl        2015-06-24 12:19:19 UTC (rev 185906)
+++ trunk/Source/WebCore/dom/make_names.pl        2015-06-24 13:09:46 UTC (rev 185907)
</span><span class="lines">@@ -573,13 +573,11 @@
</span><span class="cx"> print F "#endif\n\n";
</span><span class="cx">
</span><span class="cx"> print F "#include \"${namespace}Names.h\"\n\n";
</span><del>- print F "#include <array>\n";
- print F "#include <wtf/StaticConstructors.h>\n\n";
</del><ins>+ print F "#include <wtf/StaticConstructors.h>\n";
</ins><span class="cx">
</span><span class="cx"> print F "namespace WebCore {\n\n";
</span><span class="cx"> print F "namespace ${namespace}Names {\n\n";
</span><del>- print F "using namespace $usedNamespace;\n";
- print F "using StaticASCIILiteral = StringImpl::StaticASCIILiteral;\n\n";
</del><ins>+ print F "using namespace $usedNamespace;\n\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub printInit
</span><span class="lines">@@ -600,6 +598,8 @@
</span><span class="cx"> return;
</span><span class="cx"> initialized = true;
</span><span class="cx">
</span><ins>+ // Use placement new to initialize the globals.
+
</ins><span class="cx"> AtomicString::init();
</span><span class="cx"> ";
</span><span class="cx"> }
</span><span class="lines">@@ -762,15 +762,37 @@
</span><span class="cx">
</span><span class="cx"> print F "WEBCORE_EXPORT DEFINE_GLOBAL(AtomicString, ${lowercaseNamespacePrefix}NamespaceURI)\n\n";
</span><span class="cx">
</span><del>- print F StaticString::GenerateStringData(\%allStrings);
- print F "\n";
</del><ins>+ print F StaticString::GenerateStrings(\%allStrings);
</ins><span class="cx">
</span><span class="cx"> if (keys %allTags) {
</span><del>- printStaticData($F, \%allTags, "Tag", $parameters{namespace}, "$parameters{namespace}QualifiedName");
</del><ins>+ print F "// Tags\n";
+ for my $name (sort keys %allTags) {
+ print F "WEBCORE_EXPORT DEFINE_GLOBAL($parameters{namespace}QualifiedName, ", $name, "Tag)\n";
+ }
+
+ print F "\n\nconst WebCore::$parameters{namespace}QualifiedName* const* get$parameters{namespace}Tags()\n";
+ print F "{\n static const WebCore::$parameters{namespace}QualifiedName* const $parameters{namespace}Tags[] = {\n";
+ for my $name (sort keys %allTags) {
+ print F " reinterpret_cast<const WebCore::$parameters{namespace}QualifiedName*>(&${name}Tag),\n";
+ }
+ print F " };\n";
+ print F " return $parameters{namespace}Tags;\n";
+ print F "}\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (keys %allAttrs) {
</span><del>- printStaticData($F, \%allAttrs, "Attr", $parameters{namespace}, "QualifiedName");
</del><ins>+ print F "\n// Attributes\n";
+ for my $name (sort keys %allAttrs) {
+ print F "WEBCORE_EXPORT DEFINE_GLOBAL(QualifiedName, ", $name, "Attr)\n";
+ }
+ print F "\n\nconst WebCore::QualifiedName* const* get$parameters{namespace}Attrs()\n";
+ print F "{\n static const WebCore::QualifiedName* const $parameters{namespace}Attrs[] = {\n";
+ for my $name (sort keys %allAttrs) {
+ print F " reinterpret_cast<const WebCore::QualifiedName*>(&${name}Attr),\n";
+ }
+ print F " };\n";
+ print F " return $parameters{namespace}Attrs;\n";
+ print F "}\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> printInit($F, 0);
</span><span class="lines">@@ -779,15 +801,16 @@
</span><span class="cx">
</span><span class="cx"> print(F " // Namespace\n");
</span><span class="cx"> print(F " new (NotNull, (void*)&${lowercaseNamespacePrefix}NamespaceURI) AtomicString(${lowercaseNamespacePrefix}NS);\n");
</span><ins>+ print(F "\n");
+ print F StaticString::GenerateStringAsserts(\%allStrings);
</ins><span class="cx">
</span><span class="cx"> if (keys %allTags) {
</span><span class="cx"> my $tagsNamespace = $parameters{tagsNullNamespace} ? "nullAtom" : "${lowercaseNamespacePrefix}NS";
</span><del>- printQualifiedNameCreation($F, "Tags", $parameters{namespace}, "$parameters{namespace}QualifiedName", $tagsNamespace);
</del><ins>+ printDefinitions($F, \%allTags, "tags", $tagsNamespace);
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> if (keys %allAttrs) {
</span><span class="cx"> my $attrsNamespace = $parameters{attrsNullNamespace} ? "nullAtom" : "${lowercaseNamespacePrefix}NS";
</span><del>- printQualifiedNameCreation($F, "Attrs", $parameters{namespace}, "QualifiedName", $attrsNamespace);
</del><ins>+ printDefinitions($F, \%allAttrs, "attributes", $attrsNamespace);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> print F "}\n\n} }\n\n";
</span><span class="lines">@@ -870,56 +893,38 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub printStaticData
</del><ins>+sub printDefinitions
</ins><span class="cx"> {
</span><del>- my ($F, $namesRef, $type, $namespace, $qualifiedNameType) = @_;
</del><ins>+ my ($F, $namesRef, $type, $namespaceURI) = @_;
</ins><span class="cx">
</span><del>- my $nameCount = scalar(keys %$namesRef);
</del><ins>+ my $shortCamelType = ucfirst(substr(substr($type, 0, -1), 0, 4));
+ my $capitalizedType = ucfirst($type);
+
+print F <<END
</ins><span class="cx">
</span><del>- print F "// $type\n";
- for my $name (sort keys %$namesRef) {
- print F "WEBCORE_EXPORT DEFINE_GLOBAL($qualifiedNameType, ${name}${type})\n";
- }
</del><ins>+ struct ${capitalizedType}TableEntry {
+ void* targetAddress;
+ StringImpl& name;
+ };
</ins><span class="cx">
</span><del>- print F "\n";
- print F "static const std::array<const $qualifiedNameType*, $nameCount> ${namespace}${type}s = { {\n";
</del><ins>+ static const ${capitalizedType}TableEntry ${type}Table[] = {
+END
+;
</ins><span class="cx"> for my $name (sort keys %$namesRef) {
</span><del>- print F " reinterpret_cast<const $qualifiedNameType*>(&${name}${type}),\n";
</del><ins>+ print F " { (void*)&$name$shortCamelType, *reinterpret_cast<StringImpl*>(&${name}Data) },\n";
</ins><span class="cx"> }
</span><del>- print F "} };\n\n";
</del><span class="cx">
</span><del>- print F "static const std::array<StaticASCIILiteral, $nameCount> ${namespace}${type}sLiterals = { {\n";
- for my $name (sort keys %$namesRef) {
- print F " ", StaticString::GenerateASCIILiteral($name, valueForName($name)), ",\n";
- }
- print F "} };\n\n";
</del><ins>+print F <<END
+ };
</ins><span class="cx">
</span><del>- print F "const $qualifiedNameType* const* get${namespace}${type}s()\n";
- print F "{\n";
- print F " return ${namespace}${type}s.data();\n";
- print F "}\n";
-}
-
-sub printQualifiedNameCreation
-{
- my ($F, $type, $namespace, $qualifiedNameType, $namespaceURI) = @_;
-
- print F "\n";
- print F " static_assert(${namespace}${type}.size() == ${namespace}${type}Literals.size(), \"Arrays match in size\");\n";
- print F " for (size_t i = 0; i < ${namespace}${type}.size(); ++i) {\n";
- print F "#ifndef NDEBUG\n";
- print F " reinterpret_cast<const StringImpl&>(${namespace}${type}Literals[i]).assertHashIsCorrect();\n";
- print F "#endif\n";
-
</del><ins>+ for (unsigned i = 0; i < WTF_ARRAY_LENGTH(${type}Table); ++i)
+END
+;
</ins><span class="cx"> if ($namespaceURI eq "nullAtom") {
</span><del>- print F " createQualifiedName(reinterpret_cast<void*>(const_cast<$qualifiedNameType*>(${namespace}${type}\[i\])),\n";
- print F " reinterpret_cast<StringImpl*>(const_cast<StaticASCIILiteral*>(&${namespace}${type}Literals\[i\])));\n";
</del><ins>+ print F " createQualifiedName(${type}Table[i].targetAddress, &${type}Table[i].name);\n";
</ins><span class="cx"> } else {
</span><del>- print F " createQualifiedName(reinterpret_cast<void*>(const_cast<$qualifiedNameType*>(${namespace}${type}\[i\])),\n";
- print F " reinterpret_cast<StringImpl*>(const_cast<StaticASCIILiteral*>(&${namespace}${type}Literals\[i\])), $namespaceURI);\n";
</del><ins>+ print F " createQualifiedName(${type}Table[i].targetAddress, &${type}Table[i].name, $namespaceURI);\n";
</ins><span class="cx"> }
</span><del>-
- print F " }\n";
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ## ElementFactory routines
</span></span></pre>
</div>
</div>
</body>
</html>