<!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>[178626] 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/178626">178626</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-17 08:54:33 -0800 (Sat, 17 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Generate shorthandForProperty() implementation from CSSPropertyNames.in
https://bugs.webkit.org/show_bug.cgi?id=140556
Reviewed by Darin Adler.
Generate shorthandForProperty() implementation from CSSPropertyNames.in.
This is just a big switch() statement calling the right
StylePropertyShorthand factory function for a given CSSPropertyID.
* css/StylePropertyShorthand.cpp:
(WebCore::shorthandForProperty): Deleted.
* css/StylePropertyShorthand.h:
* css/makeprop.pl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertyShorthandcpp">trunk/Source/WebCore/css/StylePropertyShorthand.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertyShorthandh">trunk/Source/WebCore/css/StylePropertyShorthand.h</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 (178625 => 178626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-17 16:49:53 UTC (rev 178625)
+++ trunk/Source/WebCore/ChangeLog 2015-01-17 16:54:33 UTC (rev 178626)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-17 Chris Dumez <cdumez@apple.com>
+
+ Generate shorthandForProperty() implementation from CSSPropertyNames.in
+ https://bugs.webkit.org/show_bug.cgi?id=140556
+
+ Reviewed by Darin Adler.
+
+ Generate shorthandForProperty() implementation from CSSPropertyNames.in.
+ This is just a big switch() statement calling the right
+ StylePropertyShorthand factory function for a given CSSPropertyID.
+
+ * css/StylePropertyShorthand.cpp:
+ (WebCore::shorthandForProperty): Deleted.
+ * css/StylePropertyShorthand.h:
+ * css/makeprop.pl:
+
</ins><span class="cx"> 2015-01-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Correct infinite loop in Wheel Handler code in EventHandlerMac
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertyShorthandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StylePropertyShorthand.cpp (178625 => 178626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2015-01-17 16:49:53 UTC (rev 178625)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2015-01-17 16:54:33 UTC (rev 178626)
</span><span class="lines">@@ -100,116 +100,6 @@
</span><span class="cx"> return StylePropertyShorthand(CSSPropertyHeight, heightProperties);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: This function should be generated from CSSPropertyNames.in.
-// Returns an empty list if the property is not a shorthand.
-StylePropertyShorthand shorthandForProperty(CSSPropertyID propertyID)
-{
- switch (propertyID) {
- case CSSPropertyAnimation:
- return animationShorthand();
- case CSSPropertyBackground:
- return backgroundShorthand();
- case CSSPropertyBackgroundPosition:
- return backgroundPositionShorthand();
- case CSSPropertyBackgroundRepeat:
- return backgroundRepeatShorthand();
- case CSSPropertyBorder:
- return borderShorthand();
- case CSSPropertyBorderBottom:
- return borderBottomShorthand();
- case CSSPropertyBorderColor:
- return borderColorShorthand();
- case CSSPropertyBorderImage:
- return borderImageShorthand();
- case CSSPropertyBorderLeft:
- return borderLeftShorthand();
- case CSSPropertyBorderRadius:
- return borderRadiusShorthand();
- case CSSPropertyBorderRight:
- return borderRightShorthand();
- case CSSPropertyBorderSpacing:
- return borderSpacingShorthand();
- case CSSPropertyBorderStyle:
- return borderStyleShorthand();
- case CSSPropertyBorderTop:
- return borderTopShorthand();
- case CSSPropertyBorderWidth:
- return borderWidthShorthand();
- case CSSPropertyListStyle:
- return listStyleShorthand();
- case CSSPropertyFont:
- return fontShorthand();
- case CSSPropertyMargin:
- return marginShorthand();
- case CSSPropertyOutline:
- return outlineShorthand();
- case CSSPropertyOverflow:
- return overflowShorthand();
- case CSSPropertyPadding:
- return paddingShorthand();
- case CSSPropertyTransition:
- return transitionShorthand();
- case CSSPropertyWebkitAnimation:
- return webkitAnimationShorthand();
- case CSSPropertyWebkitBorderAfter:
- return webkitBorderAfterShorthand();
- case CSSPropertyWebkitBorderBefore:
- return webkitBorderBeforeShorthand();
- case CSSPropertyWebkitBorderEnd:
- return webkitBorderEndShorthand();
- case CSSPropertyWebkitBorderStart:
- return webkitBorderStartShorthand();
- case CSSPropertyWebkitBorderRadius:
- return borderRadiusShorthand();
- case CSSPropertyColumns:
- return columnsShorthand();
- case CSSPropertyColumnRule:
- return columnRuleShorthand();
- case CSSPropertyFlex:
- return flexShorthand();
- case CSSPropertyFlexFlow:
- return flexFlowShorthand();
-#if ENABLE(CSS_GRID_LAYOUT)
- case CSSPropertyWebkitGridArea:
- return webkitGridAreaShorthand();
- case CSSPropertyWebkitGridTemplate:
- return webkitGridTemplateShorthand();
- case CSSPropertyWebkitGrid:
- return webkitGridShorthand();
- case CSSPropertyWebkitGridColumn:
- return webkitGridColumnShorthand();
- case CSSPropertyWebkitGridRow:
- return webkitGridRowShorthand();
-#endif
- case CSSPropertyWebkitMarginCollapse:
- return webkitMarginCollapseShorthand();
- case CSSPropertyWebkitMarquee:
- return webkitMarqueeShorthand();
- case CSSPropertyWebkitMask:
- return webkitMaskShorthand();
- case CSSPropertyWebkitMaskPosition:
- return webkitMaskPositionShorthand();
- case CSSPropertyWebkitMaskRepeat:
- return webkitMaskRepeatShorthand();
- case CSSPropertyWebkitPerspectiveOrigin:
- return webkitPerspectiveOriginShorthand();
- case CSSPropertyWebkitTextEmphasis:
- return webkitTextEmphasisShorthand();
- case CSSPropertyWebkitTextStroke:
- return webkitTextStrokeShorthand();
- case CSSPropertyWebkitTransition:
- return webkitTransitionShorthand();
- case CSSPropertyWebkitTransformOrigin:
- return webkitTransformOriginShorthand();
- case CSSPropertyWebkitTextDecoration:
- return webkitTextDecorationShorthand();
- case CSSPropertyMarker:
- return markerShorthand();
- default:
- return StylePropertyShorthand();
- }
-}
-
</del><span class="cx"> bool isExpandedShorthand(CSSPropertyID id)
</span><span class="cx"> {
</span><span class="cx"> // The system fonts bypass the normal style resolution by using RenderTheme,
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertyShorthandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StylePropertyShorthand.h (178625 => 178626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertyShorthand.h 2015-01-17 16:49:53 UTC (rev 178625)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.h 2015-01-17 16:54:33 UTC (rev 178626)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> StylePropertyShorthand widthShorthand();
</span><span class="cx">
</span><span class="cx"> // Returns empty value if the property is not a shorthand.
</span><ins>+// The implementation is generated in StylePropertyShorthandFunctions.cpp.
</ins><span class="cx"> StylePropertyShorthand shorthandForProperty(CSSPropertyID);
</span><span class="cx">
</span><span class="cx"> // Return the list of shorthands for a given longhand.
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (178625 => 178626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl 2015-01-17 16:49:53 UTC (rev 178625)
+++ trunk/Source/WebCore/css/makeprop.pl 2015-01-17 16:54:33 UTC (rev 178626)
</span><span class="lines">@@ -933,6 +933,7 @@
</span><span class="cx"> #include "StylePropertyShorthandFunctions.h"
</span><span class="cx">
</span><span class="cx"> #include "StylePropertyShorthand.h"
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -958,6 +959,33 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> print SHORTHANDS_CPP << "EOF";
</span><ins>+StylePropertyShorthand shorthandForProperty(CSSPropertyID propertyID)
+{
+ static NeverDestroyed<StylePropertyShorthand> emptyShorthand;
+
+ switch (propertyID) {
+EOF
+
+foreach my $name (@names) {
+ # Skip non-Shorthand properties.
+ next if (!exists $propertiesWithStyleBuilderOptions{$name}{"Longhands"});
+
+ print SHORTHANDS_CPP " case CSSProperty" . $nameToId{$name} . ":\n";
+ print SHORTHANDS_CPP " return " . lcfirst($nameToId{$name}) . "Shorthand();\n";
+}
+
+# FIXME: CSSPropertyFont is currently an exception. It is hard-coded here
+# because it is not marked as a shorthand in CSSPropertyNames.in.
+print SHORTHANDS_CPP << "EOF";
+ case CSSPropertyFont:
+ return fontShorthand();
+ default:
+ return emptyShorthand;
+ }
+}
+EOF
+
+print SHORTHANDS_CPP << "EOF";
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> EOF
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>