Hide fields in SkImageInfo

src/gpu/SkGrPixelRef.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 98 matching lines @@
     // For surfaces that are both textures and render targets, the texture owns the
     // render target but not vice versa. So we ref the texture to keep both alive for
     // the lifetime of this pixel ref.
     fSurface = SkSafeRef(surface->asTexture());
     if (NULL == fSurface) {
         fSurface = SkSafeRef(surface);
     }
     fUnlock = transferCacheLock;
 
     if (fSurface) {
-        SkASSERT(info.fWidth <= fSurface->width());
-        SkASSERT(info.fHeight <= fSurface->height());
+        SkASSERT(info.width() <= fSurface->width());
+        SkASSERT(info.height() <= fSurface->height());
     }
 }
 
 SkGrPixelRef::~SkGrPixelRef() {
     if (fUnlock) {
         GrContext* context = fSurface->getContext();
         GrTexture* texture = fSurface->asTexture();
         if (NULL != context && NULL != texture) {
             context->unlockScratchTexture(texture);
         }
@@ skipping 28 matching lines @@
     }
 
     int left, top, width, height;
     if (NULL != subset) {
         left = subset->fLeft;
         width = subset->width();
         top = subset->fTop;
         height = subset->height();
     } else {
         left = 0;
-        width = this->info().fWidth;
+        width = this->info().width();
         top = 0;
-        height = this->info().fHeight;
+        height = this->info().height();
     }
     if (!dst->tryAllocN32Pixels(width, height)) {
         SkDebugf("SkGrPixelRef::onReadPixels failed to alloc bitmap for result!\n");
         return false;
     }
     SkAutoLockPixels al(*dst);
     void* buffer = dst->getPixels();
     return fSurface->readPixels(left, top, width, height,
                                 kSkia8888_GrPixelConfig,
                                 buffer, dst->rowBytes());
 }