Removing GraphicsContext from ImageBuffer

Source/core/layout/shapes/Shape.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. 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.
@@ skipping 25 matching lines @@
 #include "core/fetch/ImageResource.h"
 #include "core/layout/shapes/BoxShape.h"
 #include "core/layout/shapes/PolygonShape.h"
 #include "core/layout/shapes/RasterShape.h"
 #include "core/layout/shapes/RectangleShape.h"
 #include "core/style/ComputedStyle.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "platform/LengthFunctions.h"
 #include "platform/geometry/FloatRoundedRect.h"
 #include "platform/geometry/FloatSize.h"
-#include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "wtf/ArrayBufferContents.h"
 #include "wtf/MathExtras.h"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
 static PassOwnPtr<Shape> createInsetShape(const FloatRoundedRect& bounds)
 {
@@ skipping 135 matching lines @@
 
 PassOwnPtr<Shape> Shape::createRasterShape(Image* image, float threshold, const LayoutRect& imageR, const LayoutRect& marginR, WritingMode writingMode, float margin)
 {
     IntRect imageRect = pixelSnappedIntRect(imageR);
     IntRect marginRect = pixelSnappedIntRect(marginR);
 
     OwnPtr<RasterShapeIntervals> intervals = adoptPtr(new RasterShapeIntervals(marginRect.height(), -marginRect.y()));
     OwnPtr<ImageBuffer> imageBuffer = ImageBuffer::create(imageRect.size());
 
     if (image && imageBuffer) {
-        GraphicsContext* graphicsContext = imageBuffer->context();
         // FIXME: This is not totally correct but it is needed to prevent shapes
         // that loads SVG Images during paint invalidations to mark layoutObjects for
         // layout, which is not allowed. See https://crbug.com/429346
         ImageObserverDisabler disabler(image);
-        graphicsContext->drawImage(image, IntRect(IntPoint(), imageRect.size()));
+        SkPaint paint;
+        IntRect imageSourceRect(IntPoint(), image->size());
+        IntRect imageDestRect(IntPoint(), imageRect.size());
+        image->draw(imageBuffer->canvas(), paint, imageDestRect, imageSourceRect, DoNotRespectImageOrientation, Image::DoNotClampImageToSourceRect);
 
         WTF::ArrayBufferContents contents;
         imageBuffer->getImageData(Unmultiplied, IntRect(IntPoint(), imageRect.size()), contents);
         RefPtr<DOMArrayBuffer> arrayBuffer = DOMArrayBuffer::create(contents);
         RefPtr<DOMUint8ClampedArray> pixelArray = DOMUint8ClampedArray::create(arrayBuffer, 0, arrayBuffer->byteLength());
         unsigned pixelArrayOffset = 3; // Each pixel is four bytes: RGBA.
         uint8_t alphaPixelThreshold = threshold * 255;
 
         ASSERT(static_cast<unsigned>(imageRect.width() * imageRect.height() * 4) == pixelArray->length());
 
@@ skipping 27 matching lines @@
     FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height());
     FloatRoundedRect bounds(rect, roundedRect.radii());
     OwnPtr<Shape> shape = createInsetShape(bounds);
     shape->m_writingMode = writingMode;
     shape->m_margin = margin;
 
     return shape.release();
 }
 
 } // namespace blink