AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unused methods from SkRefPtr, as a check-point for better understanding

Browse Source 
what we want to do with this class.



git-svn-id: http://skia.googlecode.com/svn/trunk@903 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2011-03-08 16:06:06 +00:00
parent 480ab7d5f1
commit ddbf4c85de
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/core/SkRefCnt.h
View File

@ -147,32 +147,18 @@ public:
return *this;
}
bool operator==(const SkRefPtr& rp) const { return fObj == rp.fObj; }
bool operator==(const T* obj) const { return fObj == obj; }
bool operator!=(const SkRefPtr& rp) const { return fObj != rp.fObj; }
bool operator!=(const T* obj) const { return fObj != obj; }
T* get() const { return fObj; }
T& operator*() const { return *fObj; }
T* operator->() const { return fObj; }
bool operator!() const { return !fObj; }
typedef T* SkRefPtr::*unspecified_bool_type;
operator unspecified_bool_type() const { return fObj ? &SkRefPtr::fObj : NULL; }
operator unspecified_bool_type() const {
return fObj ? &SkRefPtr::fObj : NULL;
}
private:
T* fObj;
};
template <typename T>
inline bool operator==(T* obj, const SkRefPtr<T>& rp) {
return obj == rp.get();
}
template <typename T>
inline bool operator!=(T* obj, const SkRefPtr<T>& rp) {
return obj != rp.get();
}
#endif

6
tests/UtilsTest.cpp
View File

@ -23,17 +23,17 @@ static void test_refptr(skiatest::Reporter* reporter) {
SkRefPtr<RefClass> rc1;
REPORTER_ASSERT(reporter, rc0 == rc1);
REPORTER_ASSERT(reporter, rc0 != r0);
REPORTER_ASSERT(reporter, rc0.get() != r0);
rc0 = r0;
REPORTER_ASSERT(reporter, rc0);
REPORTER_ASSERT(reporter, rc0 != rc1);
REPORTER_ASSERT(reporter, rc0 == r0);
REPORTER_ASSERT(reporter, rc0.get() == r0);
rc1 = rc0;
REPORTER_ASSERT(reporter, rc1);
REPORTER_ASSERT(reporter, rc0 == rc1);
REPORTER_ASSERT(reporter, rc0 == r0);
REPORTER_ASSERT(reporter, rc0.get() == r0);
rc0 = NULL;
REPORTER_ASSERT(reporter, rc0.get() == NULL);