<!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>[213007] 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/213007">213007</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-25 11:02:14 -0800 (Sat, 25 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve how multiple codegen-properties are handled in CSSProperties.json
https://bugs.webkit.org/show_bug.cgi?id=168867
Reviewed by Zalan Bujtas.
To make upcoming metadata storage easier, it's better if property entries in CSSProperties.json
are always hashes. One property (line-height) used an array, in order to represent settings for
two different build flags (ENABLE_TEXT_AUTOSIZING and !ENABLE_TEXT_AUTOSIZING).
Fix by making "codegen-properties" optionally be an array. The relevant item is selected in
removeInactiveCodegenProperties() and used to replace the array.
Sort @internalProprerties when generating code, otherwise the contents of isInternalCSSProperty()
are unstable (the order in @allNames is not stable because it's the keys in a hash).
* css/CSSProperties.json:
* css/makeprop.pl:
(matchEnableFlags):
(removeInactiveCodegenProperties):
(isPropertyEnabled):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertiesjson">trunk/Source/WebCore/css/CSSProperties.json</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 (213006 => 213007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-25 16:33:39 UTC (rev 213006)
+++ trunk/Source/WebCore/ChangeLog 2017-02-25 19:02:14 UTC (rev 213007)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-02-24 Simon Fraser <simon.fraser@apple.com>
+
+ Improve how multiple codegen-properties are handled in CSSProperties.json
+ https://bugs.webkit.org/show_bug.cgi?id=168867
+
+ Reviewed by Zalan Bujtas.
+
+ To make upcoming metadata storage easier, it's better if property entries in CSSProperties.json
+ are always hashes. One property (line-height) used an array, in order to represent settings for
+ two different build flags (ENABLE_TEXT_AUTOSIZING and !ENABLE_TEXT_AUTOSIZING).
+
+ Fix by making "codegen-properties" optionally be an array. The relevant item is selected in
+ removeInactiveCodegenProperties() and used to replace the array.
+
+ Sort @internalProprerties when generating code, otherwise the contents of isInternalCSSProperty()
+ are unstable (the order in @allNames is not stable because it's the keys in a hash).
+
+ * css/CSSProperties.json:
+ * css/makeprop.pl:
+ (matchEnableFlags):
+ (removeInactiveCodegenProperties):
+ (isPropertyEnabled):
+
</ins><span class="cx"> 2017-02-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [Resource Timing] Media elements initiated loads should set the initiatorType to their element name (video/audio)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertiesjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperties.json (213006 => 213007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSProperties.json 2017-02-25 16:33:39 UTC (rev 213006)
+++ trunk/Source/WebCore/css/CSSProperties.json 2017-02-25 19:02:14 UTC (rev 213007)
</span><span class="lines">@@ -1397,23 +1397,20 @@
</span><span class="cx"> "svg": true
</span><span class="cx"> }
</span><span class="cx"> },
</span><del>- "line-height": [
- {
- "inherited": true,
- "codegen-properties": {
</del><ins>+ "line-height": {
+ "inherited": true,
+ "codegen-properties": [
+ {
</ins><span class="cx"> "custom": "All",
</span><span class="cx"> "enable-if": "ENABLE_TEXT_AUTOSIZING"
</span><del>- }
- },
- {
- "inherited": true,
- "codegen-properties": {
</del><ins>+ },
+ {
</ins><span class="cx"> "getter": "specifiedLineHeight",
</span><span class="cx"> "conditional-converter": "LineHeight",
</span><span class="cx"> "enable-if": "!ENABLE_TEXT_AUTOSIZING"
</span><span class="cx"> }
</span><del>- }
- ],
</del><ins>+ ]
+ },
</ins><span class="cx"> "list-style": {
</span><span class="cx"> "inherited": true,
</span><span class="cx"> "codegen-properties": {
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (213006 => 213007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl 2017-02-25 16:33:39 UTC (rev 213006)
+++ trunk/Source/WebCore/css/makeprop.pl 2017-02-25 19:02:14 UTC (rev 213007)
</span><span class="lines">@@ -32,7 +32,8 @@
</span><span class="cx"> use JSON::PP;
</span><span class="cx">
</span><span class="cx"> sub addProperty($$);
</span><del>-sub isPropertyEnabled($);
</del><ins>+sub isPropertyEnabled($$);
+sub removeInactiveCodegenProperties($$);
</ins><span class="cx">
</span><span class="cx"> my $inputFile = "CSSProperties.json";
</span><span class="cx">
</span><span class="lines">@@ -87,42 +88,86 @@
</span><span class="cx"> for my $name (@allNames) {
</span><span class="cx"> my $value = $propertiesHashRef->{$name};
</span><span class="cx"> my $valueType = ref($value);
</span><ins>+
</ins><span class="cx"> if ($valueType eq "HASH") {
</span><del>- if (isPropertyEnabled($value)) {
</del><ins>+ removeInactiveCodegenProperties($name, \%$value);
+ if (isPropertyEnabled($name, $value)) {
</ins><span class="cx"> addProperty($name, $value);
</span><span class="cx"> }
</span><del>- } elsif ($valueType eq "ARRAY") {
- for my $v (@$value) {
- if (isPropertyEnabled($v)) {
- addProperty($name, $v);
- last;
- }
- }
</del><span class="cx"> } else {
</span><del>- die "$name does not have a supported value type. Only dictionary and array types are supported.";
</del><ins>+ die "$name does not have a supported value type. Only dictionary types are supported.";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub isPropertyEnabled($)
</del><ins>+sub matchEnableFlags($)
</ins><span class="cx"> {
</span><del>- my ($optionsHashRef) = @_;
</del><ins>+ my ($enable_flag) = @_;
+
+ if (exists($defines{$enable_flag})) {
+ return 1;
+ }
</ins><span class="cx">
</span><del>- if (!exists($optionsHashRef->{"codegen-properties"})) {
</del><ins>+ if (substr($enable_flag, 0, 1) eq "!" && !exists($defines{substr($enable_flag, 1)})) {
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><del>- if ($optionsHashRef->{"codegen-properties"}{"skip-codegen"}) {
- return 0;
</del><ins>+
+ return 0;
+}
+
+sub removeInactiveCodegenProperties($$)
+{
+ my ($name, $propertyValue) = @_;
+
+ if (!exists($propertyValue->{"codegen-properties"})) {
+ return;
</ins><span class="cx"> }
</span><del>- if (!exists($optionsHashRef->{"codegen-properties"}{"enable-if"})) {
- return 1;
</del><ins>+
+ my $codegen_properties = $propertyValue->{"codegen-properties"};
+ my $valueType = ref($codegen_properties);
+
+ if ($valueType ne "ARRAY") {
+ return;
</ins><span class="cx"> }
</span><del>- if (exists($defines{$optionsHashRef->{"codegen-properties"}{"enable-if"}})) {
</del><ins>+
+ # Pick one based on "enable-if"
+ my $matching_codegen_options;
+ foreach my $entry (@{$codegen_properties}) {
+ if (!exists($entry->{"enable-if"})) {
+ print "Found 'codegen-properties' array with an unconditional entry under '$name'. This is probably unintentional.\n";
+ $matching_codegen_options = $entry;
+ last;
+ }
+
+ my $enable_flags = $entry->{"enable-if"};
+ if (matchEnableFlags($enable_flags)) {
+ $matching_codegen_options = $entry;
+ last;
+ }
+
+ $matching_codegen_options = $entry;
+ }
+
+ $propertyValue->{"codegen-properties"} = $matching_codegen_options;
+}
+
+sub isPropertyEnabled($$)
+{
+ my ($name, $propertyValue) = @_;
+
+ if (!exists($propertyValue->{"codegen-properties"})) {
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><del>- if (substr($optionsHashRef->{"codegen-properties"}{"enable-if"}, 0, 1) eq "!" && !exists($defines{substr($optionsHashRef->{"codegen-properties"}{"enable-if"}, 1)})) {
</del><ins>+
+ my $codegen_properties = $propertyValue->{"codegen-properties"};
+ if ($codegen_properties->{"skip-codegen"}) {
+ return 0;
+ }
+
+ if (!exists($codegen_properties->{"enable-if"})) {
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><del>- return 0;
</del><ins>+
+ return matchEnableFlags($codegen_properties->{"enable-if"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub addProperty($$)
</span><span class="lines">@@ -265,7 +310,7 @@
</span><span class="cx"> switch (id) {
</span><span class="cx"> EOF
</span><span class="cx">
</span><del>-foreach my $name (@internalProprerties) {
</del><ins>+foreach my $name (sort @internalProprerties) {
</ins><span class="cx"> print GPERF " case CSSPropertyID::CSSProperty" . $nameToId{$name} . ":\n";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>