| 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 12 matching lines...) Expand all Loading... |
| 23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 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/parser/BisonCSSParser.h" | 33 #include "core/css/parser/CSSParser.h" |
| 34 #include "core/css/RuntimeCSSEnabled.h" | 34 #include "core/css/RuntimeCSSEnabled.h" |
| 35 #include "core/css/StylePropertySet.h" | 35 #include "core/css/StylePropertySet.h" |
| 36 #include "wtf/text/WTFString.h" | 36 #include "wtf/text/WTFString.h" |
| 37 | 37 |
| 38 namespace WebCore { | 38 namespace WebCore { |
| 39 | 39 |
| 40 PassRefPtr<DOMWindowCSS> DOMWindowCSS::create() | 40 PassRefPtr<DOMWindowCSS> DOMWindowCSS::create() |
| 41 { | 41 { |
| 42 return adoptRef(new DOMWindowCSS()); | 42 return adoptRef(new DOMWindowCSS()); |
| 43 } | 43 } |
| (...skipping 14 matching lines...) Expand all Loading... |
| 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 | 64 |
| 65 if (!RuntimeCSSEnabled::isCSSPropertyEnabled(propertyID)) | 65 if (!RuntimeCSSEnabled::isCSSPropertyEnabled(propertyID)) |
| 66 return false; | 66 return false; |
| 67 | 67 |
| 68 // BisonCSSParser::parseValue() won't work correctly if !important is presen
t, | 68 // CSSParser::parseValue() won't work correctly if !important is present, |
| 69 // so just get rid of it. It doesn't matter to supports() if it's actually | 69 // so just get rid of it. It doesn't matter to supports() if it's actually |
| 70 // there or not, provided how it's specified in the value is correct. | 70 // there or not, provided how it's specified in the value is correct. |
| 71 String normalizedValue = value.stripWhiteSpace().simplifyWhiteSpace(); | 71 String normalizedValue = value.stripWhiteSpace().simplifyWhiteSpace(); |
| 72 normalizedValue = valueWithoutImportant(normalizedValue); | 72 normalizedValue = valueWithoutImportant(normalizedValue); |
| 73 | 73 |
| 74 if (normalizedValue.isEmpty()) | 74 if (normalizedValue.isEmpty()) |
| 75 return false; | 75 return false; |
| 76 | 76 |
| 77 RefPtr<MutableStylePropertySet> dummyStyle = MutableStylePropertySet::create
(); | 77 RefPtr<MutableStylePropertySet> dummyStyle = MutableStylePropertySet::create
(); |
| 78 return BisonCSSParser::parseValue(dummyStyle.get(), propertyID, normalizedVa
lue, false, HTMLStandardMode, 0); | 78 return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue,
false, HTMLStandardMode, 0); |
| 79 } | 79 } |
| 80 | 80 |
| 81 bool DOMWindowCSS::supports(const String& conditionText) const | 81 bool DOMWindowCSS::supports(const String& conditionText) const |
| 82 { | 82 { |
| 83 CSSParserContext context(HTMLStandardMode); | 83 CSSParserContext context(HTMLStandardMode); |
| 84 BisonCSSParser parser(context); | 84 BisonCSSParser parser(context); |
| 85 return parser.parseSupportsCondition(conditionText); | 85 return parser.parseSupportsCondition(conditionText); |
| 86 } | 86 } |
| 87 | 87 |
| 88 } | 88 } |
| OLD | NEW |