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

Unified Diff: sky/engine/core/css/resolver/TransformBuilder.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/resolver/StyleResolver.cpp ('k') | sky/engine/core/dom/Element.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/TransformBuilder.cpp
diff --git a/sky/engine/core/css/resolver/TransformBuilder.cpp b/sky/engine/core/css/resolver/TransformBuilder.cpp
index 38ff9e01ba35f4c95c8217c688df9afe3eaf8a07..ebc8d36e1ad79294fded469272b7c3a0244886c6 100644
--- a/sky/engine/core/css/resolver/TransformBuilder.cpp
+++ b/sky/engine/core/css/resolver/TransformBuilder.cpp
@@ -86,7 +86,6 @@ bool TransformBuilder::createTransformOperations(CSSValue* inValue, const CSSToL
return false;
}
- float zoomFactor = conversionData.zoom();
TransformOperations operations;
for (CSSValueListIterator i = inValue; i.hasMore(); i.advance()) {
CSSValue* currValue = i.value();
@@ -265,8 +264,8 @@ bool TransformBuilder::createTransformOperations(CSSValue* inValue, const CSSToL
double b = toCSSPrimitiveValue(transformValue->item(1))->getDoubleValue();
double c = toCSSPrimitiveValue(transformValue->item(2))->getDoubleValue();
double d = toCSSPrimitiveValue(transformValue->item(3))->getDoubleValue();
- double e = zoomFactor * toCSSPrimitiveValue(transformValue->item(4))->getDoubleValue();
- double f = zoomFactor * toCSSPrimitiveValue(transformValue->item(5))->getDoubleValue();
+ double e = toCSSPrimitiveValue(transformValue->item(4))->getDoubleValue();
+ double f = toCSSPrimitiveValue(transformValue->item(5))->getDoubleValue();
operations.operations().append(MatrixTransformOperation::create(a, b, c, d, e, f));
break;
}
@@ -285,8 +284,8 @@ bool TransformBuilder::createTransformOperations(CSSValue* inValue, const CSSToL
toCSSPrimitiveValue(transformValue->item(9))->getDoubleValue(),
toCSSPrimitiveValue(transformValue->item(10))->getDoubleValue(),
toCSSPrimitiveValue(transformValue->item(11))->getDoubleValue(),
- zoomFactor * toCSSPrimitiveValue(transformValue->item(12))->getDoubleValue(),
- zoomFactor * toCSSPrimitiveValue(transformValue->item(13))->getDoubleValue(),
+ toCSSPrimitiveValue(transformValue->item(12))->getDoubleValue(),
+ toCSSPrimitiveValue(transformValue->item(13))->getDoubleValue(),
toCSSPrimitiveValue(transformValue->item(14))->getDoubleValue(),
toCSSPrimitiveValue(transformValue->item(15))->getDoubleValue());
operations.operations().append(Matrix3DTransformOperation::create(matrix));
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.cpp ('k') | sky/engine/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698