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 a20e64f..cd37519 100644 (file)
--- a/WebCore/css/CSSValueKeywords.in
+++ b/WebCore/css/CSSValueKeywords.in
@@ -288,6 +288,8 @@ tigrinya-et-abegede
 ethiopic-abegede-ti-et
 upper-greek
 upper-norwegian
+asterisks
+footnotes
 hebrew
 armenian
 georgian
@@ -566,6 +568,7 @@ button
 button-bevel
 default-button
 inner-spin-button
+-webkit-input-speech-button
 list-button
 listbox
 listitem
@@ -582,7 +585,9 @@ media-sliderthumb
 media-volume-slider-container
 media-volume-slider
 media-volume-sliderthumb
+media-volume-slider-mute-button
 media-controls-background
+media-controls-fullscreen-background
 media-current-time-display
 media-time-remaining-display
 menulist
@@ -604,8 +609,12 @@ searchfield-results-decoration
 searchfield-results-button
 searchfield-cancel-button
 textfield
-textarea
 caps-lock-indicator
+relevancy-level-indicator
+continuous-capacity-level-indicator
+discrete-capacity-level-indicator
+rating-level-indicator
+textarea
 
 #
 # CSS_PROP_BORDER_IMAGE
@@ -682,6 +691,8 @@ linear
 ease-in
 ease-out
 ease-in-out
+step-start
+step-end
 
 #
 # CSS_PROP_ZOOM
@@ -703,6 +714,14 @@ stroke
 #none
 
 #
+# CSS_PROP_SPEECH
+#
+spell-out
+digits
+literal-punctuation
+no-punctuation
+
+#
 # -webkit-font-smoothing
 #
 # auto
@@ -726,3 +745,26 @@ fullscreen
 maximized
 minimized
 windowed
+
+# -webkit-hyphens
+# none
+manual
+# auto
+
+# -webkit-writing-mode
+# SVG compatibility
+lr
+rl
+tb
+lr-tb
+rl-tb
+tb-rl
+# Standard values from CSS3
+horizontal-tb
+vertical-rl
+vertical-lr
+horizontal-bt
+
+# -webkit-text-combine
+cluster
+upright