diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-21 15:39:03 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-21 15:39:03 +0000 |
| commit | e63793a2c8d2871bf7d95195be7b93ff669688d7 (patch) | |
| tree | 5b3f833f7cbb71470a9e2aba50e8dc7b2078e04b /include/core | |
| parent | 0ffc56f6745e3c5d9a9baa15a3259da5fea0f88a (diff) | |
Upstream changes from Android repository.
Review URL: https://codereview.appspot.com/5752055
git-svn-id: http://skia.googlecode.com/svn/trunk@3449 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkPath.h | 3 | ||||
| -rw-r--r-- | include/core/SkThread_platform.h | 27 |
2 files changed, 3 insertions, 27 deletions
diff --git a/include/core/SkPath.h b/include/core/SkPath.h index 2774bea01a..957d50ee5e 100644 --- a/include/core/SkPath.h +++ b/include/core/SkPath.h @@ -732,6 +732,8 @@ public: #ifdef SK_BUILD_FOR_ANDROID uint32_t getGenerationID() const; + const SkPath* getSourcePath() const; + void setSourcePath(const SkPath* path); #endif SkDEBUGCODE(void validate() const;) @@ -747,6 +749,7 @@ private: mutable uint8_t fConvexity; #ifdef SK_BUILD_FOR_ANDROID uint32_t fGenerationID; + const SkPath* fSourcePath; #endif // called, if dirty, by getBounds() diff --git a/include/core/SkThread_platform.h b/include/core/SkThread_platform.h index 94a4a1edeb..863f6e3770 100644 --- a/include/core/SkThread_platform.h +++ b/include/core/SkThread_platform.h @@ -53,33 +53,6 @@ SK_API int32_t sk_atomic_dec(int32_t* addr); #endif // !SK_BUILD_FOR_ANDROID -#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK) - -#include <utils/threads.h> - -class SkMutex : android::Mutex { -public: - SkMutex() {} - ~SkMutex() {} - - void acquire() { this->lock(); } - void release() { this->unlock(); } -}; - -#else - -/** Implemented by the porting layer, this function adds 1 to the int specified - by the address (in a thread-safe manner), and returns the previous value. -*/ -SK_API int32_t sk_atomic_inc(int32_t* addr); -/** Implemented by the porting layer, this function subtracts 1 to the int - specified by the address (in a thread-safe manner), and returns the previous - value. -*/ -SK_API int32_t sk_atomic_dec(int32_t* addr); - -#endif - #ifdef SK_USE_POSIX_THREADS #include <pthread.h> |