Changeset 55314 in webkit

Timestamp:

Feb 26, 2010 2:27:44 PM (14 years ago)

Author:

krit@webkit.org

Message:

2010-02-26 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Extend AffineTransform to mapQuad
​https://bugs.webkit.org/show_bug.cgi?id=35444

This makes mapQuad available for AffineTransform. So that platforms
can make use of it after the switch from TransformationMatrix to
AffineTransform in GraphicsContext.

• platform/graphics/transforms/AffineTransform.cpp: (WebCore::AffineTransform::mapRect): mapRect already did the calculation for mapQuad but gave back the

boundingBox of the resulting FloatQuad.

(WebCore::AffineTransform::mapQuad):

• platform/graphics/transforms/AffineTransform.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/transforms/AffineTransform.cpp (modified) (2 diffs)
• platform/graphics/transforms/AffineTransform.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-26  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Extend AffineTransform to mapQuad
+        https://bugs.webkit.org/show_bug.cgi?id=35444
+
+        This makes mapQuad available for AffineTransform. So that platforms
+        can make use of it after the switch from TransformationMatrix to
+        AffineTransform in GraphicsContext.
+
+        * platform/graphics/transforms/AffineTransform.cpp:
+        (WebCore::AffineTransform::mapRect): mapRect already did the calculation for mapQuad but gave back the
+                                             boundingBox of the resulting FloatQuad.
+        (WebCore::AffineTransform::mapQuad):
+        * platform/graphics/transforms/AffineTransform.h:
+
 2010-02-26  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/platform/graphics/transforms/AffineTransform.cpp

@@ -315 +315 @@
     }
 
-    FloatQuad q(rect);
+    FloatQuad result;
+    result.setP1(mapPoint(rect.location()));
+    result.setP2(mapPoint(FloatPoint(rect.right(), rect.y())));
+    result.setP3(mapPoint(FloatPoint(rect.right(), rect.bottom())));
+    result.setP4(mapPoint(FloatPoint(rect.x(), rect.bottom())));
+    return result.boundingBox();
+}
+
+FloatQuad AffineTransform::mapQuad(const FloatQuad& q) const
+{
+    if (isIdentityOrTranslation()) {
+        FloatQuad mappedQuad(q);
+        mappedQuad.move(narrowPrecisionToFloat(m_transform[4]), narrowPrecisionToFloat(m_transform[5]));
+        return mappedQuad;
+    }
 
     FloatQuad result;
@@ -322 +336 @@
     result.setP3(mapPoint(q.p3()));
     result.setP4(mapPoint(q.p4()));
-    return result.boundingBox();
+    return result;
 }
 

trunk/WebCore/platform/graphics/transforms/AffineTransform.h

@@ -75 +75 @@
 
     FloatRect mapRect(const FloatRect&) const;
+    FloatQuad mapQuad(const FloatQuad&) const;
 
     bool isIdentity() const;