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

Source/platform/graphics/BitmapImage.cpp

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 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
@@ skipping 254 matching lines @@
 bool BitmapImage::hasColorProfile() const
 {
     return m_source.hasColorProfile();
 }
 
 String BitmapImage::filenameExtension() const
 {
     return m_source.filenameExtension();
 }
 
-void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, SkXfermode::Mode compositeOp, RespectImageOrientationEnum shouldRespectImageOrientation)
+bool BitmapImage::isLazyDecodedBitmap()
+{
+    SkBitmap bitmap;
+    if (!bitmapForCurrentFrame(&bitmap))
+        return false;
+    return DeferredImageDecoder::isLazyDecoded(bitmap);
+}
+
+bool BitmapImage::isImmutableBitmap()
+{
+    SkBitmap bitmap;
+    if (!bitmapForCurrentFrame(&bitmap))
+        return false;
+    return bitmap.isImmutable();
+}
+
+void BitmapImage::draw(SkCanvas* canvas, const SkPaint& paint, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum shouldRespectImageOrientation)
 {
     TRACE_EVENT0("skia", "BitmapImage::draw");
     SkBitmap bitmap;
     if (!bitmapForCurrentFrame(&bitmap))
         return; // It's too early and we don't have an image yet.
 
     FloatRect normDstRect = adjustForNegativeSize(dstRect);
     FloatRect normSrcRect = adjustForNegativeSize(srcRect);
     normSrcRect.intersect(FloatRect(0, 0, bitmap.width(), bitmap.height()));
 
     if (normSrcRect.isEmpty() || normDstRect.isEmpty())
         return; // Nothing to draw.
 
     ImageOrientation orientation = DefaultImageOrientation;
     if (shouldRespectImageOrientation == RespectImageOrientation)
         orientation = frameOrientationAtIndex(m_currentFrame);
 
-    GraphicsContextStateSaver saveContext(*ctxt, false);
+    int initialSaveCount = canvas->getSaveCount();
     if (orientation != DefaultImageOrientation) {
-        saveContext.save();
+        canvas->save();
 
         // ImageOrientation expects the origin to be at (0, 0)
-        ctxt->translate(normDstRect.x(), normDstRect.y());
+        canvas->translate(normDstRect.x(), normDstRect.y());
         normDstRect.setLocation(FloatPoint());
 
-        ctxt->concatCTM(orientation.transformFromDefault(normDstRect.size()));
+        canvas->concat(affineTransformToSkMatrix(orientation.transformFromDefault(normDstRect.size())));
 
         if (orientation.usesWidthAsHeight()) {
             // The destination rect will have it's width and height already reversed for the orientation of
             // the image, as it was needed for page layout, so we need to reverse it back here.
             normDstRect = FloatRect(normDstRect.x(), normDstRect.y(), normDstRect.height(), normDstRect.width());
         }
     }
 
-    bool isLazyDecoded = DeferredImageDecoder::isLazyDecoded(bitmap);
-    bool isOpaque = bitmap.isOpaque();
+    SkRect skSrcRect = normSrcRect;
+    canvas->drawBitmapRectToRect(bitmap, &skSrcRect, normDstRect, &paint);
+    canvas->restoreToCount(initialSaveCount);
 
-    {
-        SkPaint paint;
-        SkRect skSrcRect = normSrcRect;
-        int initialSaveCount = ctxt->preparePaintForDrawRectToRect(&paint, skSrcRect, normDstRect, compositeOp, !isOpaque, isLazyDecoded, bitmap.isImmutable());
-        // We want to filter it if we decided to do interpolation above, or if
-        // there is something interesting going on with the matrix (like a rotation).
-        // Note: for serialization, we will want to subset the bitmap first so we
-        // don't send extra pixels.
-        ctxt->drawBitmapRect(bitmap, &skSrcRect, normDstRect, &paint);
-        ctxt->canvas()->restoreToCount(initialSaveCount);
-    }
-
-    if (isLazyDecoded)
+    if (DeferredImageDecoder::isLazyDecoded(bitmap))
         PlatformInstrumentation::didDrawLazyPixelRef(bitmap.getGenerationID());
 
     if (ImageObserver* observer = imageObserver())
         observer->didDraw(this);
 
     startAnimation();
 }
 
 size_t BitmapImage::frameCount()
 {
@@ skipping 329 matching lines @@
 
     return m_isSolidColor && !m_currentFrame;
 }
 
 Color BitmapImage::solidColor() const
 {
     return m_solidColor;
 }
 
 } // namespace blink