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

Side by Side Diff: base/nsimage_cache_mac.mm

Issue 243100: Move nsimage_cache into base so that it can be accessed from outside of chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 | « base/nsimage_cache_mac.h ('k') | chrome/browser/autocomplete/autocomplete_popup_view_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/cocoa/nsimage_cache.h" 5 #include "base/nsimage_cache_mac.h"
6
7 #import <AppKit/AppKit.h>
6 8
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "base/mac_util.h" 10 #include "base/mac_util.h"
9 11
10 // When C++ exceptions are disabled, the C++ library defines |try| and 12 // When C++ exceptions are disabled, the C++ library defines |try| and
11 // |catch| so as to allow exception-expecting C++ code to build properly when 13 // |catch| so as to allow exception-expecting C++ code to build properly when
12 // language support for exceptions is not present. These macros interfere 14 // language support for exceptions is not present. These macros interfere
13 // with the use of |@try| and |@catch| in Objective-C files such as this one. 15 // with the use of |@try| and |@catch| in Objective-C files such as this one.
14 // Undefine these macros here, after everything has been #included, since 16 // Undefine these macros here, after everything has been #included, since
15 // there will be no C++ uses and only Objective-C uses from this point on. 17 // there will be no C++ uses and only Objective-C uses from this point on.
16 #undef try 18 #undef try
17 #undef catch 19 #undef catch
18 20
19 namespace nsimage_cache { 21 namespace nsimage_cache {
20 22
21 static NSMutableDictionary *image_cache = nil; 23 static NSMutableDictionary* image_cache = nil;
22 24
23 NSImage *ImageNamed(NSString *name) { 25 NSImage* ImageNamed(NSString* name) {
24 DCHECK(name); 26 DCHECK(name);
25 27
26 // NOTE: to make this thread safe, we'd have to sync on the cache and 28 // NOTE: to make this thread safe, we'd have to sync on the cache and
27 // also force all the bundle calls on the main thread. 29 // also force all the bundle calls on the main thread.
28 30
29 if (!image_cache) { 31 if (!image_cache) {
30 image_cache = [[NSMutableDictionary alloc] init]; 32 image_cache = [[NSMutableDictionary alloc] init];
31 DCHECK(image_cache); 33 DCHECK(image_cache);
32 } 34 }
33 35
34 NSImage *result = [image_cache objectForKey:name]; 36 NSImage* result = [image_cache objectForKey:name];
35 if (!result) { 37 if (!result) {
36 DLOG_IF(INFO, [[name pathExtension] length] == 0) 38 DLOG_IF(INFO, [[name pathExtension] length] == 0)
37 << "Suggest including the extension in the image name"; 39 << "Suggest including the extension in the image name";
38 40
39 NSString *path = [mac_util::MainAppBundle() pathForImageResource:name]; 41 NSString* path = [mac_util::MainAppBundle() pathForImageResource:name];
40 if (path) { 42 if (path) {
41 @try { 43 @try {
42 result = [[[NSImage alloc] initWithContentsOfFile:path] autorelease]; 44 result = [[[NSImage alloc] initWithContentsOfFile:path] autorelease];
43 if (result) 45 if (result)
44 [image_cache setObject:result forKey:name]; 46 [image_cache setObject:result forKey:name];
45 } 47 }
46 @catch (id err) { 48 @catch (id err) {
47 DLOG(ERROR) << "Failed to load the image for name '" 49 DLOG(ERROR) << "Failed to load the image for name '"
48 << [name UTF8String] << "' from path '" << [path UTF8String] 50 << [name UTF8String] << "' from path '" << [path UTF8String]
49 << "', error: " << [err description]; 51 << "', error: " << [err description];
50 result = nil; 52 result = nil;
51 } 53 }
52 } 54 }
53 } 55 }
54 56
55 // TODO: if we ever limit the cache size, this should retain & autorelease 57 // TODO: if we ever limit the cache size, this should retain & autorelease
56 // the image. 58 // the image.
57 return result; 59 return result;
58 } 60 }
59 61
60 void Clear(void) { 62 void Clear(void) {
61 // NOTE: to make this thread safe, we'd have to sync on the cache. 63 // NOTE: to make this thread safe, we'd have to sync on the cache.
62 [image_cache removeAllObjects]; 64 [image_cache removeAllObjects];
63 } 65 }
64 66
65 } // namespace nsimage_cache 67 } // namespace nsimage_cache
OLDNEW
« no previous file with comments | « base/nsimage_cache_mac.h ('k') | chrome/browser/autocomplete/autocomplete_popup_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698