Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / css / CSSValueKeywords.in

diff --git a/WebCore/css/CSSValueKeywords.in b/WebCore/css/CSSValueKeywords.in
index 990bb36..cd37519 100644 (file)
--- a/WebCore/css/CSSValueKeywords.in
+++ b/WebCore/css/CSSValueKeywords.in
@@ -568,7 +568,7 @@ button
 button-bevel
 default-button
 inner-spin-button
-input-speech-button
+-webkit-input-speech-button
 list-button
 listbox
 listitem
@@ -714,6 +714,14 @@ stroke
 #none
 
 #
+# CSS_PROP_SPEECH
+#
+spell-out
+digits
+literal-punctuation
+no-punctuation
+
+#
 # -webkit-font-smoothing
 #
 # auto
@@ -743,16 +751,20 @@ windowed
 manual
 # auto
 
-# -webkit-block-flow
-tb
-rl
-lr
-bt
-
 # -webkit-writing-mode
+# SVG compatibility
+lr
+rl
+tb
 lr-tb
 rl-tb
 tb-rl
-bt-rl
-tb-lr
-bt-lr
+# Standard values from CSS3
+horizontal-tb
+vertical-rl
+vertical-lr
+horizontal-bt
+
+# -webkit-text-combine
+cluster
+upright