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

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

Issue 1373433002: Split out CSSPrimitiveValue's PropertyID into CSSCustomIdentValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_string
Patch Set: Rebase 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/StyleBuilderCustom.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
index d4d53e3d3eb243dad8e0715a0ee430a52a496705..d6a82e68148556c490f9cf8293cbebed84f5b526 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -671,12 +671,11 @@ void StyleBuilderFunctions::applyValueCSSPropertyWillChange(StyleResolverState&
Vector<CSSPropertyID> willChangeProperties;
for (auto& willChangeValue : toCSSValueList(*value)) {
- CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(willChangeValue.get());
- if (primitiveValue->isPropertyID())
- willChangeProperties.append(primitiveValue->getPropertyID());
- else if (primitiveValue->getValueID() == CSSValueContents)
+ if (willChangeValue->isCustomIdentValue())
+ willChangeProperties.append(toCSSCustomIdentValue(*willChangeValue).valueAsPropertyID());
+ else if (toCSSPrimitiveValue(*willChangeValue).getValueID() == CSSValueContents)
willChangeContents = true;
- else if (primitiveValue->getValueID() == CSSValueScrollPosition)
+ else if (toCSSPrimitiveValue(*willChangeValue).getValueID() == CSSValueScrollPosition)
willChangeScrollPosition = true;
else
ASSERT_NOT_REACHED();

Powered by Google App Engine
This is Rietveld 408576698