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

Unified Diff: Source/core/css/resolver/StyleBuilderConverter.cpp

Issue 1186833003: Split up CSSPrimitiveValue::isString into isString and isCustomIdent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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/resolver/CSSToStyleMap.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleBuilderConverter.cpp
diff --git a/Source/core/css/resolver/StyleBuilderConverter.cpp b/Source/core/css/resolver/StyleBuilderConverter.cpp
index f611d071d7e7cc05fc3b36e63f21f2df401febd9..a4bac3c279f1164ea87d686de85775cb30cb19ae 100644
--- a/Source/core/css/resolver/StyleBuilderConverter.cpp
+++ b/Source/core/css/resolver/StyleBuilderConverter.cpp
@@ -130,7 +130,7 @@ static FontDescription::GenericFamilyType convertGenericFamily(CSSValueID valueI
static bool convertFontFamilyName(StyleResolverState& state, CSSPrimitiveValue* primitiveValue,
FontDescription::GenericFamilyType& genericFamily, AtomicString& familyName)
{
- if (primitiveValue->isString()) {
+ if (primitiveValue->isCustomIdent()) {
genericFamily = FontDescription::NoFamily;
familyName = AtomicString(primitiveValue->getStringValue());
} else if (state.document().settings()) {
@@ -401,7 +401,7 @@ GridPosition StyleBuilderConverter::convertGridPosition(StyleResolverState&, CSS
CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
// We translate <custom-ident> to <string> during parsing as it
// makes handling it more simple.
- if (primitiveValue->isString()) {
+ if (primitiveValue->isCustomIdent()) {
position.setNamedGridArea(primitiveValue->getStringValue());
return position;
}
@@ -432,7 +432,7 @@ GridPosition StyleBuilderConverter::convertGridPosition(StyleResolverState&, CSS
currentValue = it != values->end() ? toCSSPrimitiveValue(it->get()) : 0;
}
- if (currentValue && currentValue->isString()) {
+ if (currentValue && currentValue->isCustomIdent()) {
gridLineName = currentValue->getStringValue();
++it;
}
« no previous file with comments | « Source/core/css/resolver/CSSToStyleMap.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698