Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(634)

Unified Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 1092963002: Remove CSSPropertyParser::inViewport method (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase against ToT Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp
index 8708db5e2f520e111c93f0c4bf08c7aaedfef9eb..46907631abbfeca5e3f8c684f5efe42a8c69d633 100644
--- a/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/Source/core/css/parser/CSSPropertyParser.cpp
@@ -84,12 +84,10 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveValuePair(PassRe
}
CSSPropertyParser::CSSPropertyParser(CSSParserValueList* valueList,
- const CSSParserContext& context, bool inViewport,
- WillBeHeapVector<CSSProperty, 256>& parsedProperties,
+ const CSSParserContext& context, WillBeHeapVector<CSSProperty, 256>& parsedProperties,
StyleRule::Type ruleType)
: m_valueList(valueList)
, m_context(context)
- , m_inViewport(inViewport)
, m_parsedProperties(parsedProperties)
, m_ruleType(ruleType)
, m_inParseShorthand(0)
@@ -99,12 +97,12 @@ CSSPropertyParser::CSSPropertyParser(CSSParserValueList* valueList,
}
bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool important,
- CSSParserValueList* valueList, const CSSParserContext& context, bool inViewport,
+ CSSParserValueList* valueList, const CSSParserContext& context,
WillBeHeapVector<CSSProperty, 256>& parsedProperties, StyleRule::Type ruleType)
{
int parsedPropertiesSize = parsedProperties.size();
- CSSPropertyParser parser(valueList, context, inViewport, parsedProperties, ruleType);
+ CSSPropertyParser parser(valueList, context, parsedProperties, ruleType);
bool parseSuccess = parser.parseValue(unresolvedProperty, important);
// This doesn't count UA style sheets
@@ -419,7 +417,7 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
if (!value)
return false;
- if (inViewport()) {
+ if (m_ruleType == StyleRule::Viewport) {
// Allow @viewport rules from UA stylesheets even if the feature is disabled.
if (!RuntimeEnabledFeatures::cssViewportEnabled() && !isUASheetBehavior(m_context.mode()))
return false;
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698