Removing base::ThreadRestrictions::ScopedAllowIO from icon_manager_linux.cc

chrome/browser/icon_manager.cc

 // Copyright (c) 2011 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 "chrome/browser/icon_manager.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/task_runner.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace {
 
 void RunCallbackIfNotCanceled(
     const CancelableTaskTracker::IsCanceledCallback& is_canceled,
     const IconManager::IconRequestCallback& callback,
     gfx::Image* image) {
   if (is_canceled.Run())
     return;
   callback.Run(image);
 }
 
 }  // namespace
 
 struct IconManager::ClientRequest {
   IconRequestCallback callback;
-  IconGroupID group;
+  FilePath file_path;
   IconLoader::IconSize size;
 };
 
 IconManager::IconManager() {
 }
 
 IconManager::~IconManager() {
   STLDeleteValues(&icon_cache_);
 }
 
-gfx::Image* IconManager::LookupIcon(const FilePath& file_name,
-                                    IconLoader::IconSize size) {
-  IconGroupID group = GetGroupIDFromFilepath(file_name);
+gfx::Image* IconManager::LookupIconFromFilepath(const FilePath& file_name,
+                                                IconLoader::IconSize size) {
+  GroupMap::iterator it = group_cache_.find(file_name);
+  if (it != group_cache_.end())
+    return LookupIconFromGroup(it->second, size);
+
+  return NULL;
+}
+
+gfx::Image* IconManager::LookupIconFromGroup(const IconGroupID& group,
+                                             IconLoader::IconSize size) {
   IconMap::iterator it = icon_cache_.find(CacheKey(group, size));
   if (it != icon_cache_.end())
     return it->second;
 
   return NULL;
 }
 
 CancelableTaskTracker::TaskId IconManager::LoadIcon(
     const FilePath& file_name,
     IconLoader::IconSize size,
     const IconRequestCallback& callback,
     CancelableTaskTracker* tracker) {
-  IconGroupID group = GetGroupIDFromFilepath(file_name);
-
-  IconLoader* loader = new IconLoader(group, size, this);
+  IconLoader* loader = new IconLoader(file_name, size, this);
   loader->AddRef();
   loader->Start();
 
   CancelableTaskTracker::IsCanceledCallback is_canceled;
   CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled);
   IconRequestCallback callback_runner = base::Bind(
       &RunCallbackIfNotCanceled, is_canceled, callback);
 
-  ClientRequest client_request = { callback_runner, group, size };
+  ClientRequest client_request = { callback_runner, file_name, size };
   requests_[loader] = client_request;
   return id;
 }
 
 // IconLoader::Delegate implementation -----------------------------------------
 
-bool IconManager::OnImageLoaded(IconLoader* loader, gfx::Image* result) {
+bool IconManager::OnGroupLoaded(IconLoader* loader,
+                                const IconGroupID& group) {
+  ClientRequests::iterator rit = requests_.find(loader);
+
+  // Look up our client state.

[Robert Sesek, 2013/02/13 17:33:05]

This comment doesn't add much value. Remove it and the blank line on 83.

[shatch, 2013/02/21 20:02:06]

Done.

+  if (rit == requests_.end()) {
+    NOTREACHED();
+    return false;
+  }
+
+  const ClientRequest& client_request = rit->second;

[Robert Sesek, 2013/02/13 17:33:05]

nit: you only consult this on line 92, so you can probably just do
rit->second.size.

[shatch, 2013/02/21 20:02:06]

Done.

+
+  gfx::Image* result = LookupIconFromGroup(group, client_request.size);
+  if (!result) {
+    return false;
+  }
+
+  return OnImageLoaded(loader, result, group);
+}
+
+bool IconManager::OnImageLoaded(
+    IconLoader* loader, gfx::Image* result, const IconGroupID& group) {
   ClientRequests::iterator rit = requests_.find(loader);
 
   // Balances the AddRef() in LoadIcon().
   loader->Release();
 
   // Look up our client state.
   if (rit == requests_.end()) {
     NOTREACHED();
     return false;  // Return false to indicate result should be deleted.
   }
 
   const ClientRequest& client_request = rit->second;
 
   // Cache the bitmap. Watch out: |result| or the cached bitmap may be NULL to
   // indicate a current or past failure.
-  CacheKey key(client_request.group, client_request.size);
+  CacheKey key(group, client_request.size);
   IconMap::iterator it = icon_cache_.find(key);
   if (it != icon_cache_.end() && result && it->second) {
-    it->second->SwapRepresentations(result);
-    delete result;
-    result = it->second;
+    if (it->second != result) {
+      it->second->SwapRepresentations(result);
+      delete result;
+      result = it->second;
+    }
   } else {
     icon_cache_[key] = result;
   }
 
+  group_cache_[client_request.file_path] = group;
+
   // Inform our client that the request has completed.
   client_request.callback.Run(result);
   requests_.erase(rit);
 
   return true;  // Indicates we took ownership of result.
 }
 
 IconManager::CacheKey::CacheKey(const IconGroupID& group,
                                 IconLoader::IconSize size)
     : group(group),
       size(size) {
 }
 
 bool IconManager::CacheKey::operator<(const CacheKey &other) const {
   if (group != other.group)
     return group < other.group;
   return size < other.size;
 }