diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-08 19:00:26 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-08 19:00:26 +0000 |
| commit | 56c69773aea56c6c6bd47bc7e7970dd081205184 (patch) | |
| tree | 8897eb8c11b991b04cb60cc9283d7c541d8217f0 /src/core/SkPaint.cpp | |
| parent | 6245ab718dea4dfb6415e97de6e8667f4b13de38 (diff) | |
Update files to use SK_BUILD_FOR_ANDROID.
This CL also removes any unecessary references to
the ANDROID definition.
Review URL: http://codereview.appspot.com/5354049
git-svn-id: http://skia.googlecode.com/svn/trunk@2629 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkPaint.cpp')
| -rw-r--r-- | src/core/SkPaint.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index aa1d7b16fc..ac9c68fd7a 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -32,7 +32,7 @@ #define SK_DefaultFlags 0 //(kNativeHintsText_Flag) -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID #define GEN_ID_INC fGenerationID++ #define GEN_ID_INC_EVAL(expression) if (expression) { fGenerationID++; } #else @@ -71,7 +71,7 @@ SkPaint::SkPaint() { fStyle = kFill_Style; fTextEncoding = kUTF8_TextEncoding; fHinting = kNormal_Hinting; -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID fGenerationID = 0; #endif } @@ -125,11 +125,11 @@ SkPaint& SkPaint::operator=(const SkPaint& src) { SkSafeUnref(fLooper); SkSafeUnref(fImageFilter); -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID uint32_t oldGenerationID = fGenerationID; #endif memcpy(this, &src, sizeof(src)); -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID fGenerationID = oldGenerationID + 1; #endif @@ -143,16 +143,16 @@ bool operator==(const SkPaint& a, const SkPaint& b) { void SkPaint::reset() { SkPaint init; -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID uint32_t oldGenerationID = fGenerationID; #endif *this = init; -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID fGenerationID = oldGenerationID + 1; #endif } -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID uint32_t SkPaint::getGenerationID() const { return fGenerationID; } @@ -377,7 +377,7 @@ static void DetachDescProc(const SkDescriptor* desc, void* context) { *((SkGlyphCache**)context) = SkGlyphCache::DetachCache(desc); } -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID const SkGlyph& SkPaint::getUnicharMetrics(SkUnichar text) { SkGlyphCache* cache; descriptorProc(NULL, DetachDescProc, &cache, true); |