commit 3f396d7a86880aaf29fcce22a8204cf49e8d69d9
author Patrick Dubroy <dubroy@google.com> Wed Dec 15 15:33:21 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 15 15:33:21 2010 -0800
tree f2d04e139cc41a603f1f7726b846a0031e061409
parent 6f6457a7e6b357390a540a8ee78178e3f54addad
parent 543c793213096e01f205f5f3d43d03cff6101f43

Merge "Add optional data argument to SkPixelRef::globalRef()"

include/core/SkPixelRef.h

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 @@
     * 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

src/core/SkPixelRef.cpp

diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
index 3decdb4..8bacfae 100644
--- a/src/core/SkPixelRef.cpp
+++ b/src/core/SkPixelRef.cpp
@@ -128,7 +128,7 @@
     return NULL;
 }
 
-void SkPixelRef::globalRef() {
+void SkPixelRef::globalRef(void* data) {
     ref();
 }