diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-08-25 19:20:41 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:30:55 +0000 |
| commit | 6882a04fb36642862b11efe514251d32070c3d65 (patch) | |
| tree | b7959826000b061fd5ccc7512035c7478742f7b0 /Source/WebCore/css/DOMWindowCSS.cpp | |
| parent | ab6df191029eeeb0b0f16f127d553265659f739e (diff) | |
| download | qtwebkit-6882a04fb36642862b11efe514251d32070c3d65.tar.gz | |
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/css/DOMWindowCSS.cpp')
| -rw-r--r-- | Source/WebCore/css/DOMWindowCSS.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Source/WebCore/css/DOMWindowCSS.cpp b/Source/WebCore/css/DOMWindowCSS.cpp index 315c7748a..b8ba88c7b 100644 --- a/Source/WebCore/css/DOMWindowCSS.cpp +++ b/Source/WebCore/css/DOMWindowCSS.cpp @@ -30,17 +30,15 @@ #include "config.h" #include "DOMWindowCSS.h" -#if ENABLE(CSS3_CONDITIONAL_RULES) - #include "CSSParser.h" -#include "StylePropertySet.h" +#include "StyleProperties.h" #include <wtf/text/WTFString.h> namespace WebCore { -PassRefPtr<DOMWindowCSS> DOMWindowCSS::create() +Ref<DOMWindowCSS> DOMWindowCSS::create() { - return adoptRef(new DOMWindowCSS()); + return adoptRef(*new DOMWindowCSS); } static String valueWithoutImportant(const String& value) @@ -73,8 +71,8 @@ bool DOMWindowCSS::supports(const String& property, const String& value) const if (normalizedValue.isEmpty()) return false; - RefPtr<MutableStylePropertySet> dummyStyle = MutableStylePropertySet::create(); - return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue, false, CSSStrictMode, 0); + RefPtr<MutableStyleProperties> dummyStyle = MutableStyleProperties::create(); + return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue, false, CSSStrictMode, nullptr) != CSSParser::ParseResult::Error; } bool DOMWindowCSS::supports(const String& conditionText) const @@ -85,5 +83,3 @@ bool DOMWindowCSS::supports(const String& conditionText) const } } - -#endif |