WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/SVGRootInlineBox.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  *           (C) 2006 Apple Computer Inc.
  *           (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
@@ skipping 802 matching lines @@
         (computedHeight <= 0.0f && chunk.isVerticalText))
         return 0.0f;
 
     if (chunk.isVerticalText)
         computedLength = computedHeight;
     else
         computedLength = computedWidth;
 
     if (lengthAdjust == SVGTextContentElement::LENGTHADJUST_SPACINGANDGLYPHS) {
         if (chunk.isVerticalText)
-            chunk.ctm.scale(1.0f, chunk.textLength / computedLength);
+            chunk.ctm.scaleNonUniform(1.0f, chunk.textLength / computedLength);
         else
-            chunk.ctm.scale(chunk.textLength / computedLength, 1.0f);
+            chunk.ctm.scaleNonUniform(chunk.textLength / computedLength, 1.0f);
 
         return 0.0f;
     }
 
     return (chunk.textLength - computedLength) / float(chunk.end - chunk.start);
 }
 
 static void applyTextLengthCorrectionToTextChunk(SVGTextChunk& chunk)
 {
     // This method is not called for chunks containing chars aligned on a path.
@@ skipping 874 matching lines @@
         }
 
         if (!textBox && startedFirstChunk)
             walker->end(lastNotifiedBox);
     }
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(SVG)