diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 21:20:04 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 21:20:04 +0000 |
commit | b7ff596d84cc3f65463e0b026a3f41402c80dd99 (patch) | |
tree | c6b42aa737c1b910aab3d3001eb33bad28a406ca /base | |
parent | 5636ed14794e0194cb280125b7d17e8b943860ce (diff) | |
download | chromium_src-b7ff596d84cc3f65463e0b026a3f41402c80dd99.zip chromium_src-b7ff596d84cc3f65463e0b026a3f41402c80dd99.tar.gz chromium_src-b7ff596d84cc3f65463e0b026a3f41402c80dd99.tar.bz2 |
Re-delete nsimage_cache_mac.* My partial revert of the original change accidentally restored these. They're not used anywhere.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/nsimage_cache_mac.h | 33 | ||||
-rw-r--r-- | base/nsimage_cache_mac.mm | 73 |
2 files changed, 0 insertions, 106 deletions
diff --git a/base/nsimage_cache_mac.h b/base/nsimage_cache_mac.h deleted file mode 100644 index b13eac9..0000000 --- a/base/nsimage_cache_mac.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2009 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 BASE_NSIMAGE_CACHE_MAC_H_ -#define BASE_NSIMAGE_CACHE_MAC_H_ -#pragma once - -#ifdef __OBJC__ -@class NSImage; -@class NSString; -#else -class NSImage; -class NSString; -#endif - -namespace nsimage_cache { - -// Returns an autoreleased image from the main app bundle -// (mac_util::MainAppBundle()) with the given name, and keeps it in memory so -// future fetches are fast. -// NOTE: -// - This should only be called on the main thread. -// - The caller should retain the image if they want to keep it around, as -// the cache could have limit on size/lifetime, etc. -NSImage* ImageNamed(NSString* name); - -// Clears the cache. -void Clear(void); - -} // namespace nsimage_cache - -#endif // BASE_NSIMAGE_CACHE_MAC_H_ diff --git a/base/nsimage_cache_mac.mm b/base/nsimage_cache_mac.mm deleted file mode 100644 index e693ed4..0000000 --- a/base/nsimage_cache_mac.mm +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) 2010 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 "base/nsimage_cache_mac.h" - -#import <AppKit/AppKit.h> - -#include "base/logging.h" -#include "base/mac_util.h" - -// When C++ exceptions are disabled, the C++ library defines |try| and -// |catch| so as to allow exception-expecting C++ code to build properly when -// language support for exceptions is not present. These macros interfere -// with the use of |@try| and |@catch| in Objective-C files such as this one. -// Undefine these macros here, after everything has been #included, since -// there will be no C++ uses and only Objective-C uses from this point on. -#undef try -#undef catch - -namespace nsimage_cache { - -static NSMutableDictionary* image_cache = nil; - -NSImage* ImageNamed(NSString* name) { - DCHECK(name); - - // NOTE: to make this thread safe, we'd have to sync on the cache and - // also force all the bundle calls on the main thread. - - if (!image_cache) { - image_cache = [[NSMutableDictionary alloc] init]; - DCHECK(image_cache); - } - - NSImage* result = [image_cache objectForKey:name]; - if (!result) { - DVLOG_IF(1, [[name pathExtension] length] == 0) << "Suggest including the " - "extension in the image name"; - - NSString* path = [mac_util::MainAppBundle() pathForImageResource:name]; - if (path) { - @try { - result = [[[NSImage alloc] initWithContentsOfFile:path] autorelease]; - if (result) { - // Auto-template images with names ending in "Template". - NSString* extensionlessName = [name stringByDeletingPathExtension]; - if ([extensionlessName hasSuffix:@"Template"]) - [result setTemplate:YES]; - - [image_cache setObject:result forKey:name]; - } - } - @catch (id err) { - DLOG(ERROR) << "Failed to load the image for name '" - << [name UTF8String] << "' from path '" << [path UTF8String] - << "', error: " << [[err description] UTF8String]; - result = nil; - } - } - } - - // TODO: if we ever limit the cache size, this should retain & autorelease - // the image. - return result; -} - -void Clear(void) { - // NOTE: to make this thread safe, we'd have to sync on the cache. - [image_cache removeAllObjects]; -} - -} // namespace nsimage_cache |