Remove ImageSkia::empty and ImageSkia::extractSubset

ui/base/resource/resource_bundle.cc

 // Copyright (c) 2012 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 "ui/base/resource/resource_bundle.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 28 matching lines @@
 const int kMediumFontSizeDelta = 3;
 const int kLargeFontSizeDelta = 8;
 
 // Returns the actual scale factor of |bitmap| given the image representations
 // which have already been added to |image|.
 // TODO(pkotwicz): Remove this once we are no longer loading 1x resources
 // as part of 2x data packs.
 ui::ScaleFactor GetActualScaleFactor(const gfx::ImageSkia& image,
                                      const SkBitmap& bitmap,
                                      ui::ScaleFactor data_pack_scale_factor) {
-  if (image.empty())
+  if (image.isNull())
     return data_pack_scale_factor;
 
   return ui::GetScaleFactorFromScale(
       static_cast<float>(bitmap.width()) / image.width());
 }
 
 // If 2x resource is missing from |image| or is the incorrect size,
 // logs the resource id and creates a 2x version of the resource.
 // Blends the created resource with red to make it distinguishable from
 // bitmaps in the resource pak.
@@ skipping 259 matching lines @@
         if (gfx::Screen::IsDIPEnabled()) {
           scale_factor = GetActualScaleFactor(image_skia, *bitmap,
               data_packs_[i]->GetScaleFactor());
         } else {
           scale_factor = ui::SCALE_FACTOR_100P;
         }
         image_skia.AddRepresentation(gfx::ImageSkiaRep(*bitmap, scale_factor));
       }
     }
 
-    if (image_skia.empty()) {
+    if (image_skia.isNull()) {
       LOG(WARNING) << "Unable to load image with id " << resource_id;
       NOTREACHED();  // Want to assert in debug mode.
       // The load failed to retrieve the image; show a debugging red square.
       return GetEmptyImage();
     }
 
     Create2xResourceIfMissing(image_skia, resource_id);
 
     image = gfx::Image(image_skia);
   }
@@ skipping 225 matching lines @@
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
     bitmap.allocPixels();
     bitmap.eraseARGB(255, 255, 0, 0);
     empty_image_ = gfx::Image(bitmap);
   }
   return empty_image_;
 }
 
 }  // namespace ui