diff options
author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebCore/css/CSSPropertyNames.in | |
parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebCore/css/CSSPropertyNames.in')
-rw-r--r-- | WebCore/css/CSSPropertyNames.in | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/WebCore/css/CSSPropertyNames.in b/WebCore/css/CSSPropertyNames.in index a3063db..addecca 100644 --- a/WebCore/css/CSSPropertyNames.in +++ b/WebCore/css/CSSPropertyNames.in @@ -20,8 +20,10 @@ font-style font-variant font-weight text-rendering +-webkit-block-flow -webkit-font-smoothing -webkit-text-size-adjust +-webkit-writing-mode zoom # line height needs to be right after the above high-priority properties @@ -173,6 +175,14 @@ z-index # a single value: -webkit-background-size: l; is equivalent to background-size: l l; # whereas background-size: l; is equivalent to background-size: l auto; -webkit-background-size +-webkit-border-after +-webkit-border-after-color +-webkit-border-after-style +-webkit-border-after-width +-webkit-border-before +-webkit-border-before-color +-webkit-border-before-style +-webkit-border-before-width -webkit-border-end -webkit-border-end-color -webkit-border-end-style @@ -220,8 +230,12 @@ z-index -webkit-hyphens -webkit-line-break -webkit-line-clamp +-webkit-logical-width +-webkit-logical-height -webkit-margin-bottom-collapse -webkit-margin-collapse +-webkit-margin-after +-webkit-margin-before -webkit-margin-end -webkit-margin-start -webkit-margin-top-collapse @@ -246,7 +260,13 @@ z-index -webkit-mask-repeat-y -webkit-mask-size -webkit-match-nearest-mail-blockquote-color +-webkit-max-logical-width +-webkit-max-logical-height +-webkit-min-logical-width +-webkit-min-logical-height -webkit-nbsp-mode +-webkit-padding-after +-webkit-padding-before -webkit-padding-end -webkit-padding-start -webkit-perspective |