| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Motorola Mobility Inc. All rights reserved. | 2 * Copyright (C) 2012 Motorola Mobility Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above | 10 * 2. Redistributions in binary form must reproduce the above |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "core/css/DOMWindowCSS.h" | 31 #include "core/css/DOMWindowCSS.h" |
| 32 | 32 |
| 33 #include "core/css/CSSPropertyMetadata.h" | 33 #include "core/css/CSSPropertyMetadata.h" |
| 34 #include "core/css/StylePropertySet.h" | 34 #include "core/css/StylePropertySet.h" |
| 35 #include "core/css/parser/BisonCSSParser.h" | 35 #include "core/css/parser/CSSParser.h" |
| 36 #include "wtf/text/WTFString.h" | 36 #include "wtf/text/WTFString.h" |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 PassRefPtrWillBeRawPtr<DOMWindowCSS> DOMWindowCSS::create() | 40 PassRefPtrWillBeRawPtr<DOMWindowCSS> DOMWindowCSS::create() |
| 41 { | 41 { |
| 42 return adoptRefWillBeNoop(new DOMWindowCSS()); | 42 return adoptRefWillBeNoop(new DOMWindowCSS()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 static String valueWithoutImportant(const String& value) | 45 static String valueWithoutImportant(const String& value) |
| (...skipping 10 matching lines...) Expand all Loading... |
| 56 return newValue; | 56 return newValue; |
| 57 } | 57 } |
| 58 | 58 |
| 59 bool DOMWindowCSS::supports(const String& property, const String& value) const | 59 bool DOMWindowCSS::supports(const String& property, const String& value) const |
| 60 { | 60 { |
| 61 CSSPropertyID propertyID = cssPropertyID(property.stripWhiteSpace()); | 61 CSSPropertyID propertyID = cssPropertyID(property.stripWhiteSpace()); |
| 62 if (propertyID == CSSPropertyInvalid) | 62 if (propertyID == CSSPropertyInvalid) |
| 63 return false; | 63 return false; |
| 64 ASSERT(CSSPropertyMetadata::isEnabledProperty(propertyID)); | 64 ASSERT(CSSPropertyMetadata::isEnabledProperty(propertyID)); |
| 65 | 65 |
| 66 // BisonCSSParser::parseValue() won't work correctly if !important is presen
t, | 66 // CSSParser::parseValue() won't work correctly if !important is present, |
| 67 // so just get rid of it. It doesn't matter to supports() if it's actually | 67 // so just get rid of it. It doesn't matter to supports() if it's actually |
| 68 // there or not, provided how it's specified in the value is correct. | 68 // there or not, provided how it's specified in the value is correct. |
| 69 String normalizedValue = value.stripWhiteSpace().simplifyWhiteSpace(); | 69 String normalizedValue = value.stripWhiteSpace().simplifyWhiteSpace(); |
| 70 normalizedValue = valueWithoutImportant(normalizedValue); | 70 normalizedValue = valueWithoutImportant(normalizedValue); |
| 71 | 71 |
| 72 if (normalizedValue.isEmpty()) | 72 if (normalizedValue.isEmpty()) |
| 73 return false; | 73 return false; |
| 74 | 74 |
| 75 RefPtrWillBeRawPtr<MutableStylePropertySet> dummyStyle = MutableStylePropert
ySet::create(); | 75 RefPtrWillBeRawPtr<MutableStylePropertySet> dummyStyle = MutableStylePropert
ySet::create(); |
| 76 return BisonCSSParser::parseValue(dummyStyle.get(), propertyID, normalizedVa
lue, false, HTMLStandardMode, 0); | 76 return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue,
false, HTMLStandardMode, 0); |
| 77 } | 77 } |
| 78 | 78 |
| 79 bool DOMWindowCSS::supports(const String& conditionText) const | 79 bool DOMWindowCSS::supports(const String& conditionText) const |
| 80 { | 80 { |
| 81 CSSParserContext context(HTMLStandardMode, 0); | 81 return CSSParser::parseSupportsCondition(conditionText); |
| 82 BisonCSSParser parser(context); | |
| 83 return parser.parseSupportsCondition(conditionText); | |
| 84 } | 82 } |
| 85 | 83 |
| 86 } | 84 } |
| OLD | NEW |