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

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

Issue 1307673003: Made CSSPrimitiveValue::getString() only work for String types (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_out_pair
Patch Set: Review feedback Created 5 years, 4 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: Source/core/css/resolver/StyleBuilderConverter.cpp
diff --git a/Source/core/css/resolver/StyleBuilderConverter.cpp b/Source/core/css/resolver/StyleBuilderConverter.cpp
index 9f77e6de866acd31aa923ec61ea7263bfe531d8f..b1dbf43d150adee8e9ba963137fc6583f5230ba1 100644
--- a/Source/core/css/resolver/StyleBuilderConverter.cpp
+++ b/Source/core/css/resolver/StyleBuilderConverter.cpp
@@ -470,6 +470,7 @@ void StyleBuilderConverter::convertGridTrackList(CSSValue* value, Vector<GridTra
for (auto& currValue : *toCSSValueList(value)) {
if (currValue->isGridLineNamesValue()) {
for (auto& namedGridLineValue : toCSSGridLineNamesValue(*currValue)) {
+ ASSERT(toCSSPrimitiveValue(namedGridLineValue.get())->isCustomIdent());
String namedGridLine = toCSSPrimitiveValue(namedGridLineValue.get())->getStringValue();
NamedGridLinesMap::AddResult result = namedGridLines.add(namedGridLine, Vector<size_t>());
result.storedValue->value.append(currentNamedGridLine);
@@ -742,13 +743,15 @@ PassRefPtr<QuotesData> StyleBuilderConverter::convertQuotes(StyleResolverState&,
for (size_t i = 0; i < list->length(); i += 2) {
CSSValue* first = list->item(i);
CSSValue* second = list->item(i + 1);
+ ASSERT(toCSSPrimitiveValue(first)->isString());
+ ASSERT(toCSSPrimitiveValue(second)->isString());
String startQuote = toCSSPrimitiveValue(first)->getStringValue();
String endQuote = toCSSPrimitiveValue(second)->getStringValue();
quotes->addPair(std::make_pair(startQuote, endQuote));
}
return quotes.release();
}
- // FIXME: We should assert we're a primitive value with valueID = CSSValueNone
+ ASSERT(value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
return QuotesData::create();
}

Powered by Google App Engine
This is Rietveld 408576698