<!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>[205867] 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/205867">205867</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-13 12:01:04 -0700 (Tue, 13 Sep 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Organize CSS keyword properties in WebCore::isKeywordPropertyID()
https://bugs.webkit.org/show_bug.cgi?id=161917

Reviewed by Simon Fraser.

Group and sort compile-time feature keywords and move them to the end of the switch block
to avoid the distraction of preprocessor statements scattered throughout the list. Sort
all the other keyword properties to make it straightforward to find a property by name.

* css/parser/CSSParser.cpp:
(WebCore::isKeywordPropertyID):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205866 => 205867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-09-13 18:37:12 UTC (rev 205866)
+++ trunk/Source/WebCore/ChangeLog        2016-09-13 19:01:04 UTC (rev 205867)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-09-13  Daniel Bates  &lt;dabates@apple.com&gt;
+
+        Organize CSS keyword properties in WebCore::isKeywordPropertyID()
+        https://bugs.webkit.org/show_bug.cgi?id=161917
+
+        Reviewed by Simon Fraser.
+
+        Group and sort compile-time feature keywords and move them to the end of the switch block
+        to avoid the distraction of preprocessor statements scattered throughout the list. Sort
+        all the other keyword properties to make it straightforward to find a property by name.
+
+        * css/parser/CSSParser.cpp:
+        (WebCore::isKeywordPropertyID):
+
</ins><span class="cx"> 2016-09-13  Nan Wang  &lt;n_wang@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AX: Crash at AccessibilityRenderObject::computeAccessibilityIsIgnored const  + 552
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (205866 => 205867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp        2016-09-13 18:37:12 UTC (rev 205866)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp        2016-09-13 19:01:04 UTC (rev 205867)
</span><span class="lines">@@ -1051,11 +1051,18 @@
</span><span class="cx">     case CSSPropertyBreakInside:
</span><span class="cx">     case CSSPropertyCaptionSide:
</span><span class="cx">     case CSSPropertyClear:
</span><ins>+    case CSSPropertyColumnFill:
+    case CSSPropertyColumnRuleStyle:
</ins><span class="cx">     case CSSPropertyDirection:
</span><span class="cx">     case CSSPropertyDisplay:
</span><span class="cx">     case CSSPropertyEmptyCells:
</span><ins>+    case CSSPropertyFlexDirection:
+    case CSSPropertyFlexWrap:
</ins><span class="cx">     case CSSPropertyFloat:
</span><span class="cx">     case CSSPropertyFontStyle:
</span><ins>+    case CSSPropertyFontVariantAlternates:
+    case CSSPropertyFontVariantCaps:
+    case CSSPropertyFontVariantPosition:
</ins><span class="cx">     case CSSPropertyImageRendering:
</span><span class="cx">     case CSSPropertyListStylePosition:
</span><span class="cx">     case CSSPropertyListStyleType:
</span><span class="lines">@@ -1081,12 +1088,9 @@
</span><span class="cx">     case CSSPropertyTextTransform:
</span><span class="cx">     case CSSPropertyTextUnderlineMode:
</span><span class="cx">     case CSSPropertyTextUnderlineStyle:
</span><ins>+    case CSSPropertyTransformStyle:
</ins><span class="cx">     case CSSPropertyVisibility:
</span><span class="cx">     case CSSPropertyWebkitAppearance:
</span><del>-#if ENABLE(CSS_COMPOSITING)
-    case CSSPropertyMixBlendMode:
-    case CSSPropertyIsolation:
-#endif
</del><span class="cx">     case CSSPropertyWebkitBackfaceVisibility:
</span><span class="cx">     case CSSPropertyWebkitBorderAfterStyle:
</span><span class="cx">     case CSSPropertyWebkitBorderBeforeStyle:
</span><span class="lines">@@ -1094,9 +1098,6 @@
</span><span class="cx">     case CSSPropertyWebkitBorderFit:
</span><span class="cx">     case CSSPropertyWebkitBorderStartStyle:
</span><span class="cx">     case CSSPropertyWebkitBoxAlign:
</span><del>-#if ENABLE(CSS_BOX_DECORATION_BREAK)
-    case CSSPropertyWebkitBoxDecorationBreak:
-#endif
</del><span class="cx">     case CSSPropertyWebkitBoxDirection:
</span><span class="cx">     case CSSPropertyWebkitBoxLines:
</span><span class="cx">     case CSSPropertyWebkitBoxOrient:
</span><span class="lines">@@ -1104,10 +1105,6 @@
</span><span class="cx">     case CSSPropertyWebkitColumnBreakAfter:
</span><span class="cx">     case CSSPropertyWebkitColumnBreakBefore:
</span><span class="cx">     case CSSPropertyWebkitColumnBreakInside:
</span><del>-    case CSSPropertyColumnFill:
-    case CSSPropertyColumnRuleStyle:
-    case CSSPropertyFlexDirection:
-    case CSSPropertyFlexWrap:
</del><span class="cx">     case CSSPropertyWebkitFontKerning:
</span><span class="cx">     case CSSPropertyWebkitFontSmoothing:
</span><span class="cx">     case CSSPropertyWebkitHyphens:
</span><span class="lines">@@ -1121,27 +1118,11 @@
</span><span class="cx">     case CSSPropertyWebkitMarqueeDirection:
</span><span class="cx">     case CSSPropertyWebkitMarqueeStyle:
</span><span class="cx">     case CSSPropertyWebkitNbspMode:
</span><del>-#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
-    case CSSPropertyWebkitOverflowScrolling:
-#endif
</del><span class="cx">     case CSSPropertyWebkitPrintColorAdjust:
</span><del>-#if ENABLE(CSS_REGIONS)
-    case CSSPropertyWebkitRegionBreakAfter:
-    case CSSPropertyWebkitRegionBreakBefore:
-    case CSSPropertyWebkitRegionBreakInside:
-    case CSSPropertyWebkitRegionFragment:
-#endif
</del><span class="cx">     case CSSPropertyWebkitRtlOrdering:
</span><span class="cx">     case CSSPropertyWebkitRubyPosition:
</span><del>-#if ENABLE(CSS3_TEXT)
-    case CSSPropertyWebkitTextAlignLast:
-#endif // CSS3_TEXT
</del><span class="cx">     case CSSPropertyWebkitTextCombine:
</span><del>-#if ENABLE(CSS3_TEXT)
-    case CSSPropertyWebkitTextJustify:
-#endif // CSS3_TEXT
</del><span class="cx">     case CSSPropertyWebkitTextSecurity:
</span><del>-    case CSSPropertyTransformStyle:
</del><span class="cx">     case CSSPropertyWebkitTransformStyle:
</span><span class="cx">     case CSSPropertyWebkitUserDrag:
</span><span class="cx">     case CSSPropertyWebkitUserModify:
</span><span class="lines">@@ -1150,18 +1131,35 @@
</span><span class="cx">     case CSSPropertyWhiteSpace:
</span><span class="cx">     case CSSPropertyWordBreak:
</span><span class="cx">     case CSSPropertyWordWrap:
</span><ins>+#if ENABLE(CSS_TRAILING_WORD)
+    case CSSPropertyAppleTrailingWord:
+#endif
+#if ENABLE(CSS_COMPOSITING)
+    case CSSPropertyIsolation:
+    case CSSPropertyMixBlendMode:
+#endif
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx">     case CSSPropertyTouchAction:
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(CSS_BOX_DECORATION_BREAK)
+    case CSSPropertyWebkitBoxDecorationBreak:
+#endif
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
+    case CSSPropertyWebkitOverflowScrolling:
+#endif
+#if ENABLE(CSS_REGIONS)
+    case CSSPropertyWebkitRegionBreakAfter:
+    case CSSPropertyWebkitRegionBreakBefore:
+    case CSSPropertyWebkitRegionBreakInside:
+    case CSSPropertyWebkitRegionFragment:
+#endif
+#if ENABLE(CSS3_TEXT)
+    case CSSPropertyWebkitTextAlignLast:
+    case CSSPropertyWebkitTextJustify:
+#endif
</ins><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx">     case CSSPropertyWebkitScrollSnapType:
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_TRAILING_WORD)
-    case CSSPropertyAppleTrailingWord:
-#endif
-    case CSSPropertyFontVariantPosition:
-    case CSSPropertyFontVariantCaps:
-    case CSSPropertyFontVariantAlternates:
</del><span class="cx">         return true;
</span><span class="cx">     case CSSPropertyJustifyContent:
</span><span class="cx">     case CSSPropertyAlignContent:
</span></span></pre>
</div>
</div>

</body>
</html>