Retire setGradientSpaceTransform, setPatternSpaceTransform

third_party/WebKit/Source/modules/canvas2d/CanvasStyle.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.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
@@ skipping 16 matching lines @@
  */
 
 #include "modules/canvas2d/CanvasStyle.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/parser/CSSParser.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "modules/canvas2d/CanvasGradient.h"
 #include "modules/canvas2d/CanvasPattern.h"
+#include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 enum ColorParseResult { ParsedRGBA, ParsedCurrentColor, ParsedSystemColor, ParseFailed };
 
 static ColorParseResult parseColor(Color& parsedColor, const String& colorString)
 {
     if (equalIgnoringCase(colorString, "currentcolor"))
@@ skipping 65 matching lines @@
 
 void CanvasStyle::applyToPaint(SkPaint& paint) const
 {
     switch (m_type) {
     case ColorRGBA:
         paint.setShader(nullptr);
         break;
     case Gradient:
         getCanvasGradient()->getGradient()->applyToPaint(paint);
         break;
-    case ImagePattern:
-        getCanvasPattern()->getPattern()->applyToPaint(paint);
+    case ImagePattern: {
+        const SkMatrix localMatrix = affineTransformToSkMatrix(getCanvasPattern()->getTransform());
+        getCanvasPattern()->getPattern()->applyToPaint(paint, &localMatrix);
+    }
         break;

[fs, 2016/05/24 18:32:03]

Nit: Exchange this line with the one above?

[f(malita), 2016/05/24 18:42:26]

Done.

     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 RGBA32 CanvasStyle::paintColor() const
 {
     if (m_type == ColorRGBA)
         return m_rgba;
     ASSERT(m_type == Gradient || m_type == ImagePattern);
     return Color::black;
 }
 
 DEFINE_TRACE(CanvasStyle)
 {
     visitor->trace(m_gradient);
     visitor->trace(m_pattern);
 }
 
 } // namespace blink