| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. |
| 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
| 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. |
| 9 * Copyright (C) 2012 Intel Corporation. All rights reserved. | 9 * Copyright (C) 2012 Intel Corporation. All rights reserved. |
| 10 * | 10 * |
| (...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1142 } | 1142 } |
| 1143 return false; | 1143 return false; |
| 1144 } | 1144 } |
| 1145 case CSSPropertyWillChange: | 1145 case CSSPropertyWillChange: |
| 1146 parsedValue = parseWillChange(); | 1146 parsedValue = parseWillChange(); |
| 1147 break; | 1147 break; |
| 1148 // End of CSS3 properties | 1148 // End of CSS3 properties |
| 1149 | 1149 |
| 1150 // Apple specific properties. These will never be standardized and are pure
ly to | 1150 // Apple specific properties. These will never be standardized and are pure
ly to |
| 1151 // support custom WebKit-based Apple applications. | 1151 // support custom WebKit-based Apple applications. |
| 1152 case CSSPropertyWebkitLineClamp: | |
| 1153 // When specifying number of lines, don't allow 0 as a valid value | |
| 1154 // When specifying either type of unit, require non-negative integers | |
| 1155 validPrimitive = (!id && (value->unit == CSSPrimitiveValue::CSS_PERCENTA
GE || value->fValue) && validUnit(value, FInteger | FPercent | FNonNeg)); | |
| 1156 break; | |
| 1157 | |
| 1158 case CSSPropertyWebkitFontSizeDelta: // <length> | 1152 case CSSPropertyWebkitFontSizeDelta: // <length> |
| 1159 validPrimitive = validUnit(value, FLength); | 1153 validPrimitive = validUnit(value, FLength); |
| 1160 break; | 1154 break; |
| 1161 | 1155 |
| 1162 case CSSPropertyWebkitHighlight: | 1156 case CSSPropertyWebkitHighlight: |
| 1163 if (id == CSSValueNone || value->unit == CSSPrimitiveValue::CSS_STRING) | 1157 if (id == CSSValueNone || value->unit == CSSPrimitiveValue::CSS_STRING) |
| 1164 validPrimitive = true; | 1158 validPrimitive = true; |
| 1165 break; | 1159 break; |
| 1166 | 1160 |
| 1167 case CSSPropertyWebkitHyphenateCharacter: | 1161 case CSSPropertyWebkitHyphenateCharacter: |
| (...skipping 5053 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6221 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); | 6215 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); |
| 6222 } | 6216 } |
| 6223 | 6217 |
| 6224 bool CSSPropertyParser::isSystemColor(int id) | 6218 bool CSSPropertyParser::isSystemColor(int id) |
| 6225 { | 6219 { |
| 6226 // FIXME(sky): remove | 6220 // FIXME(sky): remove |
| 6227 return false; | 6221 return false; |
| 6228 } | 6222 } |
| 6229 | 6223 |
| 6230 } // namespace blink | 6224 } // namespace blink |
| OLD | NEW |