Re-land: Make 2D canvas smarter about chosing whether or not to use GPU acceleration

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.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 "modules/canvas2d/CanvasRenderingContext2D.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
@@ skipping 18 matching lines @@
 
 enum BitmapOpacity {
     OpaqueBitmap,
     TransparentBitmap
 };
 
 class FakeImageSource : public CanvasImageSource {
 public:
     FakeImageSource(IntSize, BitmapOpacity);
 
-    PassRefPtr<Image> getSourceImageForCanvas(SourceImageStatus*) const override;
+    PassRefPtr<Image> getSourceImageForCanvas(SourceImageStatus*, AccelerationHint) const override;
 
     bool wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigin) const override { return false; }
     FloatSize elementSize() const override { return FloatSize(m_size); }
     bool isOpaque() const override { return m_isOpaque; }
 
     ~FakeImageSource() override { }
 
 private:
     IntSize m_size;
     RefPtr<Image> m_image;
     bool m_isOpaque;
 };
 
 FakeImageSource::FakeImageSource(IntSize size, BitmapOpacity opacity)
     : m_size(size)
     , m_isOpaque(opacity == OpaqueBitmap)
 {
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(m_size.width(), m_size.height()));
     surface->getCanvas()->clear(opacity == OpaqueBitmap ? SK_ColorWHITE : SK_ColorTRANSPARENT);
     RefPtr<SkImage> image = adoptRef(surface->newImageSnapshot());
     m_image = StaticBitmapImage::create(image);
 }
 
-PassRefPtr<Image> FakeImageSource::getSourceImageForCanvas(SourceImageStatus* status) const
+PassRefPtr<Image> FakeImageSource::getSourceImageForCanvas(SourceImageStatus* status, AccelerationHint) const
 {
     if (status)
         *status = NormalSourceImageStatus;
     return m_image;
 }
 
 //============================================================================
 
 class CanvasRenderingContext2DTest : public ::testing::Test {
 protected:
@@ skipping 550 matching lines @@
     // The canvasChanged notification must be immediate, and not deferred until paint time
     // because offscreen canvases, which are not painted, also need to emit notifications.
     EXPECT_CALL(*observer, canvasChanged(&canvasElement(), FloatRect(0, 0, 1, 1))).Times(1);
     context2d()->fillRect(0, 0, 1, 1);
     Mock::VerifyAndClearExpectations(observer.get());
 
     canvasElement().removeObserver(observer.get());
 }
 
 } // namespace blink