diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/css/CSSValueKeywords.in | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/css/CSSValueKeywords.in')
| -rw-r--r-- | Source/WebCore/css/CSSValueKeywords.in | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in index 4fce4f3..6dac06f 100644 --- a/Source/WebCore/css/CSSValueKeywords.in +++ b/Source/WebCore/css/CSSValueKeywords.in @@ -4,7 +4,7 @@ # -------- # # The Values are sorted according to the properties they belong to, -# and have to be in the same order as the enums in RenderStyle.h. +# and have to be in the same order as the enums in RenderStyleConstants.h. # # If not, the optimizations in the cssparser and style selector will fail, # and produce incorrect results. @@ -212,6 +212,7 @@ justify -webkit-left -webkit-right -webkit-center +-webkit-match-parent # # CSS_PROP_LIST_STYLE_POSITION: # @@ -406,6 +407,7 @@ hand hide higher invert +-webkit-isolate landscape ledger legal @@ -790,3 +792,15 @@ farthest-side farthest-corner # contain # cover + +# -webkit-text-orientation +upright +vertical-right + +# -webkit-line-box-contain +font +glyphs +inline-box +replaced + + |