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

Unified Diff: sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp

Issue 711203002: Remove zoom() and effectiveZoom(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/css/FontSize.cpp ('k') | sky/engine/core/css/resolver/FilterOperationResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
diff --git a/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp b/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
index 46ce0502bc5ea7f46cc1af2644b8fe8daf24b980..7c0b20a0384f44ee9622dad7c3107e518a93f532 100644
--- a/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
+++ b/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
@@ -63,7 +63,7 @@ namespace {
Length animatableValueToLength(const AnimatableValue* value, const StyleResolverState& state, ValueRange range = ValueRangeAll)
{
if (value->isLength())
- return toAnimatableLength(value)->length(state.style()->effectiveZoom(), range);
+ return toAnimatableLength(value)->length(range);
RefPtr<CSSValue> cssValue = toAnimatableUnknown(value)->toCSSValue();
CSSPrimitiveValue* cssPrimitiveValue = toCSSPrimitiveValue(cssValue.get());
return cssPrimitiveValue->convertToLength<AnyConversion>(state.cssToLengthConversionData());
@@ -72,7 +72,7 @@ Length animatableValueToLength(const AnimatableValue* value, const StyleResolver
BorderImageLength animatableValueToBorderImageLength(const AnimatableValue* value, const StyleResolverState& state)
{
if (value->isLength())
- return BorderImageLength(toAnimatableLength(value)->length(state.style()->effectiveZoom(), ValueRangeNonNegative));
+ return BorderImageLength(toAnimatableLength(value)->length(ValueRangeNonNegative));
if (value->isDouble())
return BorderImageLength(clampTo<double>(toAnimatableDouble(value)->toDouble(), 0));
RefPtr<CSSValue> cssValue = toAnimatableUnknown(value)->toCSSValue();
« no previous file with comments | « sky/engine/core/css/FontSize.cpp ('k') | sky/engine/core/css/resolver/FilterOperationResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698