am 3c54ece0: am 5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp

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

diff --git a/WebCore/css/CSSValueKeywords.in b/WebCore/css/CSSValueKeywords.in
index 06d966c..d302990 100644 (file)
--- a/WebCore/css/CSSValueKeywords.in
+++ b/WebCore/css/CSSValueKeywords.in
@@ -566,6 +566,7 @@ button
 button-bevel
 default-button
 inner-spin-button
+input-speech-button
 list-button
 listbox
 listitem
@@ -582,6 +583,7 @@ media-sliderthumb
 media-volume-slider-container
 media-volume-slider
 media-volume-sliderthumb
+media-volume-slider-mute-button
 media-controls-background
 media-current-time-display
 media-time-remaining-display
@@ -589,6 +591,7 @@ menulist
 menulist-button
 menulist-text
 menulist-textfield
+meter
 outer-spin-button
 progress-bar
 progress-bar-value
@@ -603,8 +606,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
@@ -725,3 +732,8 @@ fullscreen
 maximized
 minimized
 windowed
+
+# -webkit-hyphens
+# none
+manual
+# auto