Decode ImageManager cached images on demand.

components/suggestions/image_manager.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_SUGGESTIONS_IMAGE_MANAGER_H_
 #define COMPONENTS_SUGGESTIONS_IMAGE_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
+#include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "components/leveldb_proto/proto_database.h"
 #include "components/suggestions/image_fetcher_delegate.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
 namespace net {
@@ skipping 34 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(ImageManagerTest, InitializeTest);
   FRIEND_TEST_ALL_PREFIXES(ImageManagerTest, GetImageForURLNetworkCacheHit);
   FRIEND_TEST_ALL_PREFIXES(ImageManagerTest,
                            GetImageForURLNetworkCacheNotInitialized);
 
   // Used for testing.
   ImageManager();
 
   typedef std::vector<base::Callback<void(const GURL&, const SkBitmap*)> >
       CallbackVector;
-  typedef base::hash_map<std::string, SkBitmap> ImageMap;
+  typedef base::hash_map<std::string, scoped_refptr<base::RefCountedMemory> >
+      ImageMap;
 
   // State related to an image fetch (associated website url, image_url,
   // pending callbacks).
   struct ImageCacheRequest {
     ImageCacheRequest();
     ~ImageCacheRequest();
 
     GURL url;
     GURL image_url;
     // Queue for pending callbacks, which may accumulate while the request is in
     // flight.
     CallbackVector callbacks;
   };
 
   typedef std::map<const GURL, ImageCacheRequest> ImageCacheRequestMap;
 
   // Looks up image URL for |url|. If found, writes the result to |image_url|
   // and returns true. Otherwise just returns false.
   bool GetImageURL(const GURL& url, GURL* image_url);
 
   void QueueCacheRequest(
       const GURL& url, const GURL& image_url,
       base::Callback<void(const GURL&, const SkBitmap*)> callback);
 
   void ServeFromCacheOrNetwork(
       const GURL& url, const GURL& image_url,
       base::Callback<void(const GURL&, const SkBitmap*)> callback);
 
-  // Will return false if no bitmap was found corresponding to |url|, else
-  // return true and call |callback| with the found bitmap.
-  bool ServeFromCache(
-      const GURL& url,
-      base::Callback<void(const GURL&, const SkBitmap*)> callback);
+  void OnCacheImageDecoded(
+      const GURL& url, const GURL& image_url,
+      base::Callback<void(const GURL&, const SkBitmap*)> callback,
+      scoped_ptr<SkBitmap> bitmap);
 
   // Returns null if the |url| had no entry in the cache.
-  SkBitmap* GetBitmapFromCache(const GURL& url);
+  scoped_refptr<base::RefCountedMemory> GetEncodedImageFromCache(
+      const GURL& url);
 
   // Save the image bitmap in the cache and in the database.
   void SaveImage(const GURL& url, const SkBitmap& bitmap);
 
   // Database callback methods.
   // Will initiate loading the entries.
   void OnDatabaseInit(bool success);
   // Will transfer the loaded |entries| in memory (|image_map_|).
   void OnDatabaseLoad(bool success, scoped_ptr<ImageDataVector> entries);
   void OnDatabaseSave(bool success);
@@ skipping 23 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<ImageManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageManager);
 };
 
 }  // namespace suggestions
 
 #endif  // COMPONENTS_SUGGESTIONS_IMAGE_MANAGER_H_