Begin kLegacyFontHost_InitType cleanup

tests/PremulAlphaRoundTripTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkConfig8888.h"
@@ skipping 56 matching lines @@
     const SkImageInfo info = SkImageInfo::MakeN32Premul(256, 256);
 
     for (int dtype = 0; dtype < 2; ++dtype) {
 
         int glCtxTypeCnt = 1;
 #if SK_SUPPORT_GPU
         if (0 != dtype)  {
             glCtxTypeCnt = GrContextFactory::kGLContextTypeCnt;
         }
 #endif
+        SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
         for (int glCtxType = 0; glCtxType < glCtxTypeCnt; ++glCtxType) {
             SkAutoTUnref<SkBaseDevice> device;
             if (0 == dtype) {
-                device.reset(SkBitmapDevice::Create(info));
+                device.reset(SkBitmapDevice::Create(info, props));
             } else {
 #if SK_SUPPORT_GPU
                 GrContextFactory::GLContextType type =
                     static_cast<GrContextFactory::GLContextType>(glCtxType);
                 if (!GrContextFactory::IsRenderingGLContext(type)) {
                     continue;
                 }
                 GrContext* ctx = factory->get(type);
                 if (NULL == ctx) {
                     continue;
                 }
-                SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
                 device.reset(SkGpuDevice::Create(ctx, SkSurface::kNo_Budgeted, info, 0, &props));
 #else
                 continue;
 #endif
             }
             SkCanvas canvas(device);
 
             for (size_t upmaIdx = 0; upmaIdx < SK_ARRAY_COUNT(gUnpremul); ++upmaIdx) {
                 fillCanvas(&canvas, gUnpremul[upmaIdx].fColorType, gUnpremul[upmaIdx].fPackProc);
 
@@ skipping 21 matching lines @@
                         if (pixels1[x] != pixels2[x]) {
                             SkDebugf("%x != %x, x = %d, y = %d\n", pixels1[x], pixels2[x], x, y);
                         }
                         REPORTER_ASSERT(reporter, success = pixels1[x] == pixels2[x]);
                     }
                 }
             }
         }
     }
 }