WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/SVGCharacterLayoutInfo.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 503 matching lines @@
 
 TransformationMatrix SVGChar::characterTransform() const
 {
     TransformationMatrix ctm;
 
     // Rotate character around angle, and possibly scale.
     ctm.translate(x, y);
     ctm.rotate(angle);
 
     if (pathData) {
-        ctm.scale(pathData->xScale, pathData->yScale);
+        ctm.scaleNonUniform(pathData->xScale, pathData->yScale);
         ctm.translate(pathData->xShift, pathData->yShift);
         ctm.rotate(pathData->orientationAngle);
     }
 
     ctm.translate(orientationShiftX - x, orientationShiftY - y);
     return ctm;
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(SVG)