Remove SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS

cc/resources/ui_resource_bitmap.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/ui_resource_bitmap.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
@@ skipping 36 matching lines @@
   wrap_mode_ = CLAMP_TO_EDGE;
   opaque_ = (format == ETC1);
 }
 
 UIResourceBitmap::UIResourceBitmap(const SkBitmap& skbitmap) {
   DCHECK_EQ(skbitmap.width(), skbitmap.rowBytesAsPixels());
   DCHECK(skbitmap.isImmutable());
 
   skia::RefPtr<SkPixelRef> pixel_ref = skia::SharePtr(skbitmap.pixelRef());
   const SkImageInfo& info = pixel_ref->info();
-  Create(pixel_ref,
-         gfx::Size(info.fWidth, info.fHeight),
+  Create(pixel_ref, gfx::Size(info.width(), info.height()),
          SkColorTypeToUIResourceFormat(skbitmap.colorType()));
 
   SetOpaque(skbitmap.isOpaque());
 }
 
 UIResourceBitmap::UIResourceBitmap(const gfx::Size& size, bool is_opaque) {
   SkAlphaType alphaType = is_opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
   SkImageInfo info =
       SkImageInfo::MakeN32(size.width(), size.height(), alphaType);
   skia::RefPtr<SkPixelRef> pixel_ref = skia::AdoptRef(
@@ skipping 17 matching lines @@
 
 AutoLockUIResourceBitmap::~AutoLockUIResourceBitmap() {
   bitmap_.pixel_ref_->unlockPixels();
 }
 
 const uint8_t* AutoLockUIResourceBitmap::GetPixels() const {
   return static_cast<const uint8_t*>(bitmap_.pixel_ref_->pixels());
 }
 
 }  // namespace cc