Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: Source/core/css/CSSProperties.in

Issue 415613002: Merge CSSPropertyNames.in and SVGCSSPropertyNames.in with CSSProperties.in (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix crash without experimental flag Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/core_generated.gyp ('k') | Source/core/css/CSSProperty.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSProperties.in
diff --git a/Source/core/css/CSSProperties.in b/Source/core/css/CSSProperties.in
index 139102c096b22fbb63c1ec913f6467a059c2d179..08595f55ff3a235abf35894169e902f836accb76 100644
--- a/Source/core/css/CSSProperties.in
+++ b/Source/core/css/CSSProperties.in
@@ -3,6 +3,12 @@
// are described below with example usage
+// - alias_for=other-property
+// Properties specifying alias_for do not get their own enum and instead map
+// directly onto the CSSPropertyID they alias. Currently this means that the
+// UseCounter will not pick up on these (crbug.com/304855)
+
+
// - longhands=property;other-property
// The property is a shorthand for several other properties.
@@ -60,6 +66,7 @@
// High Priority and all other font properties.
// Other properties can depend upon high priority properties (e.g. font-size / ems)
color custom_all
+direction custom_value
// FIXME: This is a mess due to crbug.com/353932. Shorthands shouldn't have
// any StyleBuilder handling!
font custom_all, longhands=font-family;font-size;font-style;font-variant;font-weight;font-stretch;line-height
@@ -75,8 +82,10 @@ font-weight font, type_name=FontWeight, name_for_methods=Weight, converter=conve
-webkit-font-smoothing font, type_name=FontSmoothingMode
-webkit-locale custom_value
-webkit-text-orientation custom_value
+-webkit-writing-mode custom_value
text-rendering font, type_name=TextRenderingMode
zoom custom_all
+line-height getter=specifiedLineHeight, custom_value
align-content
align-items custom_all
@@ -134,7 +143,6 @@ content custom_all
counter-increment custom_all
counter-reset custom_all
cursor custom_all
-direction custom_value
display
dominant-baseline svg
empty-cells type_name=EEmptyCell
@@ -171,7 +179,6 @@ justify-self custom_all
left initial=initialOffset, converter=convertLengthOrAuto
letter-spacing initial=initialLetterWordSpacing, converter=convertSpacing
lighting-color svg, converter=convertSVGColor
-line-height getter=specifiedLineHeight, custom_value
list-style-image custom_value
list-style-position
list-style-type
@@ -356,7 +363,6 @@ word-wrap name_for_methods=OverflowWrap
-webkit-user-drag
-webkit-user-modify
-webkit-user-select
--webkit-writing-mode custom_value
white-space
widows type_name=short, custom_all
width initial=initialSize, converter=convertLengthSizing
@@ -481,3 +487,36 @@ transition longhands=transition-property;transition-duration;transition-timing-f
-webkit-text-stroke longhands=-webkit-text-stroke-width;-webkit-text-stroke-color
-webkit-transform-origin longhands=-webkit-transform-origin-x;-webkit-transform-origin-y;-webkit-transform-origin-z
-webkit-transition longhands=-webkit-transition-property;-webkit-transition-duration;-webkit-transition-timing-function;-webkit-transition-delay
+
+// Aliases; these map to the same CSSPropertyID
+
+-epub-caption-side alias_for=caption-side
+-epub-text-combine alias_for=-webkit-text-combine
+-epub-text-emphasis alias_for=-webkit-text-emphasis
+-epub-text-emphasis-color alias_for=-webkit-text-emphasis-color
+-epub-text-emphasis-style alias_for=-webkit-text-emphasis-style
+-epub-text-orientation alias_for=-webkit-text-orientation
+-epub-text-transform alias_for=text-transform
+-epub-word-break alias_for=word-break
+-epub-writing-mode alias_for=-webkit-writing-mode
+-webkit-align-content alias_for=align-content
+-webkit-align-items alias_for=align-items
+-webkit-align-self alias_for=align-self
+-webkit-border-bottom-left-radius alias_for=border-bottom-left-radius
+-webkit-border-bottom-right-radius alias_for=border-bottom-right-radius
+-webkit-border-top-left-radius alias_for=border-top-left-radius
+-webkit-border-top-right-radius alias_for=border-top-right-radius
+-webkit-box-sizing alias_for=box-sizing
+-webkit-flex alias_for=flex
+-webkit-flex-basis alias_for=flex-basis
+-webkit-flex-direction alias_for=flex-direction
+-webkit-flex-flow alias_for=flex-flow
+-webkit-flex-grow alias_for=flex-grow
+-webkit-flex-shrink alias_for=flex-shrink
+-webkit-flex-wrap alias_for=flex-wrap
+-webkit-justify-content alias_for=justify-content
+-webkit-opacity alias_for=opacity
+-webkit-order alias_for=order
+-webkit-shape-image-threshold alias_for=shape-image-threshold
+-webkit-shape-margin alias_for=shape-margin
+-webkit-shape-outside alias_for=shape-outside
« no previous file with comments | « Source/core/core_generated.gyp ('k') | Source/core/css/CSSProperty.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698