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

Unified Diff: ui/gfx/transform.cc

Issue 1325803002: Apply skew on both axes together rather than sequentially on Compositor thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test for skewY 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
« no previous file with comments | « ui/gfx/transform.h ('k') | ui/gfx/transform_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/transform.cc
diff --git a/ui/gfx/transform.cc b/ui/gfx/transform.cc
index 33946cba67f07a79f9330b3dd1c7eea009ce6d7d..c42c961dc29307c58325a547e579911daadbb2a7 100644
--- a/ui/gfx/transform.cc
+++ b/ui/gfx/transform.cc
@@ -184,21 +184,13 @@ void Transform::Translate3d(SkMScalar x, SkMScalar y, SkMScalar z) {
matrix_.preTranslate(x, y, z);
}
-void Transform::SkewX(double angle_x) {
+void Transform::Skew(double angle_x, double angle_y) {
if (matrix_.isIdentity()) {
matrix_.set(0, 1, TanDegrees(angle_x));
- } else {
- SkMatrix44 skew(SkMatrix44::kIdentity_Constructor);
- skew.set(0, 1, TanDegrees(angle_x));
- matrix_.preConcat(skew);
- }
-}
-
-void Transform::SkewY(double angle_y) {
- if (matrix_.isIdentity()) {
matrix_.set(1, 0, TanDegrees(angle_y));
} else {
SkMatrix44 skew(SkMatrix44::kIdentity_Constructor);
+ skew.set(0, 1, TanDegrees(angle_x));
skew.set(1, 0, TanDegrees(angle_y));
matrix_.preConcat(skew);
}
« no previous file with comments | « ui/gfx/transform.h ('k') | ui/gfx/transform_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698