Hide fields in SkImageInfo

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 40 matching lines @@
     SkBitmap bmp;
     bmp.allocN32Pixels(256, 256);
 
     for (int a = 0; a < 256; ++a) {
         uint32_t* pixels = bmp.getAddr32(0, a);
         for (int r = 0; r < 256; ++r) {
             pixels[r] = proc(SkColorSetARGB(a, r, 0, 0));
         }
     }
 
-    SkImageInfo info = bmp.info();
-    info.fColorType = colorType;
-    info.fAlphaType = kUnpremul_SkAlphaType;
+    const SkImageInfo info = SkImageInfo::Make(bmp.width(), bmp.height(),
+                                               colorType, kUnpremul_SkAlphaType);
     canvas->writePixels(info, bmp.getPixels(), bmp.rowBytes(), 0, 0);
 }
 
 DEF_GPUTEST(PremulAlphaRoundTrip, reporter, factory) {
     const SkImageInfo info = SkImageInfo::MakeN32Premul(256, 256);
 
     for (int dtype = 0; dtype < 2; ++dtype) {
 
         int glCtxTypeCnt = 1;
 #if SK_SUPPORT_GPU
@@ skipping 51 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]);
                     }
                 }
             }
         }
     }
 }