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

2 files changed, 2 insertions, 2 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
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 @@ const char* SkPixelRef::FactoryToName(Factory fact) {
     return NULL;
 }
 
-void SkPixelRef::globalRef() {
+void SkPixelRef::globalRef(void* data) {
     ref();
 }