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

Side by Side Diff: ui/gfx/mac/nsimage_cache.mm

Issue 12096047: mac: Delete GetCachedImageWithName(), it's no longer used. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: includes 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/mac/nsimage_cache.h ('k') | ui/ui.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "ui/gfx/mac/nsimage_cache.h"
6
7 #import <AppKit/AppKit.h>
8
9 #include "base/logging.h"
10 #include "base/mac/bundle_locations.h"
11 #include "base/mac/mac_util.h"
12
13 // When C++ exceptions are disabled, the C++ library defines |try| and
14 // |catch| so as to allow exception-expecting C++ code to build properly when
15 // language support for exceptions is not present. These macros interfere
16 // with the use of |@try| and |@catch| in Objective-C files such as this one.
17 // Undefine these macros here, after everything has been #included, since
18 // there will be no C++ uses and only Objective-C uses from this point on.
19 #undef try
20 #undef catch
21
22 namespace gfx {
23
24 static NSMutableDictionary* image_cache = nil;
25
26 NSImage* GetCachedImageWithName(NSString* name) {
27 DCHECK(name);
28
29 // NOTE: to make this thread safe, we'd have to sync on the cache and
30 // also force all the bundle calls on the main thread.
31
32 if (!image_cache) {
33 image_cache = [[NSMutableDictionary alloc] init];
34 DCHECK(image_cache);
35 }
36
37 NSImage* result = [image_cache objectForKey:name];
38 if (!result) {
39 DVLOG_IF(1, [[name pathExtension] length] == 0) << "Suggest including the "
40 "extension in the image name";
41
42 NSString* path = [base::mac::FrameworkBundle() pathForImageResource:name];
43 if (path) {
44 @try {
45 result = [[[NSImage alloc] initWithContentsOfFile:path] autorelease];
46 if (result) {
47 // Auto-template images with names ending in "Template".
48 NSString* extensionlessName = [name stringByDeletingPathExtension];
49 if ([extensionlessName hasSuffix:@"Template"])
50 [result setTemplate:YES];
51
52 [image_cache setObject:result forKey:name];
53 }
54 }
55 @catch (id err) {
56 DLOG(ERROR) << "Failed to load the image for name '"
57 << [name UTF8String] << "' from path '" << [path UTF8String]
58 << "', error: " << [[err description] UTF8String];
59 result = nil;
60 }
61 }
62 }
63
64 // TODO: if we ever limit the cache size, this should retain & autorelease
65 // the image.
66 return result;
67 }
68
69 void ClearCachedImages(void) {
70 // NOTE: to make this thread safe, we'd have to sync on the cache.
71 [image_cache removeAllObjects];
72 }
73
74 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/mac/nsimage_cache.h ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698