Improved heuristic for disable 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 "modules/canvas2d/CanvasRenderingContext2D.h"
 
 #include "core/fetch/MemoryCache.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
@@ skipping 796 matching lines @@
 
     std::unique_ptr<FakeAcceleratedImageBufferSurfaceForTesting> fakeAccelerateSurface = wrapUnique(new FakeAcceleratedImageBufferSurfaceForTesting(IntSize(10, 10), NonOpaque));
     canvasElement().createImageBufferUsingSurfaceForTesting(std::move(fakeAccelerateSurface));
 
     NonThrowableExceptionState exceptionState;
 
     CanvasRenderingContext2D* context = context2d();
     EXPECT_TRUE(context->isAccelerationOptimalForCanvasContent());
 
     context->fillRect(10, 10, 100, 100);
-    EXPECT_FALSE(context->isAccelerationOptimalForCanvasContent());
-
-    context->drawImage(canvasElement().getExecutionContext(), &m_opaqueBitmap, 0, 0, 1, 1, 0, 0, 10, 10, exceptionState);
     EXPECT_TRUE(context->isAccelerationOptimalForCanvasContent());
 
     int numReps = 100;
     for (int i = 0; i < numReps; i++) {
-        context->fillRect(10, 10, 100, 100);
+        context->fillText("Text", 10, 10, 1); // faster with no acceleration
+    }
+    EXPECT_FALSE(context->isAccelerationOptimalForCanvasContent());
+
+    for (int i = 0; i < numReps; i++) {
+        context->fillRect(10, 10, 200, 200); // faster with acceleration
+    }
+    EXPECT_TRUE(context->isAccelerationOptimalForCanvasContent());
+
+    for (int i = 0; i < numReps * 100; i++) {
+        context->strokeText("Text", 10, 10, 1); // faster with no acceleration
     }
     EXPECT_FALSE(context->isAccelerationOptimalForCanvasContent());
 }
 
 TEST_F(CanvasRenderingContext2DTest, DisableAcceleration)
 {
     createContext(NonOpaque);
 
     std::unique_ptr<FakeAcceleratedImageBufferSurfaceForTesting> fakeAccelerateSurface = wrapUnique(new FakeAcceleratedImageBufferSurfaceForTesting(IntSize(10, 10), NonOpaque));
     canvasElement().createImageBufferUsingSurfaceForTesting(std::move(fakeAccelerateSurface));
@@ skipping 12 matching lines @@
     EXPECT_FALSE(canvasElement().buffer()->isAccelerated());
 
     context->fillRect(10, 10, 100, 100);
 
     EXPECT_EQ(0, getCurrentGPUMemoryUsage());
     EXPECT_EQ(0, getGlobalGPUMemoryUsage());
     EXPECT_EQ(0u, getGlobalAcceleratedImageBufferCount());
 }
 
 } // namespace blink