Retire setGradientSpaceTransform, setPatternSpaceTransform

third_party/WebKit/Source/platform/graphics/GradientGeneratedImage.cpp

 /*
  * Copyright (C) 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  *
  * 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 24 matching lines @@
 {
     SkRect visibleRect = srcRect;
     if (!visibleRect.intersect(SkRect::MakeIWH(m_size.width(), m_size.height())))
         return;
 
     SkMatrix transform = SkMatrix::MakeRectToRect(srcRect, destRect, SkMatrix::kFill_ScaleToFit);
     SkAutoCanvasRestore autoRestore(canvas, !transform.isIdentity());
     canvas->concat(transform);
 
     SkPaint gradientPaint(paint);
-    m_gradient->applyToPaint(gradientPaint);
+    // TODO(fmalita): use the shader matrix instead of changing global canvas state.
+    m_gradient->applyToPaint(gradientPaint, SkMatrix::I());
 
     canvas->drawRect(visibleRect, gradientPaint);
 }
 
 void GradientGeneratedImage::drawTile(GraphicsContext& context, const FloatRect& srcRect)
 {
     SkPaint gradientPaint(context.fillPaint());
-    m_gradient->applyToPaint(gradientPaint);
+    m_gradient->applyToPaint(gradientPaint, SkMatrix::I());
 
     context.drawRect(srcRect, gradientPaint);
 }
 
 bool GradientGeneratedImage::applyShader(SkPaint& paint, const SkMatrix* localMatrix)
 {
-    AffineTransform transform;
-    if (localMatrix) {
-        transform.setMatrix(
-            localMatrix->getScaleX(), localMatrix->getSkewY(),
-            localMatrix->getSkewX(), localMatrix->getScaleY(),
-            localMatrix->getTranslateX(), localMatrix->getTranslateY());
-    }
-
     DCHECK(m_gradient);
-    // TODO(fmalita): remove the transform from gradient/pattern state, and pass the matrix to
-    // applyToPaint if needed.
-    const AffineTransform previousTransform = m_gradient->gradientSpaceTransform();
-    m_gradient->setGradientSpaceTransform(transform);
-    m_gradient->applyToPaint(paint);
-    m_gradient->setGradientSpaceTransform(previousTransform);
+    // TODO(fmalita): pass a const SkMatrix& to applyShader.
+    m_gradient->applyToPaint(paint, localMatrix ? *localMatrix : SkMatrix::I());
 
     return true;
 }
 
 } // namespace blink