Do another merge using nifty new merge script (CL for that coming soon).

third_party/WebKit/WebCore/platform/graphics/AffineTransform.cpp

Index: third_party/WebKit/WebCore/platform/graphics/AffineTransform.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/AffineTransform.cpp	(revision 5296)
+++ third_party/WebKit/WebCore/platform/graphics/AffineTransform.cpp	(working copy)
@@ -27,6 +27,7 @@
 #include "AffineTransform.h"
 
 #include "FloatRect.h"
+#include "FloatQuad.h"
 #include "IntRect.h"
 
 #include <wtf/MathExtras.h>
@@ -160,6 +161,16 @@
     return FloatPoint(static_cast<float>(x2), static_cast<float>(y2));
 }
 
+FloatQuad AffineTransform::mapQuad(const FloatQuad& quad) const
+{
+    // FIXME: avoid 4 seperate library calls. Point mapping really needs
+    // to be platform-independent code.
+    return FloatQuad(mapPoint(quad.p1()),
+                     mapPoint(quad.p2()),
+                     mapPoint(quad.p3()),
+                     mapPoint(quad.p4()));
+}
+
 void AffineTransform::blend(const AffineTransform& from, double progress)
 {
     double srA[9], srB[9];