WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/svg/SVGTransformDistance.cpp

 /*
  Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  
  This file is part of the WebKit project
  
  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 61 matching lines @@
     case SVGTransform::SVG_TRANSFORM_TRANSLATE:
     {
         FloatSize translationDistance = toSVGTransform.translate() - fromSVGTransform.translate();
         m_transform.translate(translationDistance.width(), translationDistance.height());
         return;
     }
     case SVGTransform::SVG_TRANSFORM_SCALE:
     {
         float scaleX = toSVGTransform.scale().width() - fromSVGTransform.scale().width();        
         float scaleY = toSVGTransform.scale().height() - fromSVGTransform.scale().height();
-        m_transform.scale(scaleX, scaleY);
+        m_transform.scaleNonUniform(scaleX, scaleY);
         return;
     }
     case SVGTransform::SVG_TRANSFORM_SKEWX:
     case SVGTransform::SVG_TRANSFORM_SKEWY:
         m_angle = toSVGTransform.angle() - fromSVGTransform.angle();
         return;
     }
 }
 
 SVGTransformDistance SVGTransformDistance::scaledDistance(float scaleFactor) const
@@ skipping 88 matching lines @@
     {
         float dx = absoluteValue ? fabsf(transform.translate().x()) : transform.translate().x();
         float dy = absoluteValue ? fabsf(transform.translate().y()) : transform.translate().y();
         m_transform.translate(dx, dy);
         return;
     }
     case SVGTransform::SVG_TRANSFORM_SCALE:
     {
         float scaleX = absoluteValue ? fabsf(transform.scale().width()) : transform.scale().width();
         float scaleY = absoluteValue ? fabsf(transform.scale().height()) : transform.scale().height();
-        m_transform.scale(scaleX, scaleY);
+        m_transform.scaleNonUniform(scaleX, scaleY);
         return;
     }
     case SVGTransform::SVG_TRANSFORM_SKEWX:
     case SVGTransform::SVG_TRANSFORM_SKEWY:
         m_angle += absoluteValue ? fabsf(transform.angle()) : transform.angle();
         return;
     }
     
     ASSERT_NOT_REACHED();
     return;
@@ skipping 67 matching lines @@
     case SVGTransform::SVG_TRANSFORM_SKEWY:
         return m_angle;
     }
     ASSERT_NOT_REACHED();
     return 0.0f;
 }
 
 }
 
 #endif