Loading/Creating images for mutiple scale factors on the fly

This allow us not to load all (1x and 2x) resources at startup time, and also unload resources when they become unnecessary.

* Converted Menu's radio button to use ImageSkiaSource
* Converted Network related icons to use ImageSkiaSource

I'll create separate CL to load resources in the ResourceBundle on the fly.


BUG=122992
TEST=ImageSkiaTest.*

Review URL: https://chromiumcodereview.appspot.com/10694045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145251 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/ui/gfx/image/image_skia_rep.cc b/ui/gfx/image/image_skia_rep.cc
index fe38230..be0331a 100644
--- a/ui/gfx/image/image_skia_rep.cc
+++ b/ui/gfx/image/image_skia_rep.cc
@@ -4,6 +4,8 @@
 
 #include "ui/gfx/image/image_skia_rep.h"
 
+#include "ui/gfx/size.h"
+
 namespace gfx {
 
 ImageSkiaRep::ImageSkiaRep()
@@ -13,13 +15,13 @@ ImageSkiaRep::ImageSkiaRep()
 ImageSkiaRep::~ImageSkiaRep() {
 }
 
-ImageSkiaRep::ImageSkiaRep(int width, int height,
+ImageSkiaRep::ImageSkiaRep(const gfx::Size& size,
                            ui::ScaleFactor scale_factor)
     : scale_factor_(scale_factor) {
   float scale = ui::GetScaleFactorScale(scale_factor);
   bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
-                    static_cast<int>(width * scale),
-                    static_cast<int>(height * scale));
+                    static_cast<int>(size.width() * scale),
+                    static_cast<int>(size.height() * scale));
   bitmap_.allocPixels();
 }