aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/utils
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-07-27 15:30:40 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-07-27 15:30:40 +0000
commitbdae027bd86b7900d1874ad77f0ec9e31f6cbcab (patch)
treed8ddbcfd14e51e3a60756cd4d0ae510cc1148be6 /src/utils
parent4a6ba46b9fed69e9de06d42ccc749899906db217 (diff)
rename private animator type SkImage to SkImageBitmapBase, to avoid conflicts
with new public type SkImage git-svn-id: http://skia.googlecode.com/svn/trunk@4807 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/SkBase64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/utils/SkBase64.h b/src/utils/SkBase64.h
index 4f3b3234f1..5bf9006632 100644
--- a/src/utils/SkBase64.h
+++ b/src/utils/SkBase64.h
@@ -38,7 +38,7 @@ private:
size_t fLength;
char* fData;
- friend class SkImage;
+ friend class SkImageBaseBitmap;
};
#endif // SkBase64_DEFINED