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

Unified Diff: sky/engine/core/css/resolver/StyleBuilderConverter.h

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/resolver/FontBuilder.cpp ('k') | sky/engine/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/StyleBuilderConverter.h
diff --git a/sky/engine/core/css/resolver/StyleBuilderConverter.h b/sky/engine/core/css/resolver/StyleBuilderConverter.h
index 7a0d1752fd47deff0c895d475bcc6d9ef62077d5..d8219735908db53a75fe5e4a33157cbe1ad25cbf 100644
--- a/sky/engine/core/css/resolver/StyleBuilderConverter.h
+++ b/sky/engine/core/css/resolver/StyleBuilderConverter.h
@@ -95,13 +95,7 @@ T StyleBuilderConverter::convertLineWidth(StyleResolverState& state, CSSValue* v
if (valueID == CSSValueInvalid) {
// Any original result that was >= 1 should not be allowed to fall below 1.
// This keeps border lines from vanishing.
- T result = primitiveValue->computeLength<T>(state.cssToLengthConversionData());
- if (state.style()->effectiveZoom() < 1.0f && result < 1.0) {
- T originalLength = primitiveValue->computeLength<T>(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0));
- if (originalLength >= 1.0)
- return 1.0;
- }
- return result;
+ return primitiveValue->computeLength<T>(state.cssToLengthConversionData());
}
ASSERT_NOT_REACHED();
return 0;
« no previous file with comments | « sky/engine/core/css/resolver/FontBuilder.cpp ('k') | sky/engine/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698