Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

bench/DeferredSurfaceCopyBench.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 #include "GrRenderTarget.h"
@@ skipping 19 matching lines @@
         return fDiscardableContents ? "DeferredSurfaceCopy_discardable" :
             "DeferredSurfaceCopy_nonDiscardable";
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         // The canvas is not actually used for this test except to provide
         // configuration information: gpu, multisampling, size, etc?
         SkImageInfo info;
         info.fWidth = kSurfaceWidth;
         info.fHeight = kSurfaceHeight;
-        info.fColorType = kPMColor_SkColorType;
+        info.fColorType = kN32_SkColorType;
         info.fAlphaType = kPremul_SkAlphaType;
         const SkRect fullCanvasRect = SkRect::MakeWH(
             SkIntToScalar(kSurfaceWidth), SkIntToScalar(kSurfaceHeight));
         SkSurface* surface;
 #if SK_SUPPORT_GPU
         GrRenderTarget* rt = reinterpret_cast<GrRenderTarget*>(
             canvas->getDevice()->accessRenderTarget());
         if (NULL != rt) {
             surface = SkSurface::NewRenderTarget(rt->getContext(), info, rt->numSamples());
         } else
@@ skipping 22 matching lines @@
 private:
     bool fDiscardableContents;
 
     typedef SkBenchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new DeferredSurfaceCopyBench(false); )
 DEF_BENCH( return new DeferredSurfaceCopyBench(true); )