Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I8ca36eee41eba7e9a56d6728a9d19e5883d7058c
diff --git a/Source/core/css/DOMWindowCSS.cpp b/Source/core/css/DOMWindowCSS.cpp
index 69b7a32..229e127 100644
--- a/Source/core/css/DOMWindowCSS.cpp
+++ b/Source/core/css/DOMWindowCSS.cpp
@@ -30,9 +30,9 @@
#include "config.h"
#include "core/css/DOMWindowCSS.h"
-#include "core/css/CSSParser.h"
+#include "core/css/parser/BisonCSSParser.h"
+#include "core/css/RuntimeCSSEnabled.h"
#include "core/css/StylePropertySet.h"
-#include "core/page/RuntimeCSSEnabled.h"
#include "wtf/text/WTFString.h"
namespace WebCore {
@@ -65,7 +65,7 @@
if (!RuntimeCSSEnabled::isCSSPropertyEnabled(propertyID))
return false;
- // CSSParser::parseValue() won't work correctly if !important is present,
+ // BisonCSSParser::parseValue() won't work correctly if !important is present,
// so just get rid of it. It doesn't matter to supports() if it's actually
// there or not, provided how it's specified in the value is correct.
String normalizedValue = value.stripWhiteSpace().simplifyWhiteSpace();
@@ -75,13 +75,13 @@
return false;
RefPtr<MutableStylePropertySet> dummyStyle = MutableStylePropertySet::create();
- return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue, false, HTMLStandardMode, 0);
+ return BisonCSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue, false, HTMLStandardMode, 0);
}
bool DOMWindowCSS::supports(const String& conditionText) const
{
- CSSParserContext context(HTMLStandardMode);
- CSSParser parser(context);
+ CSSParserContext context(HTMLStandardMode, 0);
+ BisonCSSParser parser(context);
return parser.parseSupportsCondition(conditionText);
}