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

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

Issue 1373433002: Split out CSSPrimitiveValue's PropertyID into CSSCustomIdentValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_string
Patch Set: Created 5 years, 3 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
Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
index e37c8081b290952e3f74c85d7becd9750b5894d2..112b40d5f2013fb3430857aa35b8c1111090345d 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
@@ -135,7 +135,7 @@ static bool convertFontFamilyName(StyleResolverState& state, CSSValue* value,
{
if (value->isCustomIdentValue()) {
genericFamily = FontDescription::NoFamily;
- familyName = AtomicString(toCSSCustomIdentValue(value)->value());
+ familyName = AtomicString(toCSSCustomIdentValue(value)->string());
} else if (state.document().settings()) {
genericFamily = convertGenericFamily(toCSSPrimitiveValue(value)->getValueID());
familyName = state.fontBuilder().genericFontFamilyName(genericFamily);
@@ -418,7 +418,7 @@ GridPosition StyleBuilderConverter::convertGridPosition(StyleResolverState&, CSS
if (value->isCustomIdentValue()) {
// We translate <custom-ident> to <string> during parsing as it
// makes handling it more simple.
- position.setNamedGridArea(toCSSCustomIdentValue(value)->value());
+ position.setNamedGridArea(toCSSCustomIdentValue(value)->string());
return position;
}
@@ -450,7 +450,7 @@ GridPosition StyleBuilderConverter::convertGridPosition(StyleResolverState&, CSS
}
if (currentValue && currentValue->isCustomIdentValue()) {
- gridLineName = toCSSCustomIdentValue(currentValue)->value();
+ gridLineName = toCSSCustomIdentValue(currentValue)->string();
++it;
}
@@ -486,7 +486,7 @@ void StyleBuilderConverter::convertGridTrackList(CSSValue* value, Vector<GridTra
for (auto& currValue : *toCSSValueList(value)) {
if (currValue->isGridLineNamesValue()) {
for (auto& namedGridLineValue : toCSSGridLineNamesValue(*currValue)) {
- String namedGridLine = toCSSCustomIdentValue(namedGridLineValue.get())->value();
+ String namedGridLine = toCSSCustomIdentValue(namedGridLineValue.get())->string();
NamedGridLinesMap::AddResult result = namedGridLines.add(namedGridLine, Vector<size_t>());
result.storedValue->value.append(currentNamedGridLine);
OrderedNamedGridLines::AddResult orderedInsertionResult = orderedNamedGridLines.add(currentNamedGridLine, Vector<String>());

Powered by Google App Engine
This is Rietveld 408576698