Hide fields in SkImageInfo

src/core/SkCanvas.cpp

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCanvas.h"
 #include "SkCanvasPriv.h"
@@ skipping 613 matching lines @@
     if (!device) {
         return false;
     }
 
     const SkISize size = this->getBaseLayerSize();
     SkIRect srcR = SkIRect::MakeXYWH(x, y, origInfo.width(), origInfo.height());
     if (!srcR.intersect(0, 0, size.width(), size.height())) {
         return false;
     }
 
-    SkImageInfo info = origInfo;
     // the intersect may have shrunk info's logical size
-    info.fWidth = srcR.width();
-    info.fHeight = srcR.height();
+    const SkImageInfo info = origInfo.makeWH(srcR.width(), srcR.height());
 
     // if x or y are negative, then we have to adjust pixels
     if (x > 0) {
         x = 0;
     }
     if (y > 0) {
         y = 0;
     }
     // here x,y are either 0 or negative
     dstP = ((char*)dstP - y * rowBytes - x * info.bytesPerPixel());
@@ skipping 31 matching lines @@
     SkIRect target = SkIRect::MakeXYWH(x, y, origInfo.width(), origInfo.height());
     if (!target.intersect(0, 0, size.width(), size.height())) {
         return false;
     }
 
     SkBaseDevice* device = this->getDevice();
     if (!device) {
         return false;
     }
 
-    SkImageInfo info = origInfo;
     // the intersect may have shrunk info's logical size
-    info.fWidth = target.width();
-    info.fHeight = target.height();
+    const SkImageInfo info = origInfo.makeWH(target.width(), target.height());
 
     // if x or y are negative, then we have to adjust pixels
     if (x > 0) {
         x = 0;
     }
     if (y > 0) {
         y = 0;
     }
     // here x,y are either 0 or negative
     pixels = ((const char*)pixels - y * rowBytes - x * info.bytesPerPixel());
@@ skipping 1873 matching lines @@
     }
 
     if (NULL != matrix) {
         canvas->concat(*matrix);
     }
 }
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }