<!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>[208045] 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/208045">208045</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-28 05:36:33 -0700 (Fri, 28 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>generate-bindings-all.pl should recompile supplemented IDL if its supplemental IDL are added or removed
https://bugs.webkit.org/show_bug.cgi?id=164054
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2016-10-28
Reviewed by Michael Catanzaro.
generate-bindings-all.pl determines which IDL to recompile by
comparing timestamps of generated files, source IDL and its
dependencies. But this is not enough. If a new supplemental IDL
is added, its supplemented IDL needs to be recompiled even though
the timestamp of the supplemental IDL is older than the
generated files.
* bindings/scripts/generate-bindings-all.pl: Read supplemental
dependency file both before and after invoking preprocess-idls.pl.
Recompile IDL files if its supplemental dependencies are added or
removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsgeneratebindingsallpl">trunk/Source/WebCore/bindings/scripts/generate-bindings-all.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208044 => 208045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-28 12:24:35 UTC (rev 208044)
+++ trunk/Source/WebCore/ChangeLog 2016-10-28 12:36:33 UTC (rev 208045)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-28 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ generate-bindings-all.pl should recompile supplemented IDL if its supplemental IDL are added or removed
+ https://bugs.webkit.org/show_bug.cgi?id=164054
+
+ Reviewed by Michael Catanzaro.
+
+ generate-bindings-all.pl determines which IDL to recompile by
+ comparing timestamps of generated files, source IDL and its
+ dependencies. But this is not enough. If a new supplemental IDL
+ is added, its supplemented IDL needs to be recompiled even though
+ the timestamp of the supplemental IDL is older than the
+ generated files.
+
+ * bindings/scripts/generate-bindings-all.pl: Read supplemental
+ dependency file both before and after invoking preprocess-idls.pl.
+ Recompile IDL files if its supplemental dependencies are added or
+ removed.
+
</ins><span class="cx"> 2016-10-28 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> PeerMediaDescription does not need to be refcounted
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsgeneratebindingsallpl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/generate-bindings-all.pl (208044 => 208045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/generate-bindings-all.pl 2016-10-28 12:24:35 UTC (rev 208044)
+++ trunk/Source/WebCore/bindings/scripts/generate-bindings-all.pl 2016-10-28 12:36:33 UTC (rev 208045)
</span><span class="lines">@@ -70,11 +70,13 @@
</span><span class="cx"> @idlFiles = map { CygwinPathIfNeeded(s/\r?\n?$//r) } <$fh>;
</span><span class="cx"> close($fh) or die;
</span><span class="cx">
</span><del>-my %supplementedIdlFiles;
</del><ins>+my %oldSupplements;
+my %newSupplements;
</ins><span class="cx"> if ($supplementalDependencyFile) {
</span><span class="cx"> my @output = ($supplementalDependencyFile, @ppExtraOutput);
</span><del>- my @deps = (@idlFiles, @generatorDependency);
</del><ins>+ my @deps = ($idlFilesList, @idlFiles, @generatorDependency);
</ins><span class="cx"> if (needsUpdate(\@output, \@deps)) {
</span><ins>+ readSupplementalDependencyFile($supplementalDependencyFile, \%oldSupplements) if -e $supplementalDependencyFile;
</ins><span class="cx"> my @args = (File::Spec->catfile($scriptDir, 'preprocess-idls.pl'),
</span><span class="cx"> '--defines', $defines,
</span><span class="cx"> '--idlFilesList', $idlFilesList,
</span><span class="lines">@@ -83,12 +85,7 @@
</span><span class="cx"> print("Preprocess IDL\n");
</span><span class="cx"> executeCommand($perl, @args) == 0 or die;
</span><span class="cx"> }
</span><del>- open(my $fh, '<', $supplementalDependencyFile) or die "Cannot open $supplementalDependencyFile";
- while (<$fh>) {
- my ($idlFile, @followingIdlFiles) = split(/\s+/);
- $supplementedIdlFiles{$idlFile} = \@followingIdlFiles;
- }
- close($fh) or die;
</del><ins>+ readSupplementalDependencyFile($supplementalDependencyFile, \%newSupplements);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my @args = (File::Spec->catfile($scriptDir, 'generate-bindings.pl'),
</span><span class="lines">@@ -104,7 +101,12 @@
</span><span class="cx"> my %directoryCache;
</span><span class="cx"> buildDirectoryCache();
</span><span class="cx">
</span><del>-my @idlFilesToUpdate = grep {
</del><ins>+my @idlFilesToUpdate = grep &{sub {
+ if (defined($oldSupplements{$_})
+ && @{$oldSupplements{$_}} ne @{$newSupplements{$_} or []}) {
+ # Re-process the IDL file if its supplemental dependencies were added or removed
+ return 1;
+ }
</ins><span class="cx"> my ($filename, $dirs, $suffix) = fileparse($_, '.idl');
</span><span class="cx"> my $sourceFile = File::Spec->catfile($outputDirectory, "JS$filename.cpp");
</span><span class="cx"> my $headerFile = File::Spec->catfile($outputDirectory, "JS$filename.h");
</span><span class="lines">@@ -113,10 +115,10 @@
</span><span class="cx"> my @deps = ($_,
</span><span class="cx"> $idlAttributesFile,
</span><span class="cx"> @generatorDependency,
</span><del>- @{$supplementedIdlFiles{$_} or []},
</del><ins>+ @{$newSupplements{$_} or []},
</ins><span class="cx"> implicitDependencies($depFile));
</span><span class="cx"> needsUpdate(\@output, \@deps);
</span><del>-} @idlFiles;
</del><ins>+}}, @idlFiles;
</ins><span class="cx"> my $queue = Thread::Queue->new(@idlFilesToUpdate);
</span><span class="cx"> my $abort :shared = 0;
</span><span class="cx"> my $terminalWidth = getTerminalWidth();
</span><span class="lines">@@ -234,3 +236,15 @@
</span><span class="cx"> return 80 if $^O eq 'MSWin32';
</span><span class="cx"> return `stty size` =~ /\d+\s+(\d+)/ ? $1 : 80;
</span><span class="cx"> }
</span><ins>+
+sub readSupplementalDependencyFile
+{
+ my $filename = shift;
+ my $supplements = shift;
+ open(my $fh, '<', $filename) or die "Cannot open $filename";
+ while (<$fh>) {
+ my ($idlFile, @followingIdlFiles) = split(/\s+/);
+ $supplements->{$idlFile} = [sort @followingIdlFiles];
+ }
+ close($fh) or die;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>