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

Unified Diff: Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

Issue 1317523002: Changed Pair to be a CSSValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@add_const_to_primvalue
Patch Set: Rebase 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
« no previous file with comments | « no previous file | Source/core/animation/DeferredLegacyStyleInterpolation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
diff --git a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
index 9a5ae7d2e0a483716fe2969f84ef4a5ab8a0fec8..5e050cd7da317259b27de230e895c28afd3c25ba 100644
--- a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
+++ b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
@@ -13,7 +13,7 @@
#include "core/css/BasicShapeFunctions.h"
#include "core/css/CSSContentDistributionValue.h"
#include "core/css/CSSPrimitiveValueMappings.h"
-#include "core/css/Pair.h"
+#include "core/css/CSSValuePair.h"
#include "core/css/resolver/StyleResolverState.h"
{% macro declare_initial_function(property_id) %}
@@ -346,10 +346,9 @@ static bool borderImageLengthMatchesAllSides(const BorderImageLengthBox& borderI
int length = list ? list->length() : 0;
for (int i = 0; i < length; ++i) {
- CSSValue* currValue = list->item(i);
- Pair* pair = toCSSPrimitiveValue(currValue)->getPairValue();
- AtomicString identifier(pair->first()->getStringValue());
- int value = pair->second()->getIntValue();
+ const CSSValuePair* pair = toCSSValuePair(list->item(i));
+ AtomicString identifier(toCSSPrimitiveValue(pair->first())->getStringValue());
+ int value = toCSSPrimitiveValue(pair->second())->getIntValue();
CounterDirectives& directives = map.add(identifier, CounterDirectives()).storedValue->value;
{% if action == 'Reset' %}
directives.setResetValue(value);
« no previous file with comments | « no previous file | Source/core/animation/DeferredLegacyStyleInterpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698