<!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>[210493] 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/210493">210493</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-01-07 15:39:32 -0800 (Sat, 07 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid triggering rebuilds for minor changes of CSSProperties.json
https://bugs.webkit.org/show_bug.cgi?id=166810
Reviewed by Daniel Bates.
We expect to make lots of metadata-related changes to CSSProperties.json, and
these should not trigger rebuilds.
Have makeprop.pl write to temporary files first, then only replace the generated
files if the contents differ.
* css/makeprop.pl:
(replaceFileIfChanged):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssmakeproppl">trunk/Source/WebCore/css/makeprop.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210492 => 210493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-01-07 22:08:28 UTC (rev 210492)
+++ trunk/Source/WebCore/ChangeLog        2017-01-07 23:39:32 UTC (rev 210493)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-01-07 Simon Fraser <simon.fraser@apple.com>
+
+ Avoid triggering rebuilds for minor changes of CSSProperties.json
+ https://bugs.webkit.org/show_bug.cgi?id=166810
+
+ Reviewed by Daniel Bates.
+
+ We expect to make lots of metadata-related changes to CSSProperties.json, and
+ these should not trigger rebuilds.
+
+ Have makeprop.pl write to temporary files first, then only replace the generated
+ files if the contents differ.
+
+ * css/makeprop.pl:
+ (replaceFileIfChanged):
+
</ins><span class="cx"> 2017-01-06 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr use from "inspector", "platform/sql", and "platform/text"
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (210492 => 210493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl        2017-01-07 22:08:28 UTC (rev 210492)
+++ trunk/Source/WebCore/css/makeprop.pl        2017-01-07 23:39:32 UTC (rev 210493)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> use warnings;
</span><span class="cx">
</span><span class="cx"> use English;
</span><ins>+use File::Compare;
+use File::Copy;
</ins><span class="cx"> use File::Spec;
</span><span class="cx"> use Getopt::Long;
</span><span class="cx"> use JSON::PP;
</span><span class="lines">@@ -175,7 +177,19 @@
</span><span class="cx">
</span><span class="cx"> @names = sort sortByDescendingPriorityAndName @names;
</span><span class="cx">
</span><del>-open GPERF, ">CSSPropertyNames.gperf" || die "Could not open CSSPropertyNames.gperf for writing";
</del><ins>+sub replaceFileIfChanged($$)
+{
+ my ($tempFile, $file) = @_;
+
+ if (compare($tempFile, $file) != 0) {
+ copy($tempFile, $file) or die "Failed to copy $tempFile to $file: $!";
+ }
+ unlink($tempFile);
+}
+
+my $gperfTempFile = "CSSPropertyNames.gperf.tmp";
+
+open GPERF, ">$gperfTempFile" || die "Could not open $gperfTempFile for writing";
</ins><span class="cx"> print GPERF << "EOF";
</span><span class="cx"> %{
</span><span class="cx"> /* This file is automatically generated from $inputFile by makeprop, do not edit */
</span><span class="lines">@@ -332,7 +346,11 @@
</span><span class="cx">
</span><span class="cx"> close GPERF;
</span><span class="cx">
</span><del>-open HEADER, ">CSSPropertyNames.h" || die "Could not open CSSPropertyNames.h for writing";
</del><ins>+replaceFileIfChanged($gperfTempFile, "CSSPropertyNames.gperf");
+
+my $properyNamesHeaderTempFile = "CSSPropertyNames.h.tmp";
+
+open HEADER, ">$properyNamesHeaderTempFile" || die "Could not open $properyNamesHeaderTempFile for writing";
</ins><span class="cx"> print HEADER << "EOF";
</span><span class="cx"> /* This file is automatically generated from $inputFile by makeprop, do not edit */
</span><span class="cx">
</span><span class="lines">@@ -405,6 +423,8 @@
</span><span class="cx">
</span><span class="cx"> close HEADER;
</span><span class="cx">
</span><ins>+replaceFileIfChanged($properyNamesHeaderTempFile, "CSSPropertyNames.h");
+
</ins><span class="cx"> #
</span><span class="cx"> # StyleBuilder.cpp generator.
</span><span class="cx"> #
</span><span class="lines">@@ -894,7 +914,9 @@
</span><span class="cx"> return $setterContent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-open STYLEBUILDER, ">StyleBuilder.cpp" || die "Could not open StyleBuilder.cpp for writing";
</del><ins>+my $styleBuilderTempFile = "StyleBuilder.cpp.tmp";
+
+open STYLEBUILDER, ">$styleBuilderTempFile" || die "Could not open $styleBuilderTempFile for writing";
</ins><span class="cx"> print STYLEBUILDER << "EOF";
</span><span class="cx"> /* This file is automatically generated from $inputFile by makeprop, do not edit */
</span><span class="cx">
</span><span class="lines">@@ -968,8 +990,13 @@
</span><span class="cx">
</span><span class="cx"> close STYLEBUILDER;
</span><span class="cx">
</span><ins>+replaceFileIfChanged($styleBuilderTempFile, "StyleBuilder.cpp");
+
</ins><span class="cx"> # Generate StylePropertyShorthandsFunctions.
</span><del>-open SHORTHANDS_H, ">StylePropertyShorthandFunctions.h" || die "Could not open StylePropertyShorthandFunctions.h for writing";
</del><ins>+
+my $stylePropertyShorthandFunctionsHeaderTempFile = "StylePropertyShorthandFunctions.h.tmp";
+
+open SHORTHANDS_H, ">$stylePropertyShorthandFunctionsHeaderTempFile" || die "Could not open $stylePropertyShorthandFunctionsHeaderTempFile for writing";
</ins><span class="cx"> print SHORTHANDS_H << "EOF";
</span><span class="cx"> /* This file is automatically generated from $inputFile by makeprop, do not edit */
</span><span class="cx">
</span><span class="lines">@@ -995,7 +1022,13 @@
</span><span class="cx">
</span><span class="cx"> close SHORTHANDS_H;
</span><span class="cx">
</span><del>-open SHORTHANDS_CPP, ">StylePropertyShorthandFunctions.cpp" || die "Could not open StylePropertyShorthandFunctions.cpp for writing";
</del><ins>+replaceFileIfChanged($stylePropertyShorthandFunctionsHeaderTempFile, "StylePropertyShorthandFunctions.h");
+
+# Generate StylePropertyShorthandsFunctions.
+
+my $stylePropertyShorthandFunctionsTempFile = "StylePropertyShorthandFunctions.cpp.tmp";
+
+open SHORTHANDS_CPP, ">$stylePropertyShorthandFunctionsTempFile" || die "Could not open $stylePropertyShorthandFunctionsTempFile for writing";
</ins><span class="cx"> print SHORTHANDS_CPP << "EOF";
</span><span class="cx"> /* This file is automatically generated from $inputFile by makeprop, do not edit */
</span><span class="cx">
</span><span class="lines">@@ -1108,6 +1141,8 @@
</span><span class="cx">
</span><span class="cx"> close SHORTHANDS_CPP;
</span><span class="cx">
</span><ins>+replaceFileIfChanged($stylePropertyShorthandFunctionsTempFile, "StylePropertyShorthandFunctions.cpp");
+
</ins><span class="cx"> if (not $gperf) {
</span><span class="cx"> $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>