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 20 matching lines...) Expand all Loading... |
31 #include "RuntimeEnabledFeatures.h" | 31 #include "RuntimeEnabledFeatures.h" |
32 #include "StylePropertyShorthand.h" | 32 #include "StylePropertyShorthand.h" |
33 #include "core/css/CSSArrayFunctionValue.h" | 33 #include "core/css/CSSArrayFunctionValue.h" |
34 #include "core/css/CSSAspectRatioValue.h" | 34 #include "core/css/CSSAspectRatioValue.h" |
35 #include "core/css/CSSBasicShapes.h" | 35 #include "core/css/CSSBasicShapes.h" |
36 #include "core/css/CSSBorderImage.h" | 36 #include "core/css/CSSBorderImage.h" |
37 #include "core/css/CSSCanvasValue.h" | 37 #include "core/css/CSSCanvasValue.h" |
38 #include "core/css/CSSCrossfadeValue.h" | 38 #include "core/css/CSSCrossfadeValue.h" |
39 #include "core/css/CSSCursorImageValue.h" | 39 #include "core/css/CSSCursorImageValue.h" |
40 #include "core/css/CSSFontFaceSrcValue.h" | 40 #include "core/css/CSSFontFaceSrcValue.h" |
| 41 #include "core/css/CSSFontFeatureValue.h" |
41 #include "core/css/CSSFunctionValue.h" | 42 #include "core/css/CSSFunctionValue.h" |
42 #include "core/css/CSSGradientValue.h" | 43 #include "core/css/CSSGradientValue.h" |
43 #include "core/css/CSSGridTemplateValue.h" | 44 #include "core/css/CSSGridTemplateValue.h" |
44 #include "core/css/CSSImageSetValue.h" | 45 #include "core/css/CSSImageSetValue.h" |
45 #include "core/css/CSSImageValue.h" | 46 #include "core/css/CSSImageValue.h" |
46 #include "core/css/CSSInheritedValue.h" | 47 #include "core/css/CSSInheritedValue.h" |
47 #include "core/css/CSSInitialValue.h" | 48 #include "core/css/CSSInitialValue.h" |
48 #include "core/css/CSSKeyframeRule.h" | 49 #include "core/css/CSSKeyframeRule.h" |
49 #include "core/css/CSSKeyframesRule.h" | 50 #include "core/css/CSSKeyframesRule.h" |
50 #include "core/css/CSSLineBoxContainValue.h" | 51 #include "core/css/CSSLineBoxContainValue.h" |
51 #include "core/css/CSSMixFunctionValue.h" | 52 #include "core/css/CSSMixFunctionValue.h" |
52 #include "core/css/CSSPrimitiveValue.h" | 53 #include "core/css/CSSPrimitiveValue.h" |
53 #include "core/css/CSSPropertySourceData.h" | 54 #include "core/css/CSSPropertySourceData.h" |
54 #include "core/css/CSSReflectValue.h" | 55 #include "core/css/CSSReflectValue.h" |
55 #include "core/css/CSSSVGDocumentValue.h" | 56 #include "core/css/CSSSVGDocumentValue.h" |
56 #include "core/css/CSSSelector.h" | 57 #include "core/css/CSSSelector.h" |
57 #include "core/css/CSSShaderValue.h" | 58 #include "core/css/CSSShaderValue.h" |
58 #include "core/css/CSSStyleSheet.h" | 59 #include "core/css/CSSStyleSheet.h" |
59 #include "core/css/CSSTimingFunctionValue.h" | 60 #include "core/css/CSSTimingFunctionValue.h" |
60 #include "core/css/CSSTransformValue.h" | 61 #include "core/css/CSSTransformValue.h" |
61 #include "core/css/CSSUnicodeRangeValue.h" | 62 #include "core/css/CSSUnicodeRangeValue.h" |
62 #include "core/css/CSSValueList.h" | 63 #include "core/css/CSSValueList.h" |
63 #include "core/css/CSSValuePool.h" | 64 #include "core/css/CSSValuePool.h" |
64 #include "core/css/CSSVariableValue.h" | 65 #include "core/css/CSSVariableValue.h" |
65 #include "core/css/Counter.h" | 66 #include "core/css/Counter.h" |
66 #include "core/css/FontFeatureValue.h" | |
67 #include "core/css/MediaList.h" | 67 #include "core/css/MediaList.h" |
68 #include "core/css/MediaQueryExp.h" | 68 #include "core/css/MediaQueryExp.h" |
69 #include "core/css/Pair.h" | 69 #include "core/css/Pair.h" |
70 #include "core/css/Rect.h" | 70 #include "core/css/Rect.h" |
71 #include "core/css/ShadowValue.h" | 71 #include "core/css/ShadowValue.h" |
72 #include "core/css/StylePropertySet.h" | 72 #include "core/css/StylePropertySet.h" |
73 #include "core/css/StyleRule.h" | 73 #include "core/css/StyleRule.h" |
74 #include "core/css/StyleRuleImport.h" | 74 #include "core/css/StyleRuleImport.h" |
75 #include "core/css/StyleSheetContents.h" | 75 #include "core/css/StyleSheetContents.h" |
76 #include "core/dom/Document.h" | 76 #include "core/dom/Document.h" |
(...skipping 9241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
9318 if (value->unit == CSSPrimitiveValue::CSS_NUMBER && value->isInt && valu
e->fValue >= 0) { | 9318 if (value->unit == CSSPrimitiveValue::CSS_NUMBER && value->isInt && valu
e->fValue >= 0) { |
9319 tagValue = clampToInteger(value->fValue); | 9319 tagValue = clampToInteger(value->fValue); |
9320 if (tagValue < 0) | 9320 if (tagValue < 0) |
9321 return false; | 9321 return false; |
9322 m_valueList->next(); | 9322 m_valueList->next(); |
9323 } else if (value->id == CSSValueOn || value->id == CSSValueOff) { | 9323 } else if (value->id == CSSValueOn || value->id == CSSValueOff) { |
9324 tagValue = value->id == CSSValueOn; | 9324 tagValue = value->id == CSSValueOn; |
9325 m_valueList->next(); | 9325 m_valueList->next(); |
9326 } | 9326 } |
9327 } | 9327 } |
9328 settings->append(FontFeatureValue::create(tag, tagValue)); | 9328 settings->append(CSSFontFeatureValue::create(tag, tagValue)); |
9329 return true; | 9329 return true; |
9330 } | 9330 } |
9331 | 9331 |
9332 bool CSSParser::parseFontFeatureSettings(bool important) | 9332 bool CSSParser::parseFontFeatureSettings(bool important) |
9333 { | 9333 { |
9334 if (m_valueList->size() == 1 && m_valueList->current()->id == CSSValueNormal
) { | 9334 if (m_valueList->size() == 1 && m_valueList->current()->id == CSSValueNormal
) { |
9335 RefPtr<CSSPrimitiveValue> normalValue = cssValuePool().createIdentifierV
alue(CSSValueNormal); | 9335 RefPtr<CSSPrimitiveValue> normalValue = cssValuePool().createIdentifierV
alue(CSSValueNormal); |
9336 m_valueList->next(); | 9336 m_valueList->next(); |
9337 addProperty(CSSPropertyWebkitFontFeatureSettings, normalValue.release(),
important); | 9337 addProperty(CSSPropertyWebkitFontFeatureSettings, normalValue.release(),
important); |
9338 return true; | 9338 return true; |
(...skipping 2690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
12029 { | 12029 { |
12030 // The tokenizer checks for the construct of an+b. | 12030 // The tokenizer checks for the construct of an+b. |
12031 // However, since the {ident} rule precedes the {nth} rule, some of those | 12031 // However, since the {ident} rule precedes the {nth} rule, some of those |
12032 // tokens are identified as string literal. Furthermore we need to accept | 12032 // tokens are identified as string literal. Furthermore we need to accept |
12033 // "odd" and "even" which does not match to an+b. | 12033 // "odd" and "even" which does not match to an+b. |
12034 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") | 12034 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") |
12035 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); | 12035 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); |
12036 } | 12036 } |
12037 | 12037 |
12038 } | 12038 } |
OLD | NEW |