add SkDataTable, to efficiently store an immutable array. Includes a builder

tests/DataRefTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkData.h"
 #include "SkDataSet.h"
+#include "SkDataTable.h"
 #include "SkStream.h"
 
 template <typename T> class SkTUnref {
 public:
     SkTUnref(T* ref) : fRef(ref) {}
     ~SkTUnref() { fRef->unref(); }
 
     operator T*() { return fRef; }
     operator const T*() { return fRef; }
 
 private:
     T*  fRef;
 };
 
+static void test_simpletable(skiatest::Reporter* reporter) {
+    const int idata[] = { 1, 4, 9, 16, 25, 63 };
+    int icount = SK_ARRAY_COUNT(idata);
+    SkAutoTUnref<SkDataTable> itable(SkDataTable::NewCopyArray(idata,
+                                                               sizeof(idata[0]),
+                                                               icount));
+    REPORTER_ASSERT(reporter, itable->count() == icount);
+    for (int i = 0; i < icount; ++i) {
+        size_t size;
+        REPORTER_ASSERT(reporter, sizeof(int) == itable->atSize(i));
+        REPORTER_ASSERT(reporter, *itable->atDataT<int>(i, &size) == idata[i]);
+        REPORTER_ASSERT(reporter, sizeof(int) == size);
+    }
+}
+
+static void test_vartable(skiatest::Reporter* reporter) {
+    const char* str[] = {
+        "", "a", "be", "see", "deigh", "ef", "ggggggggggggggggggggggggggg"
+    };
+    int count = SK_ARRAY_COUNT(str);
+    size_t sizes[SK_ARRAY_COUNT(str)];
+    for (int i = 0; i < count; ++i) {
+        sizes[i] = strlen(str[i]) + 1;
+    }
+    
+    SkAutoTUnref<SkDataTable> table(SkDataTable::NewCopyArrays(
+                                        (const void*const*)str, sizes, count));
+    
+    REPORTER_ASSERT(reporter, table->count() == count);
+    for (int i = 0; i < count; ++i) {
+        size_t size;
+        REPORTER_ASSERT(reporter, table->atSize(i) == sizes[i]);
+        REPORTER_ASSERT(reporter, !strcmp(table->atDataT<const char>(i, &size),
+                                          str[i]));
+        REPORTER_ASSERT(reporter, size == sizes[i]);
+        
+        const char* s = table->atStr(i);
+        REPORTER_ASSERT(reporter, strlen(s) == strlen(str[i]));
+    }
+}
+
+static void test_tablebuilder(skiatest::Reporter* reporter) {
+    const char* str[] = {
+        "", "a", "be", "see", "deigh", "ef", "ggggggggggggggggggggggggggg"
+    };
+    int count = SK_ARRAY_COUNT(str);
+
+    SkDataTableBuilder builder(16);
+    
+    for (int i = 0; i < count; ++i) {
+        builder.append(str[i], strlen(str[i]) + 1);
+    }
+    SkAutoTUnref<SkDataTable> table(builder.createDataTable());
+    
+    REPORTER_ASSERT(reporter, table->count() == count);
+    for (int i = 0; i < count; ++i) {
+        size_t size;
+        REPORTER_ASSERT(reporter, table->atSize(i) == strlen(str[i]) + 1);
+        REPORTER_ASSERT(reporter, !strcmp(table->atDataT<const char>(i, &size),
+                                          str[i]));
+        REPORTER_ASSERT(reporter, size == strlen(str[i]) + 1);
+        
+        const char* s = table->atStr(i);
+        REPORTER_ASSERT(reporter, strlen(s) == strlen(str[i]));
+    }
+}
+
+static void test_datatable(skiatest::Reporter* reporter) {
+    test_simpletable(reporter);
+    test_vartable(reporter);
+    test_tablebuilder(reporter);
+}
+
 static void unrefAll(const SkDataSet::Pair pairs[], int count) {
     for (int i = 0; i < count; ++i) {
         pairs[i].fValue->unref();
     }
 }
 
 // asserts that inner is a subset of outer
 static void test_dataset_subset(skiatest::Reporter* reporter,
                                 const SkDataSet& outer, const SkDataSet& inner) {
     SkDataSet::Iter iter(inner);
@@ skipping 104 matching lines @@
 
     SkData* tmp = SkData::NewSubset(r1, strlen(str), 10);
     assert_len(reporter, tmp, 0);
     tmp->unref();
     tmp = SkData::NewSubset(r1, 0, 0);
     assert_len(reporter, tmp, 0);
     tmp->unref();
 
     test_cstring(reporter);
     test_dataset(reporter);
+    test_datatable(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Data", DataTestClass, TestData)