<!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>[207278] 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/207278">207278</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 22:21:14 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>The bindings generator should provide a better error message when it does not find a dictionary definition
https://bugs.webkit.org/show_bug.cgi?id=163377
Reviewed by Ryosuke Niwa.
The bindings generator should provide a better error message when it does
not find a dictionary definition.
* bindings/scripts/CodeGenerator.pm:
(GetDictionaryByName):
* bindings/scripts/CodeGeneratorJS.pm:
(assert):
(GenerateDictionaryImplementationContent):
(GenerateHeader):
(GenerateDictionaryHeader):</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="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207277 => 207278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-13 05:18:59 UTC (rev 207277)
+++ trunk/Source/WebCore/ChangeLog 2016-10-13 05:21:14 UTC (rev 207278)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-10-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ The bindings generator should provide a better error message when it does not find a dictionary definition
+ https://bugs.webkit.org/show_bug.cgi?id=163377
+
+ Reviewed by Ryosuke Niwa.
+
+ The bindings generator should provide a better error message when it does
+ not find a dictionary definition.
+
+ * bindings/scripts/CodeGenerator.pm:
+ (GetDictionaryByName):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (assert):
+ (GenerateDictionaryImplementationContent):
+ (GenerateHeader):
+ (GenerateDictionaryHeader):
+
+2016-10-12 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Update WebKitMediaKeyMessageEvent / WebKitMediaKeyNeededEvent to stop using legacy [ConstructorTemplate=Event]
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163369
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (207277 => 207278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-10-13 05:18:59 UTC (rev 207277)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-10-13 05:21:14 UTC (rev 207278)
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> sub GetDictionaryByName
</span><span class="cx"> {
</span><span class="cx"> my ($object, $name) = @_;
</span><del>- return unless defined($name);
</del><ins>+ die "GetDictionaryByName() was called with an undefined dictionary name" unless defined($name);
</ins><span class="cx">
</span><span class="cx"> for my $dictionary (@{$useDocument->dictionaries}) {
</span><span class="cx"> return $dictionary if $dictionary->name eq $name;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (207277 => 207278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-13 05:18:59 UTC (rev 207277)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-13 05:21:14 UTC (rev 207278)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx">
</span><span class="cx"> use strict;
</span><span class="cx"> use constant FileNamePrefix => "JS";
</span><ins>+use Carp qw<longmess>;
+use Data::Dumper;
</ins><span class="cx"> use Hasher;
</span><span class="cx">
</span><span class="cx"> my $codeGenerator;
</span><span class="lines">@@ -107,6 +109,16 @@
</span><span class="cx"> */
</span><span class="cx"> EOF
</span><span class="cx">
</span><ins>+sub assert
+{
+ my $message = shift;
+
+ my $mess = longmess();
+ print Dumper($mess);
+
+ die $message;
+}
+
</ins><span class="cx"> # Default constructor
</span><span class="cx"> sub new
</span><span class="cx"> {
</span><span class="lines">@@ -1092,10 +1104,12 @@
</span><span class="cx"> # 4. Let dictionaries be a list consisting of D and all of D’s inherited dictionaries, in order from least to most derived.
</span><span class="cx"> my @dictionaries;
</span><span class="cx"> push(@dictionaries, $dictionary);
</span><del>- my $parentDictionary = $codeGenerator->GetDictionaryByName($dictionary->parent);
- while (defined($parentDictionary)) {
</del><ins>+ my $parentName = $dictionary->parent;
+ while (defined($parentName)) {
+ my $parentDictionary = $codeGenerator->GetDictionaryByName($parentName);
+ assert("Unable to find definition for dictionary named '" . $parentName . "'!") unless defined($parentDictionary);
</ins><span class="cx"> unshift(@dictionaries, $parentDictionary);
</span><del>- $parentDictionary = $codeGenerator->GetDictionaryByName($parentDictionary->parent);
</del><ins>+ $parentName = $parentDictionary->parent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $arguments = "";
</span><span class="lines">@@ -1741,10 +1755,12 @@
</span><span class="cx"> push(@ancestors, $currentInterface->name);
</span><span class="cx"> }, 0);
</span><span class="cx"> for my $dictionary (@$dictionaries) {
</span><del>- my $parentDictionary = $dictionary->parent;
- while (defined($parentDictionary)) {
- push(@ancestors, $parentDictionary) if $codeGenerator->IsExternalDictionaryType($parentDictionary);
- $parentDictionary = $codeGenerator->GetDictionaryByName($parentDictionary)->parent;
</del><ins>+ my $parentName = $dictionary->parent;
+ while (defined($parentName)) {
+ push(@ancestors, $parentName) if $codeGenerator->IsExternalDictionaryType($parentName);
+ my $parentDictionary = $codeGenerator->GetDictionaryByName($parentName);
+ assert("Unable to find definition for dictionary named '" . $parentName . "'!") unless defined($parentDictionary);
+ $parentName = $parentDictionary->parent;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> push(@depsContent, "$className.h : ", join(" ", map { "$_.idl" } @ancestors), "\n");
</span><span class="lines">@@ -4375,10 +4391,12 @@
</span><span class="cx"> # - Generate dependencies.
</span><span class="cx"> if ($writeDependencies) {
</span><span class="cx"> my @ancestors;
</span><del>- my $parentDictionary = $dictionary->parent;
- while (defined($parentDictionary)) {
- push(@ancestors, $parentDictionary) if $codeGenerator->IsExternalDictionaryType($parentDictionary);
- $parentDictionary = $codeGenerator->GetDictionaryByName($parentDictionary)->parent;
</del><ins>+ my $parentName = $dictionary->parent;
+ while (defined($parentName)) {
+ push(@ancestors, $parentName) if $codeGenerator->IsExternalDictionaryType($parentName);
+ my $parentDictionary = $codeGenerator->GetDictionaryByName($parentName);
+ assert("Unable to find definition for dictionary named '" . $parentName . "'!") unless $parentDictionary;
+ $parentName = $parentDictionary->parent;
</ins><span class="cx"> }
</span><span class="cx"> push(@depsContent, "$className.h : ", join(" ", map { "$_.idl" } @ancestors), "\n");
</span><span class="cx"> push(@depsContent, map { "$_.idl :\n" } @ancestors);
</span></span></pre>
</div>
</div>
</body>
</html>