| Index: ui/base/resource/resource_bundle.cc
|
| diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
|
| index f55d0481239556fca091a07c33d56cc6fe4c802b..14cf974c3defee73ee632e1eb6698b85d6396205 100644
|
| --- a/ui/base/resource/resource_bundle.cc
|
| +++ b/ui/base/resource/resource_bundle.cc
|
| @@ -46,7 +46,7 @@ const int kLargeFontSizeDelta = 8;
|
| 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(
|
| @@ -326,7 +326,7 @@ gfx::Image& ResourceBundle::GetImageNamed(int resource_id) {
|
| }
|
| }
|
|
|
| - 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.
|
|
|