don't create explicit bitmapdevice when not needed

tests/CanvasTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*  Description:
  *      This test defines a series of elementatry test steps that perform
  *      a single or a small group of canvas API calls. Each test step is
@@ skipping 787 matching lines @@
 };
 
 // unused
 static void TestProxyCanvasStateConsistency(
     skiatest::Reporter* reporter,
     CanvasTestStep* testStep,
     const SkCanvas& referenceCanvas) {
 
     SkBitmap indirectStore;
     createBitmap(&indirectStore, 0xFFFFFFFF);
-    SkBitmapDevice indirectDevice(indirectStore);
-    SkCanvas indirectCanvas(&indirectDevice);
+    SkCanvas indirectCanvas(indirectStore);
     SkProxyCanvas proxyCanvas(&indirectCanvas);
     testStep->setAssertMessageFormat(kProxyDrawAssertMessageFormat);
     testStep->draw(&proxyCanvas, reporter);
     // Verify that the SkProxyCanvas reports consitent state
     testStep->setAssertMessageFormat(kProxyStateAssertMessageFormat);
     AssertCanvasStatesEqual(reporter, &proxyCanvas, &referenceCanvas,
         testStep);
     // Verify that the indirect canvas reports consitent state
     testStep->setAssertMessageFormat(kProxyIndirectStateAssertMessageFormat);
     AssertCanvasStatesEqual(reporter, &indirectCanvas, &referenceCanvas,
         testStep);
 }
 
 // unused
 static void TestNWayCanvasStateConsistency(
     skiatest::Reporter* reporter,
     CanvasTestStep* testStep,
     const SkCanvas& referenceCanvas) {
 
     SkBitmap indirectStore1;
     createBitmap(&indirectStore1, 0xFFFFFFFF);
-    SkBitmapDevice indirectDevice1(indirectStore1);
-    SkCanvas indirectCanvas1(&indirectDevice1);
+    SkCanvas indirectCanvas1(indirectStore1);
 
     SkBitmap indirectStore2;
     createBitmap(&indirectStore2, 0xFFFFFFFF);
-    SkBitmapDevice indirectDevice2(indirectStore2);
-    SkCanvas indirectCanvas2(&indirectDevice2);
+    SkCanvas indirectCanvas2(indirectStore2);
 
     SkISize canvasSize = referenceCanvas.getDeviceSize();
     SkNWayCanvas nWayCanvas(canvasSize.width(), canvasSize.height());
     nWayCanvas.addCanvas(&indirectCanvas1);
     nWayCanvas.addCanvas(&indirectCanvas2);
 
     testStep->setAssertMessageFormat(kNWayDrawAssertMessageFormat);
     testStep->draw(&nWayCanvas, reporter);
     // Verify that the SkProxyCanvas reports consitent state
     testStep->setAssertMessageFormat(kNWayStateAssertMessageFormat);
@@ skipping 11 matching lines @@
 /*
  * This sub-test verifies that the test step passes when executed
  * with SkCanvas and with classes derrived from SkCanvas. It also verifies
  * that the all canvas derivatives report the same state as an SkCanvas
  * after having executed the test step.
  */
 static void TestOverrideStateConsistency(skiatest::Reporter* reporter,
                                          CanvasTestStep* testStep) {
     SkBitmap referenceStore;
     createBitmap(&referenceStore, 0xFFFFFFFF);
-    SkBitmapDevice referenceDevice(referenceStore);
-    SkCanvas referenceCanvas(&referenceDevice);
+    SkCanvas referenceCanvas(referenceStore);
     testStep->setAssertMessageFormat(kCanvasDrawAssertMessageFormat);
     testStep->draw(&referenceCanvas, reporter);
 
     SkDeferredCanvasTester::TestDeferredCanvasStateConsistency(reporter, testStep, referenceCanvas, false);
 
     SkDeferredCanvasTester::TestDeferredCanvasStateConsistency(reporter, testStep, referenceCanvas, true);
 
     // The following test code is disabled because SkProxyCanvas is
     // missing a lot of virtual overrides on get* methods, which are used
     // to verify canvas state.
@@ skipping 67 matching lines @@
         if (testStepArray()[testStep]->enablePdfTesting()) {
             TestPdfDevice(reporter, testStepArray()[testStep]);
         }
     }
 
     // Explicitly call reset(), so we don't leak the pixels (since kTestBitmap is a global)
     kTestBitmap.reset();
 
     test_newraster(reporter);
 }