aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPatrick Dubroy <dubroy@google.com>2010-12-15 15:33:21 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-15 15:33:21 -0800
commit3f396d7a86880aaf29fcce22a8204cf49e8d69d9 (patch)
treef2d04e139cc41a603f1f7726b846a0031e061409 /include
parent6f6457a7e6b357390a540a8ee78178e3f54addad (diff)
parent543c793213096e01f205f5f3d43d03cff6101f43 (diff)
downloadexternal_skia-3f396d7a86880aaf29fcce22a8204cf49e8d69d9.zip
external_skia-3f396d7a86880aaf29fcce22a8204cf49e8d69d9.tar.gz
external_skia-3f396d7a86880aaf29fcce22a8204cf49e8d69d9.tar.bz2
Merge "Add optional data argument to SkPixelRef::globalRef()"
Diffstat (limited to 'include')
-rw-r--r--include/core/SkPixelRef.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index fceef4d..f1dab36 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -116,7 +116,7 @@ public:
* The default implementation just calls ref(), but subclasses can override
* this method to implement additional behavior.
*/
- virtual void globalRef();
+ virtual void globalRef(void* data=NULL);
/** Release a "global" ref on this object.
* The default implementation just calls unref(), but subclasses can override