Removing the dependency on GraphicsContext for drawing images in 2D canvas

Source/platform/graphics/Image.cpp

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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
@@ skipping 89 matching lines @@
 void Image::fillWithSolidColor(GraphicsContext* ctxt, const FloatRect& dstRect, const Color& color, SkXfermode::Mode op)
 {
     if (!color.alpha())
         return;
 
     SkXfermode::Mode xferMode = !color.hasAlpha() && op == SkXfermode::kSrcOver_Mode ?
         SkXfermode::kSrc_Mode : op;
     ctxt->fillRect(dstRect, color, xferMode);
 }
 
-FloatRect Image::adjustForNegativeSize(const FloatRect& rect)
-{
-    FloatRect norm = rect;
-    if (norm.width() < 0) {
-        norm.setX(norm.x() + norm.width());
-        norm.setWidth(-norm.width());
-    }
-    if (norm.height() < 0) {
-        norm.setY(norm.y() + norm.height());
-        norm.setHeight(-norm.height());
-    }
-    return norm;
-}
-
 void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, SkXfermode::Mode op, const IntSize& repeatSpacing)
 {
     if (mayFillWithSolidColor()) {
         fillWithSolidColor(ctxt, destRect, solidColor(), op);
         return;
     }
 
     // See <https://webkit.org/b/59043>.
     ASSERT(!isBitmapImage() || notSolidColor());
 
@@ skipping 12 matching lines @@
     oneTileRect.setY(destRect.y() + fmodf(fmodf(-srcPoint.y(), actualTileSize.height()) - actualTileSize.height(), actualTileSize.height()));
     oneTileRect.setSize(scaledTileSize);
 
     // Check and see if a single draw of the image can cover the entire area we are supposed to tile.
     if (oneTileRect.contains(destRect)) {
         FloatRect visibleSrcRect;
         visibleSrcRect.setX((destRect.x() - oneTileRect.x()) / scale.width());
         visibleSrcRect.setY((destRect.y() - oneTileRect.y()) / scale.height());
         visibleSrcRect.setWidth(destRect.width() / scale.width());
         visibleSrcRect.setHeight(destRect.height() / scale.height());
-        draw(ctxt, destRect, visibleSrcRect, op, DoNotRespectImageOrientation);
+        ctxt->drawImage(this, destRect, visibleSrcRect, op, DoNotRespectImageOrientation);
         return;
     }
 
     FloatRect tileRect(FloatPoint(), intrinsicTileSize);
     drawPattern(ctxt, tileRect, scale, oneTileRect.location(), op, destRect, repeatSpacing);
 
     startAnimation();
 }
 
 // FIXME: Merge with the other drawTiled eventually, since we need a combination of both for some things.
@@ skipping 105 matching lines @@
     const float adjustedY = phase.y() + normSrcRect.y() * scale.height();
     localMatrix.setTranslate(SkFloatToScalar(adjustedX), SkFloatToScalar(adjustedY));
 
     // Because no resizing occurred, the shader transform should be
     // set to the pattern's transform, which just includes scale.
     localMatrix.preScale(scale.width(), scale.height());
 
     SkBitmap bitmapToPaint;
     bitmap.extractSubset(&bitmapToPaint, enclosingIntRect(normSrcRect));
 
-    bool isLazyDecoded = DeferredImageDecoder::isLazyDecoded(bitmap);
     {
-        SkPaint paint;
-        int initialSaveCount = context->preparePaintForDrawRectToRect(&paint, floatSrcRect,
-            destRect, compositeOp, !bitmap.isOpaque(), isLazyDecoded, bitmap.isImmutable());
+        SkPaint paint = context->fillPaint();
+        paint.setColor(SK_ColorBLACK);
+        paint.setXfermodeMode(compositeOp);
+        paint.setFilterQuality(context->computeFilterQuality(this, destRect, normSrcRect));
+        paint.setAntiAlias(context->shouldAntialiasImages());
         RefPtr<SkShader> shader = createPatternShader(bitmapToPaint, localMatrix, paint,
             FloatSize(repeatSpacing.width() / scale.width(), repeatSpacing.height() / scale.height()));
-
         paint.setShader(shader.get());
         context->drawRect(destRect, paint);
-        context->canvas()->restoreToCount(initialSaveCount);
     }
 
-    if (isLazyDecoded)
+    if (DeferredImageDecoder::isLazyDecoded(bitmap))
         PlatformInstrumentation::didDrawLazyPixelRef(bitmap.getGenerationID());
 }
 
 void Image::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
     intrinsicRatio = size();
     intrinsicWidth = Length(intrinsicRatio.width(), Fixed);
     intrinsicHeight = Length(intrinsicRatio.height(), Fixed);
 }
 
 PassRefPtr<Image> Image::imageForDefaultFrame()
 {
     RefPtr<Image> image(this);
 
     return image.release();
 }
 
 bool Image::bitmapForCurrentFrame(SkBitmap* bitmap)
 {
     return false;
 }
 
 PassRefPtr<SkImage> Image::skImage()
 {
     return nullptr;
 }
 
 } // namespace blink