Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: chrome/browser/icon_manager.cc

Issue 12211049: Removing base::ThreadRestrictions::ScopedAllowIO from icon_manager_linux.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/icon_manager.h" 5 #include "chrome/browser/icon_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "base/task_runner.h" 11 #include "base/task_runner.h"
12 #include "third_party/skia/include/core/SkBitmap.h" 12 #include "third_party/skia/include/core/SkBitmap.h"
13 #include "third_party/skia/include/core/SkCanvas.h" 13 #include "third_party/skia/include/core/SkCanvas.h"
14 14
15 namespace { 15 namespace {
16 16
17 void RunCallbackIfNotCanceled( 17 void RunCallbackIfNotCanceled(
18 const CancelableTaskTracker::IsCanceledCallback& is_canceled, 18 const CancelableTaskTracker::IsCanceledCallback& is_canceled,
19 const IconManager::IconRequestCallback& callback, 19 const IconManager::IconRequestCallback& callback,
20 gfx::Image* image) { 20 gfx::Image* image) {
21 if (is_canceled.Run()) 21 if (is_canceled.Run())
22 return; 22 return;
23 callback.Run(image); 23 callback.Run(image);
24 } 24 }
25 25
26 } // namespace 26 } // namespace
27 27
28 struct IconManager::ClientRequest { 28 struct IconManager::ClientRequest {
29 IconRequestCallback callback; 29 IconRequestCallback callback;
30 IconGroupID group; 30 FilePath file_path;
31 IconLoader::IconSize size; 31 IconLoader::IconSize size;
32 }; 32 };
33 33
34 IconManager::IconManager() { 34 IconManager::IconManager() {
35 } 35 }
36 36
37 IconManager::~IconManager() { 37 IconManager::~IconManager() {
38 STLDeleteValues(&icon_cache_); 38 STLDeleteValues(&icon_cache_);
39 } 39 }
40 40
41 gfx::Image* IconManager::LookupIcon(const FilePath& file_name, 41 gfx::Image* IconManager::LookupIconFromFilepath(const FilePath& file_name,
42 IconLoader::IconSize size) { 42 IconLoader::IconSize size) {
43 IconGroupID group = GetGroupIDFromFilepath(file_name); 43 IconMap::iterator it = icon_cache_.find(CacheKey(file_name, size));
44 IconMap::iterator it = icon_cache_.find(CacheKey(group, size));
45 if (it != icon_cache_.end()) 44 if (it != icon_cache_.end())
46 return it->second; 45 return it->second;
47 46
48 return NULL; 47 return NULL;
49 } 48 }
50 49
51 CancelableTaskTracker::TaskId IconManager::LoadIcon( 50 CancelableTaskTracker::TaskId IconManager::LoadIcon(
52 const FilePath& file_name, 51 const FilePath& file_name,
53 IconLoader::IconSize size, 52 IconLoader::IconSize size,
54 const IconRequestCallback& callback, 53 const IconRequestCallback& callback,
55 CancelableTaskTracker* tracker) { 54 CancelableTaskTracker* tracker) {
56 IconGroupID group = GetGroupIDFromFilepath(file_name); 55 IconLoader* loader = new IconLoader(file_name, size, this);
57
58 IconLoader* loader = new IconLoader(group, size, this);
59 loader->AddRef(); 56 loader->AddRef();
60 loader->Start(); 57 loader->Start();
61 58
62 CancelableTaskTracker::IsCanceledCallback is_canceled; 59 CancelableTaskTracker::IsCanceledCallback is_canceled;
63 CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled); 60 CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled);
64 IconRequestCallback callback_runner = base::Bind( 61 IconRequestCallback callback_runner = base::Bind(
65 &RunCallbackIfNotCanceled, is_canceled, callback); 62 &RunCallbackIfNotCanceled, is_canceled, callback);
66 63
67 ClientRequest client_request = { callback_runner, group, size }; 64 ClientRequest client_request = { callback_runner, file_name, size };
68 requests_[loader] = client_request; 65 requests_[loader] = client_request;
69 return id; 66 return id;
70 } 67 }
71 68
72 // IconLoader::Delegate implementation ----------------------------------------- 69 // IconLoader::Delegate implementation -----------------------------------------
73 70
74 bool IconManager::OnImageLoaded(IconLoader* loader, gfx::Image* result) { 71 bool IconManager::OnImageLoaded(IconLoader* loader, gfx::Image* result) {
75 ClientRequests::iterator rit = requests_.find(loader); 72 ClientRequests::iterator rit = requests_.find(loader);
76 73
77 // Balances the AddRef() in LoadIcon(). 74 // Balances the AddRef() in LoadIcon().
78 loader->Release(); 75 loader->Release();
79 76
80 // Look up our client state. 77 // Look up our client state.
81 if (rit == requests_.end()) { 78 if (rit == requests_.end()) {
82 NOTREACHED(); 79 NOTREACHED();
83 return false; // Return false to indicate result should be deleted. 80 return false; // Return false to indicate result should be deleted.
84 } 81 }
85 82
86 const ClientRequest& client_request = rit->second; 83 const ClientRequest& client_request = rit->second;
87 84
88 // Cache the bitmap. Watch out: |result| or the cached bitmap may be NULL to 85 // Cache the bitmap. Watch out: |result| or the cached bitmap may be NULL to
89 // indicate a current or past failure. 86 // indicate a current or past failure.
90 CacheKey key(client_request.group, client_request.size); 87 CacheKey key(client_request.file_path, client_request.size);
91 IconMap::iterator it = icon_cache_.find(key); 88 IconMap::iterator it = icon_cache_.find(key);
92 if (it != icon_cache_.end() && result && it->second) { 89 if (it != icon_cache_.end() && result && it->second) {
93 it->second->SwapRepresentations(result); 90 it->second->SwapRepresentations(result);
94 delete result; 91 delete result;
95 result = it->second; 92 result = it->second;
96 } else { 93 } else {
97 icon_cache_[key] = result; 94 icon_cache_[key] = result;
98 } 95 }
99 96
100 // Inform our client that the request has completed. 97 // Inform our client that the request has completed.
101 client_request.callback.Run(result); 98 client_request.callback.Run(result);
102 requests_.erase(rit); 99 requests_.erase(rit);
103 100
104 return true; // Indicates we took ownership of result. 101 return true; // Indicates we took ownership of result.
105 } 102 }
106 103
107 IconManager::CacheKey::CacheKey(const IconGroupID& group, 104 IconManager::CacheKey::CacheKey(const FilePath& file_name,
108 IconLoader::IconSize size) 105 IconLoader::IconSize size)
109 : group(group), 106 : file_name(file_name),
110 size(size) { 107 size(size) {
111 } 108 }
112 109
113 bool IconManager::CacheKey::operator<(const CacheKey &other) const { 110 bool IconManager::CacheKey::operator<(const CacheKey &other) const {
114 if (group != other.group) 111 if (file_name != other.file_name)
115 return group < other.group; 112 return file_name < other.file_name;
116 return size < other.size; 113 return size < other.size;
117 } 114 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698