Hide fields in SkImageInfo

tests/RecordReplaceDrawTest.cpp

 /*
  * Copyright 2014 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 "Test.h"
@@ skipping 54 matching lines @@
     assert_type<SkRecords::Save>(r, rerecord, 0);
     assert_type<SkRecords::Save>(r, rerecord, 1);
     assert_type<SkRecords::Restore>(r, rerecord, 2);
     assert_type<SkRecords::Restore>(r, rerecord, 3);
 }
 
 static SkImage* make_image(SkColor color) {
     const SkPMColor pmcolor = SkPreMultiplyColor(color);
     const SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
     const size_t rowBytes = info.minRowBytes();
-    const size_t size = rowBytes * info.fHeight;
+    const size_t size = rowBytes * info.height();
 
     SkAutoMalloc addr(size);
     sk_memset32((SkPMColor*)addr.get(), pmcolor, SkToInt(size >> 2));
 
     return SkImage::NewRasterCopy(info, addr.get(), rowBytes);
 }
 
 // Test out the layer replacement functionality with and w/o a BBH
 void test_replacements(skiatest::Reporter* r, bool useBBH) {
     SkRecord record;
@@ skipping 30 matching lines @@
     assert_type<SkRecords::Save>(r, rerecord, 0);
     assert_type<SkRecords::DrawBitmapRectToRect>(r, rerecord, 1);
     assert_type<SkRecords::DrawRect>(r, rerecord, 2);
     assert_type<SkRecords::Restore>(r, rerecord, 3);
 }
 
 DEF_TEST(RecordReplaceDraw_Replace, r)        { test_replacements(r, false); }
 DEF_TEST(RecordReplaceDraw_ReplaceWithBBH, r) { test_replacements(r, true); }
 
 #endif