Revert of Revert "Revert of https://codereview.chromium.org/129423002/"

src/core/SkScaledImageCache.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkScaledImageCache.h"
 #include "SkMipMap.h"
 #include "SkOnce.h"
@@ skipping 275 matching lines @@
     SkDiscardableMemory* dm = fFactory(size);
     if (NULL == dm) {
         return false;
     }
 
     // can relax when we have bitmap::asImageInfo
     if (SkBitmap::kARGB_8888_Config != bitmap->config()) {
         return false;
     }
 
-    SkImageInfo info = SkImageInfo::MakeN32(bitmap->width(), bitmap->height(),
-                                            bitmap->alphaType());
+    SkImageInfo info = {
+        bitmap->width(),
+        bitmap->height(),
+        kPMColor_SkColorType,
+        bitmap->alphaType()
+    };
 
-    bitmap->installPixelRef(SkNEW_ARGS(SkOneShotDiscardablePixelRef,
+    bitmap->setPixelRef(SkNEW_ARGS(SkOneShotDiscardablePixelRef,
                                    (info, dm, bitmap->rowBytes())))->unref();
     bitmap->lockPixels();
     return bitmap->readyToDraw();
 }
 
 SkScaledImageCache::SkScaledImageCache(DiscardableFactory factory) {
     this->init();
     fDiscardableFactory = factory;
 
     fAllocator = SkNEW_ARGS(SkScaledImageCacheDiscardableAllocator, (factory));
@@ skipping 478 matching lines @@
     return SkScaledImageCache::GetBytesUsed();
 }
 
 size_t SkGraphics::GetImageCacheByteLimit() {
     return SkScaledImageCache::GetByteLimit();
 }
 
 size_t SkGraphics::SetImageCacheByteLimit(size_t newLimit) {
     return SkScaledImageCache::SetByteLimit(newLimit);
 }