WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/svg/graphics/SVGResourceMarker.cpp

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 64 matching lines @@
     currentlyDrawingMarkers.add(this);
 
     TransformationMatrix transform;
     transform.translate(x, y);
     transform.rotate(m_angle > -1 ? m_angle : angle);
 
     // refX and refY are given in coordinates relative to the viewport established by the marker, yet they affect
     // the translation performed on the viewport itself.
     TransformationMatrix viewportTransform;
     if (m_useStrokeWidth)
-        viewportTransform.scale(strokeWidth, strokeWidth);
+        viewportTransform.scaleNonUniform(strokeWidth, strokeWidth);
     viewportTransform *= m_marker->viewportTransform();
     double refX, refY;
-    viewportTransform.map(m_refX, m_refY, &refX, &refY);
+    viewportTransform.map(m_refX, m_refY, refX, refY);
     transform.translate(-refX, -refY);
 
     if (m_useStrokeWidth)
-        transform.scale(strokeWidth, strokeWidth);
+        transform.scaleNonUniform(strokeWidth, strokeWidth);
 
     // FIXME: PaintInfo should be passed into this method instead of being created here
     // FIXME: bounding box fractions are lost
     RenderObject::PaintInfo info(context, enclosingIntRect(rect), PaintPhaseForeground, 0, 0, 0);
 
     context->save();
     context->concatCTM(transform);
     m_marker->setDrawsContents(true);
     m_marker->paint(info, 0, 0);
     m_marker->setDrawsContents(false);
@@ skipping 29 matching lines @@
     if (resource && resource->isMarker())
         return static_cast<SVGResourceMarker*>(resource);
 
     return 0;
 }
 
 } // namespace WebCore
 
 #endif