<!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>[288114] 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/288114">288114</a></dd>
<dt>Author</dt> <dd>obrufau@igalia.com</dd>
<dt>Date</dt> <dd>2022-01-18 04:28:44 -0800 (Tue, 18 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>[css-logical] Simplify logical property groups
https://bugs.webkit.org/show_bug.cgi?id=228130

Reviewed by Antti Koivisto.

Refactors logical property group code in makeprop.pl to make it a bit
more simple and easy the extend if new kinds of logical properties are
introduced in the future.

No new tests since no change in behavior.

* css/makeprop.pl:
(addProperty):</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 (288113 => 288114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2022-01-18 11:02:49 UTC (rev 288113)
+++ trunk/Source/WebCore/ChangeLog      2022-01-18 12:28:44 UTC (rev 288114)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2022-01-18  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-logical] Simplify logical property groups
+        https://bugs.webkit.org/show_bug.cgi?id=228130
+
+        Reviewed by Antti Koivisto.
+
+        Refactors logical property group code in makeprop.pl to make it a bit
+        more simple and easy the extend if new kinds of logical properties are
+        introduced in the future.
+
+        No new tests since no change in behavior.
+
+        * css/makeprop.pl:
+        (addProperty):
+
</ins><span class="cx"> 2022-01-17  Sergio Villar Senin  <svillar@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [css-flexbox] Add support for intrinsic sizes in flex-basis
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (288113 => 288114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl     2022-01-18 11:02:49 UTC (rev 288113)
+++ trunk/Source/WebCore/css/makeprop.pl        2022-01-18 12:28:44 UTC (rev 288114)
</span><span class="lines">@@ -71,30 +71,22 @@
</span><span class="cx"> my %nameIsInherited;
</span><span class="cx"> my %namePriorityShouldSink;
</span><span class="cx"> my %logicalPropertyGroups;
</span><del>-my %resolverKinds = (
</del><ins>+my %logicalPropertyGroupResolvers = (
</ins><span class="cx">     "logical" => {
</span><del>-        "block" => "axis",
-        "inline" => "axis",
-        "block-start" => "side",
-        "block-end" => "side",
-        "inline-start" => "side",
-        "inline-end" => "side",
-        "start-start" => "corner",
-        "start-end" => "corner",
-        "end-start" => "corner",
-        "end-end" => "corner",
</del><ins>+        # Order matches LogicalBoxAxis enum in Source/WebCore/platform/text/WritingMode.h.
+        "axis" => ["inline", "block"],
+        # Order matches LogicalBoxSide enum in Source/WebCore/platform/text/WritingMode.h.
+        "side" => ["block-start", "inline-end", "block-end", "inline-start"],
+        # Order matches LogicalBoxCorner enum in Source/WebCore/platform/text/WritingMode.h.
+        "corner" => ["start-start", "start-end", "end-start", "end-end"],
</ins><span class="cx">     },
</span><span class="cx">     "physical" => {
</span><del>-        "horizontal" => "axis",
-        "vertical" => "axis",
-        "top" => "side",
-        "right" => "side",
-        "bottom" => "side",
-        "left" => "side",
-        "top-left" => "corner",
-        "top-right" => "corner",
-        "bottom-right" => "corner",
-        "bottom-left" => "corner",
</del><ins>+        # Order matches BoxAxis enum in Source/WebCore/platform/text/WritingMode.h.
+        "axis" => ["horizontal", "vertical"],
+        # Order matches BoxSide enum in Source/WebCore/platform/text/WritingMode.h.
+        "side" => ["top", "right", "bottom", "left"],
+        # Order matches BoxCorner enum in Source/WebCore/platform/text/WritingMode.h.
+        "corner" => ["top-left", "top-right", "bottom-right", "bottom-left"],
</ins><span class="cx">     },
</span><span class="cx"> );
</span><span class="cx"> my %propertiesWithStyleBuilderOptions;
</span><span class="lines">@@ -136,16 +128,15 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> while (my ($groupName, $logicalPropertyGroup) = each %logicalPropertyGroups) {
</span><del>-    for my $logic (keys %resolverKinds) {
</del><ins>+    my $kind = $logicalPropertyGroup->{"kind"};
+    while (my ($logic, $resolversForLogic) = each %logicalPropertyGroupResolvers) {
</ins><span class="cx">         my $properties = $logicalPropertyGroup->{$logic};
</span><span class="cx">         if (!$properties) {
</span><span class="cx">             die "Logical property group \"$groupName\" has no \"$logic\" property.";
</span><span class="cx">         }
</span><del>-        while (my ($resolver, $kind) = each %{ $resolverKinds{$logic} }) {
-            if ($kind eq $logicalPropertyGroup->{"kind"}) {
-                if (!$properties->{$resolver}) {
-                    die "Logical property group \"$groupName\" requires a \"$resolver\" property.";
-                }
</del><ins>+        for my $resolver (@{ $resolversForLogic->{$kind} }) {
+            if (!$properties->{$resolver}) {
+                die "Logical property group \"$groupName\" requires a \"$resolver\" property.";
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -319,11 +310,17 @@
</span><span class="cx">                     my $resolver = $codegenProperties->{$codegenOptionName}{"resolver"};
</span><span class="cx">                     my $kind;
</span><span class="cx">                     my $logic;
</span><del>-                    if ($kind = $resolverKinds{"logical"}{$resolver}) {
-                        $logic = "logical";
-                    } elsif ($kind = $resolverKinds{"physical"}{$resolver}) {
-                        $logic = "physical";
-                    } else {
</del><ins>+                    while (my ($currentLogic, $resolversForLogic) = each %logicalPropertyGroupResolvers) {
+                        while (my ($currentKind, $resolverList) = each %{ $resolversForLogic }) {
+                            for my $currentResolver (@{ $resolverList }) {
+                                if ($currentResolver eq $resolver) {
+                                    $kind = $currentKind;
+                                    $logic = $currentLogic;
+                                }
+                            }
+                        }
+                    }
+                    if (!$kind) {
</ins><span class="cx">                         die "Unrecognized resolver \"$resolver\" for codegen property \"$codegenOptionName\" for $name property.";
</span><span class="cx">                     }
</span><span class="cx">                     my $otherKind = $logicalPropertyGroups{$groupName}{"kind"};
</span><span class="lines">@@ -726,17 +723,8 @@
</span><span class="cx">         my $kind = $logicalPropertyGroup->{"kind"};
</span><span class="cx">         my $kindId = nameToId($kind);
</span><span class="cx">         my $resolverEnum = "LogicalBox" . $kindId . "::" . nameToId($resolver);
</span><del>-        my @physicals;
-        if ($kind eq "side") {
-            @physicals = ("top", "right", "bottom", "left");
-        } elsif ($kind eq "corner") {
-            @physicals = ("top-left", "top-right", "bottom-right", "bottom-left");
-        } elsif ($kind eq "axis") {
-            @physicals = ("horizontal", "vertical");
-        } else {
-            die "Property \"$name\" belongs to a logical property group of unrecognized kind \"$kind\".";
-        }
-        my @properties = map { "CSSProperty" . $nameToId{$logicalPropertyGroup->{"physical"}{$_}} } @physicals;
</del><ins>+        my $physicals = $logicalPropertyGroupResolvers{"physical"}->{$kind};
+        my @properties = map { "CSSProperty" . $nameToId{$logicalPropertyGroup->{"physical"}{$_}} } @{ $physicals };
</ins><span class="cx">         print GPERF "    case CSSPropertyID::CSSProperty" . $nameToId{$name} . ": {\n";
</span><span class="cx">         print GPERF "        static constexpr CSSPropertyID properties[" . scalar(@properties) . "] = { " . join(", ", @properties) . " };\n";
</span><span class="cx">         print GPERF "        return properties[static_cast<size_t>(mapLogical" . $kindId . "ToPhysical" . $kindId . "(textflow, " . $resolverEnum . "))];\n";
</span></span></pre>
</div>
</div>

</body>
</html>