Use newImageSnapshot() to get an image from a Canvas

Source/platform/graphics/Pattern.cpp

Index: Source/platform/graphics/Pattern.cpp
diff --git a/Source/platform/graphics/Pattern.cpp b/Source/platform/graphics/Pattern.cpp
index 3d7c0acf95791118ba0c3523330de2f3db0fa311..d112eb5da483290dcad561101e7a7c7f1ca12a6f 100644
--- a/Source/platform/graphics/Pattern.cpp
+++ b/Source/platform/graphics/Pattern.cpp
@@ -24,26 +24,22 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 #include "config.h"
 #include "platform/graphics/Pattern.h"
 
+#include "platform/graphics/BitmapPattern.h"
+#include "platform/graphics/ImagePattern.h"
 #include <v8.h>
-#include "SkCanvas.h"
-#include "SkColorShader.h"
-#include "platform/graphics/skia/SkiaUtils.h"
 
 
 namespace WebCore {
 
-Pattern::Pattern(PassRefPtr<Image> image, bool repeatX, bool repeatY)
-    : m_repeatX(repeatX)
-    , m_repeatY(repeatY)
-    , m_externalMemoryAllocated(0)
+PassRefPtr<Pattern> Pattern::create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY)
 {
-    if (image) {
-        m_tileImage = image->nativeImageForCurrentFrame();
-    }
+    if (tileImage->image())
+        return ImagePattern::create(tileImage, repeatX, repeatY);
+
+    return BitmapPattern::create(tileImage, repeatX, repeatY);
 }
 
 Pattern::~Pattern()
@@ -52,53 +48,6 @@ Pattern::~Pattern()
         v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(-m_externalMemoryAllocated);
 }
 
-SkShader* Pattern::shader()
-{
-    if (m_pattern)
-        return m_pattern.get();
-
-    SkMatrix localMatrix = affineTransformToSkMatrix(m_patternSpaceTransformation);
-
-    // If we don't have a bitmap, return a transparent shader.
-    if (!m_tileImage)
-        m_pattern = adoptRef(new SkColorShader(SK_ColorTRANSPARENT));
-    else if (m_repeatX && m_repeatY)
-        m_pattern = adoptRef(SkShader::CreateBitmapShader(m_tileImage->bitmap(), SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &localMatrix));
-    else {
-        // Skia does not have a "draw the tile only once" option. Clamp_TileMode
-        // repeats the last line of the image after drawing one tile. To avoid
-        // filling the space with arbitrary pixels, this workaround forces the
-        // image to have a line of transparent pixels on the "repeated" edge(s),
-        // thus causing extra space to be transparent filled.
-        SkShader::TileMode tileModeX = m_repeatX ? SkShader::kRepeat_TileMode : SkShader::kClamp_TileMode;
-        SkShader::TileMode tileModeY = m_repeatY ? SkShader::kRepeat_TileMode : SkShader::kClamp_TileMode;
-        int expandW = m_repeatX ? 0 : 1;
-        int expandH = m_repeatY ? 0 : 1;
-
-        // Create a transparent bitmap 1 pixel wider and/or taller than the
-        // original, then copy the orignal into it.
-        // FIXME: Is there a better way to pad (not scale) an image in skia?
-        SkImageInfo info = m_tileImage->bitmap().info();
-        info.fWidth += expandW;
-        info.fHeight += expandH;
-        // we explicitly require non-opaquness, since we are going to add a transparent strip.
-        info.fAlphaType = kPremul_SkAlphaType;
-
-        SkBitmap bm2;
-        bm2.allocPixels(info);
-        bm2.eraseARGB(0x00, 0x00, 0x00, 0x00);
-        SkCanvas canvas(bm2);
-        canvas.drawBitmap(m_tileImage->bitmap(), 0, 0);
-        bm2.setImmutable();
-        m_pattern = adoptRef(SkShader::CreateBitmapShader(bm2, tileModeX, tileModeY, &localMatrix));
-
-        // Clamp to int, since that's what the adjust function takes.
-        m_externalMemoryAllocated = static_cast<int>(std::min(static_cast<size_t>(INT_MAX), bm2.getSafeSize()));
-        v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(m_externalMemoryAllocated);
-    }
-    return m_pattern.get();
-}
-
 void Pattern::setPatternSpaceTransform(const AffineTransform& patternSpaceTransformation)
 {
     m_patternSpaceTransformation = patternSpaceTransformation;
@@ -106,4 +55,13 @@ void Pattern::setPatternSpaceTransform(const AffineTransform& patternSpaceTransf
         m_pattern.clear();
 }
 
+SkShader* Pattern::shader()
+{
+    if (!m_pattern) {
+        m_pattern = createShader();
+    }
+
+    return m_pattern.get();
+}
+
 }