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

Unified Diff: base/memory/scoped_nsobject.h

Issue 10388108: Implement media::VideoDecodeAccelerator on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cros build Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/mac/scoped_cftyperef.h ('k') | base/memory/scoped_nsobject_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/scoped_nsobject.h
diff --git a/base/memory/scoped_nsobject.h b/base/memory/scoped_nsobject.h
index b6b61f562836cf562f268f18a2ab33e1f7384d06..57486cb8939349e6102f65e410b69c3d144ba582 100644
--- a/base/memory/scoped_nsobject.h
+++ b/base/memory/scoped_nsobject.h
@@ -9,6 +9,7 @@
#import <Foundation/Foundation.h>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/memory/scoped_policy.h"
// scoped_nsobject<> is patterned after scoped_ptr<>, but maintains ownership
// of an NSObject subclass object. Style deviations here are solely for
@@ -33,21 +34,14 @@
// We check for bad uses of scoped_nsobject and NSAutoreleasePool at compile
// time with a template specialization (see below).
-namespace scoped_policy {
-enum OwnershipPolicy {
- ASSUME,
- RETAIN
-};
-} // namespace scoped_policy
-
template<typename NST>
class scoped_nsprotocol {
public:
explicit scoped_nsprotocol(
NST object = nil,
- scoped_policy::OwnershipPolicy policy = scoped_policy::ASSUME)
+ base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME)
: object_(object) {
- if (policy == scoped_policy::RETAIN)
+ if (policy == base::scoped_policy::RETAIN)
[object retain];
}
@@ -60,13 +54,14 @@ class scoped_nsprotocol {
}
scoped_nsprotocol& operator=(const scoped_nsprotocol<NST>& that) {
- reset(that.get(), scoped_policy::RETAIN);
+ reset(that.get(), base::scoped_policy::RETAIN);
return *this;
}
void reset(NST object = nil,
- scoped_policy::OwnershipPolicy policy = scoped_policy::ASSUME) {
- if (policy == scoped_policy::RETAIN)
+ base::scoped_policy::OwnershipPolicy policy =
+ base::scoped_policy::ASSUME) {
+ if (policy == base::scoped_policy::RETAIN)
[object retain];
// We intentionally do not check that object != object_ as the caller must
// either already have an ownership claim over whatever it passes to this
@@ -127,7 +122,7 @@ class scoped_nsobject : public scoped_nsprotocol<NST*> {
public:
explicit scoped_nsobject(
NST* object = nil,
- scoped_policy::OwnershipPolicy policy = scoped_policy::ASSUME)
+ base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME)
: scoped_nsprotocol<NST*>(object, policy) {
}
@@ -147,7 +142,7 @@ class scoped_nsobject<id> : public scoped_nsprotocol<id> {
public:
explicit scoped_nsobject(
id object = nil,
- scoped_policy::OwnershipPolicy policy = scoped_policy::ASSUME)
+ base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME)
: scoped_nsprotocol<id>(object, policy) {
}
@@ -167,9 +162,9 @@ class scoped_nsobject<id> : public scoped_nsprotocol<id> {
template<>
class scoped_nsobject<NSAutoreleasePool> {
private:
- explicit scoped_nsobject(
- NSAutoreleasePool* object = nil,
- scoped_policy::OwnershipPolicy policy = scoped_policy::ASSUME);
+ explicit scoped_nsobject(NSAutoreleasePool* object = nil,
+ base::scoped_policy::OwnershipPolicy policy =
+ base::scoped_policy::ASSUME);
DISALLOW_COPY_AND_ASSIGN(scoped_nsobject);
};
#endif // BASE_MEMORY_SCOPED_NSOBJECT_H_
« no previous file with comments | « base/mac/scoped_cftyperef.h ('k') | base/memory/scoped_nsobject_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698