summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/css/CSSPropertyNames.in
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-25 19:08:45 +0100
committerSteve Block <steveblock@google.com>2011-06-08 13:51:31 +0100
commit2bde8e466a4451c7319e3a072d118917957d6554 (patch)
tree28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/css/CSSPropertyNames.in
parent6939c99b71d9372d14a0c74a772108052e8c48c8 (diff)
downloadexternal_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/CSSPropertyNames.in')
-rw-r--r--Source/WebCore/css/CSSPropertyNames.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/css/CSSPropertyNames.in b/Source/WebCore/css/CSSPropertyNames.in
index d1fdcd3..a62d2f3 100644
--- a/Source/WebCore/css/CSSPropertyNames.in
+++ b/Source/WebCore/css/CSSPropertyNames.in
@@ -21,6 +21,7 @@ font-variant
font-weight
text-rendering
-webkit-font-smoothing
+-webkit-text-orientation
-webkit-text-size-adjust
-webkit-writing-mode
zoom
@@ -230,6 +231,7 @@ z-index
-webkit-hyphenate-limit-after
-webkit-hyphenate-limit-before
-webkit-hyphens
+-webkit-line-box-contain
-webkit-line-break
-webkit-line-clamp
-webkit-locale