commit 8d0b5770f8fcfdeb8ad9808e58c49116f14b6190
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jun 24 13:07:31 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jun 24 13:07:31 2011 +0000
tree c3a33702366d7e196296960494463baa078dd175
parent c134f394011372512f13e119df65204920f9bef6

rename public SkDataRef to SkData
rename animator's internal SkData to SkDataInput



git-svn-id: http://skia.googlecode.com/svn/trunk@1697 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/DataRefTest.cpp

diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp
index 7590ebb..15fa916 100644
--- a/tests/DataRefTest.cpp
+++ b/tests/DataRefTest.cpp
@@ -1,5 +1,5 @@
 #include "Test.h"
-#include "SkDataRef.h"
+#include "SkData.h"
 
 static void* gGlobal;
 
@@ -9,11 +9,11 @@
     delete[] data;
 }
 
-static void assert_len(skiatest::Reporter* reporter, SkDataRef* ref, size_t len) {
+static void assert_len(skiatest::Reporter* reporter, SkData* ref, size_t len) {
     REPORTER_ASSERT(reporter, ref->size() == len);
 }
 
-static void assert_data(skiatest::Reporter* reporter, SkDataRef* ref,
+static void assert_data(skiatest::Reporter* reporter, SkData* ref,
                         const void* data, size_t len) {
     REPORTER_ASSERT(reporter, ref->size() == len);
     REPORTER_ASSERT(reporter, !memcmp(ref->data(), data, len));
@@ -23,11 +23,11 @@
     const char* str = "We the people, in order to form a more perfect union.";
     const int N = 10;
 
-    SkDataRef* r0 = SkDataRef::NewEmpty();
-    SkDataRef* r1 = SkDataRef::NewWithCopy(str, strlen(str));
-    SkDataRef* r2 = SkDataRef::NewWithProc(new int[N], N*sizeof(int),
+    SkData* r0 = SkData::NewEmpty();
+    SkData* r1 = SkData::NewWithCopy(str, strlen(str));
+    SkData* r2 = SkData::NewWithProc(new int[N], N*sizeof(int),
                                            delete_int_proc, gGlobal);
-    SkDataRef* r3 = SkDataRef::NewSubset(r1, 7, 6);
+    SkData* r3 = SkData::NewSubset(r1, 7, 6);
 
     SkAutoUnref aur0(r0);
     SkAutoUnref aur1(r1);
@@ -42,10 +42,10 @@
     assert_data(reporter, r1, str, strlen(str));
     assert_data(reporter, r3, "people", 6);
 
-    SkDataRef* tmp = SkDataRef::NewSubset(r1, strlen(str), 10);
+    SkData* tmp = SkData::NewSubset(r1, strlen(str), 10);
     assert_len(reporter, tmp, 0);
     tmp->unref();
-    tmp = SkDataRef::NewSubset(r1, 0, 0);
+    tmp = SkData::NewSubset(r1, 0, 0);
     assert_len(reporter, tmp, 0);
     tmp->unref();
 }