Hide fields in SkImageInfo

tests/BitmapCopyTest.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 "SkBitmap.h"
 #include "SkRect.h"
 #include "Test.h"
@@ skipping 591 matching lines @@
         { true,  { 0, 0 }, { 4, 4 }, { 0, 0 }, { 0, 0, 4, 4 } },
         { true,  { 1, 1 }, { 2, 2 }, { 0, 0 }, { 1, 1, 3, 3 } },
         { true,  { 2, 2 }, { 4, 4 }, { 0, 0 }, { 2, 2, 4, 4 } },
         { true,  {-1,-1 }, { 2, 2 }, { 1, 1 }, { 0, 0, 1, 1 } },
         { false, {-1,-1 }, { 1, 1 }, { 0, 0 }, { 0, 0, 0, 0 } },
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
         clear_4x4_pixels(dstPixels);
 
-        dstInfo.fWidth = gRec[i].fRequestedDstSize.width();
-        dstInfo.fHeight = gRec[i].fRequestedDstSize.height();
+        dstInfo = dstInfo.makeWH(gRec[i].fRequestedDstSize.width(),
+                                 gRec[i].fRequestedDstSize.height());
         bool success = srcBM.readPixels(dstInfo, dstPixels, rowBytes,
                                         gRec[i].fRequestedSrcLoc.x(), gRec[i].fRequestedSrcLoc.y());
         
         REPORTER_ASSERT(reporter, gRec[i].fExpectedSuccess == success);
         if (success) {
             const SkIRect srcR = gRec[i].fExpectedSrcR;
             const int dstX = gRec[i].fExpectedDstLoc.x();
             const int dstY = gRec[i].fExpectedDstLoc.y();
             // Walk the dst pixels, and check if we got what we expected
             for (int y = 0; y < H; ++y) {
                 for (int x = 0; x < W; ++x) {
                     SkPMColor dstC = dstPixels[y*4+x];
                     // get into src coordinates
                     int sx = x - dstX + srcR.x();
                     int sy = y - dstY + srcR.y();
                     if (srcR.contains(sx, sy)) {
                         REPORTER_ASSERT(reporter, check_4x4_pixel(dstC, sx, sy));
                     } else {
                         REPORTER_ASSERT(reporter, 0 == dstC);
                     }
                 }
             }
         }
     }
 }