optimize computing bounds by calling SkMatrix44::map2()

cc/math_util.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/math_util.h"
 
 #include <cmath>
 #include <limits>
 
 #include "ui/gfx/quad_f.h"
@@ skipping 91 matching lines @@
 
 gfx::Rect MathUtil::mapClippedRect(const gfx::Transform& transform, const gfx::Rect& srcRect)
 {
     return gfx::ToEnclosingRect(mapClippedRect(transform, gfx::RectF(srcRect)));
 }
 
 gfx::RectF MathUtil::mapClippedRect(const gfx::Transform& transform, const gfx::RectF& srcRect)
 {
     if (transform.IsIdentityOrTranslation())
         return srcRect + gfx::Vector2dF(static_cast<float>(transform.matrix().getDouble(0, 3)), static_cast<float>(transform.matrix().getDouble(1, 3)));
+    
+    // Apply the transform, but retain the result in homogeneous coordinates.
 
-    // Apply the transform, but retain the result in homogeneous coordinates.
-    gfx::QuadF q = gfx::QuadF(srcRect);
-    HomogeneousCoordinate h1 = mapHomogeneousPoint(transform, gfx::Point3F(q.p1()));
-    HomogeneousCoordinate h2 = mapHomogeneousPoint(transform, gfx::Point3F(q.p2()));
-    HomogeneousCoordinate h3 = mapHomogeneousPoint(transform, gfx::Point3F(q.p3()));
-    HomogeneousCoordinate h4 = mapHomogeneousPoint(transform, gfx::Point3F(q.p4()));
+    double quad[4 * 2]; // input: 4 x 2D point
+    quad[0] = srcRect.x();     quad[1] = srcRect.y();

[shawnsingh, 2012/12/06 03:00:55]

nit:  point --> points

[reed1, 2012/12/06 05:50:20]

Done.

+    quad[2] = srcRect.right(); quad[3] = srcRect.y();
+    quad[4] = srcRect.x();     quad[5] = srcRect.bottom();
+    quad[6] = srcRect.right(); quad[7] = srcRect.bottom();
 
-    return computeEnclosingClippedRect(h1, h2, h3, h4);
+    double result[4 * 4];   // output: 4 x 4D homogeneous point
+    transform.matrix().map2(quad, 4, result);
+
+    if (!(transform.matrix().getType() & SkMatrix44::kPerspective_Mask)) {
+        const SkPoint pts[] = {
+            { result[0], result[1] }, { result[4], result[5] },
+            { result[8], result[8] }, { result[12], result[13] },
+        };
+        SkRect r;
+        r.set(pts, 4);
+        return gfx::RectF(r.x(), r.y(), r.width(), r.height());
+    }
+
+    return computeEnclosingClippedRect(*(const HomogeneousCoordinate*)&result[0],
+                                       *(const HomogeneousCoordinate*)&result[4],
+                                       *(const HomogeneousCoordinate*)&result[8],
+                                       *(const HomogeneousCoordinate*)&result[12]);
 }
 
 gfx::RectF MathUtil::projectClippedRect(const gfx::Transform& transform, const gfx::RectF& srcRect)
 {
     if (transform.IsIdentityOrTranslation())
         return srcRect + gfx::Vector2dF(static_cast<float>(transform.matrix().getDouble(0, 3)), static_cast<float>(transform.matrix().getDouble(1, 3)));
 
     // Perform the projection, but retain the result in homogeneous coordinates.
     gfx::QuadF q = gfx::QuadF(srcRect);
     HomogeneousCoordinate h1 = projectHomogeneousPoint(transform, q.p1());
@@ skipping 351 matching lines @@
     matrix.setDouble(1, 0, b);
     matrix.setDouble(0, 1, c);
     matrix.setDouble(1, 1, d);
     matrix.setDouble(0, 3, e);
     matrix.setDouble(1, 3, f);
 
     return result;
 }
 
 }  // namespace cc