diff options
| author | Victoria Lease <violets@google.com> | 2012-03-01 16:15:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-01 16:15:18 -0800 |
| commit | cc3177cd8d6fecf1fbe68eff9996f41dd7b4a80f (patch) | |
| tree | b42a076a9e1a0cd414621c6e63611edbb7c8f6c1 /Source | |
| parent | ca8bc0d80829d8e0000e669b34a36988c98be027 (diff) | |
| parent | 0d7cbe7d379f0d0307b103e90b8843061b4426d9 (diff) | |
| download | external_webkit-cc3177cd8d6fecf1fbe68eff9996f41dd7b4a80f.zip external_webkit-cc3177cd8d6fecf1fbe68eff9996f41dd7b4a80f.tar.gz external_webkit-cc3177cd8d6fecf1fbe68eff9996f41dd7b4a80f.tar.bz2 | |
Merge "take proper credit for overflow scrolling support"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/css/CSSPropertyNames.in | 1 | ||||
| -rw-r--r-- | Source/WebCore/css/CSSValueKeywords.in | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/css/CSSPropertyNames.in b/Source/WebCore/css/CSSPropertyNames.in index a62d2f3..395b7cf 100644 --- a/Source/WebCore/css/CSSPropertyNames.in +++ b/Source/WebCore/css/CSSPropertyNames.in @@ -306,3 +306,4 @@ z-index -webkit-user-drag -webkit-user-modify -webkit-user-select +-webkit-overflow-scrolling diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in index 6dac06f..5b6e5b0 100644 --- a/Source/WebCore/css/CSSValueKeywords.in +++ b/Source/WebCore/css/CSSValueKeywords.in @@ -756,6 +756,10 @@ windowed manual # auto +# -webkit-overflow-scrolling +# auto +touch + # -webkit-writing-mode # SVG compatibility lr |