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

Source/core/layout/ImageQualityControllerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/layout/ImageQualityController.h"
 
 #include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "platform/graphics/GraphicsContext.h"
@@ skipping 32 matching lines @@
     setBodyInnerHTML("<img src='myimage' style='image-rendering: pixelated'></img>");
     LayoutObject* obj = document().body()->firstChild()->layoutObject();
 
     EXPECT_EQ(InterpolationNone, controller()->chooseInterpolationQuality(nullptr, obj, nullptr, nullptr, LayoutSize()));
 }
 
 #if !USE(LOW_QUALITY_IMAGE_INTERPOLATION)
 
 class TestImageAnimated : public Image {
 public:
-    virtual bool maybeAnimated() override { return true; }
-    virtual bool currentFrameKnownToBeOpaque() override { return false; }
-    virtual IntSize size() const override { return IntSize(); }
-    virtual void destroyDecodedData(bool) override { }
-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, SkXfermode::Mode, RespectImageOrientationEnum) override { }
+    bool maybeAnimated() override { return true; }
+    bool currentFrameKnownToBeOpaque() override { return false; }
+    IntSize size() const override { return IntSize(); }
+    void destroyDecodedData(bool) override { }
+    void draw(SkCanvas*, const SkPaint&, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum, const ImageFilterQualityHelper*) override { }
 };
 
 TEST_F(ImageQualityControllerTest, ImageMaybeAnimated)
 {
     setBodyInnerHTML("<img src='myimage'></img>");
     LayoutImage* img = toLayoutImage(document().body()->firstChild()->layoutObject());
 
     RefPtr<TestImageAnimated> testImage = adoptRef(new TestImageAnimated);
     EXPECT_EQ(InterpolationMedium, controller()->chooseInterpolationQuality(nullptr, img, testImage.get(), nullptr, LayoutSize()));
 }
 
 class TestImageWithContrast : public Image {
 public:
-    virtual bool maybeAnimated() override { return true; }
-    virtual bool currentFrameKnownToBeOpaque() override { return false; }
-    virtual IntSize size() const override { return IntSize(); }
-    virtual void destroyDecodedData(bool) override { }
-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, SkXfermode::Mode, RespectImageOrientationEnum) override { }
+    bool maybeAnimated() override { return true; }
+    bool currentFrameKnownToBeOpaque() override { return false; }
+    IntSize size() const override { return IntSize(); }
+    void destroyDecodedData(bool) override { }
+    void draw(SkCanvas*, const SkPaint&, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum, const ImageFilterQualityHelper*) override { }
 
-    virtual bool isBitmapImage() const override { return true; };
+    bool isBitmapImage() const override { return true; };
 };
 
 TEST_F(ImageQualityControllerTest, LowQualityFilterForContrast)
 {
     setBodyInnerHTML("<img src='myimage' style='image-rendering: -webkit-optimize-contrast'></img>");
     LayoutImage* img = toLayoutImage(document().body()->firstChild()->layoutObject());
 
     RefPtr<TestImageWithContrast> testImage = adoptRef(new TestImageWithContrast);
     EXPECT_EQ(InterpolationLow, controller()->chooseInterpolationQuality(nullptr, img, testImage.get(), testImage.get(), LayoutSize()));
 }
 
 class TestImageLowQuality : public Image {
 public:
-    virtual bool maybeAnimated() override { return true; }
-    virtual bool currentFrameKnownToBeOpaque() override { return false; }
-    virtual IntSize size() const override { return IntSize(1, 1); }
-    virtual void destroyDecodedData(bool) override { }
-    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, SkXfermode::Mode, RespectImageOrientationEnum) override { }
+    bool maybeAnimated() override { return true; }
+    bool currentFrameKnownToBeOpaque() override { return false; }
+    IntSize size() const override { return IntSize(1, 1); }
+    void destroyDecodedData(bool) override { }
+    void draw(SkCanvas*, const SkPaint&, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum, const ImageFilterQualityHelper*) override { }
 
-    virtual bool isBitmapImage() const override { return true; };
+    bool isBitmapImage() const override { return true; };
 };
 
 TEST_F(ImageQualityControllerTest, MediumQualityFilterForUnscaledImage)
 {
     setBodyInnerHTML("<img src='myimage'></img>");
     LayoutImage* img = toLayoutImage(document().body()->firstChild()->layoutObject());
 
     RefPtr<TestImageLowQuality> testImage = adoptRef(new TestImageLowQuality);
     OwnPtr<DisplayItemList> displayItemList = DisplayItemList::create();
     GraphicsContext context(displayItemList.get());
@@ skipping 96 matching lines @@
     EXPECT_FALSE(mockTimer->isActive());
     // Painted at the same size, so even though timer is still executing, don't go to low quality.
     EXPECT_EQ(InterpolationLow, controller()->chooseInterpolationQuality(&context, img, testImage.get(), testImage.get(), LayoutSize(4, 4)));
     // Check that the timer was not kicked. It should not have been, since the image was painted at the same size as last time.
     EXPECT_FALSE(mockTimer->isActive());
 }
 
 #endif
 
 } // namespace blink