Remove SkDataTable from SkFlattenable hierarchy.

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 "SkDataTable.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
 
 static void test_is_equal(skiatest::Reporter* reporter,
                           const SkDataTable* a, const SkDataTable* b) {
     REPORTER_ASSERT(reporter, a->count() == b->count());
     for (int i = 0; i < a->count(); ++i) {
         size_t sizea, sizeb;
         const void* mema = a->at(i, &sizea);
         const void* memb = b->at(i, &sizeb);
         REPORTER_ASSERT(reporter, sizea == sizeb);
         REPORTER_ASSERT(reporter, !memcmp(mema, memb, sizea));
     }
 }
 
-static void test_datatable_flatten(skiatest::Reporter* reporter,
-                                   SkDataTable* table) {
-    SkOrderedWriteBuffer wb(1024);
-    wb.writeFlattenable(table);
-
-    size_t wsize = wb.size();
-    SkAutoMalloc storage(wsize);
-    wb.writeToMemory(storage.get());
-
-    SkOrderedReadBuffer rb(storage.get(), wsize);
-    SkAutoTUnref<SkDataTable> newTable((SkDataTable*)rb.readFlattenable());
-
-    test_is_equal(reporter, table, newTable);
-}
-
 static void test_datatable_is_empty(skiatest::Reporter* reporter,
                                     SkDataTable* table) {
     REPORTER_ASSERT(reporter, table->isEmpty());
     REPORTER_ASSERT(reporter, 0 == table->count());
-    test_datatable_flatten(reporter, table);
 }
 
 static void test_emptytable(skiatest::Reporter* reporter) {
     SkAutoTUnref<SkDataTable> table0(SkDataTable::NewEmpty());
     SkAutoTUnref<SkDataTable> table1(SkDataTable::NewCopyArrays(NULL, NULL, 0));
     SkAutoTUnref<SkDataTable> table2(SkDataTable::NewCopyArray(NULL, 0, 0));
     SkAutoTUnref<SkDataTable> table3(SkDataTable::NewArrayProc(NULL, 0, 0,
                                                                NULL, NULL));
 
     test_datatable_is_empty(reporter, table0);
@@ skipping 12 matching lines @@
     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->atT<int>(i, &size) == idata[i]);
         REPORTER_ASSERT(reporter, sizeof(int) == size);
     }
-    test_datatable_flatten(reporter, itable);
 }
 
 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->atT<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]));
     }
-    test_datatable_flatten(reporter, table);
 }
 
 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.detachDataTable());
 
     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->atT<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]));
     }
-    test_datatable_flatten(reporter, table);
 }
 
 static void test_globaltable(skiatest::Reporter* reporter) {
     static const int gData[] = {
         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
     };
     int count = SK_ARRAY_COUNT(gData);
 
     SkAutoTUnref<SkDataTable> table(SkDataTable::NewArrayProc(gData,
                                           sizeof(gData[0]), count, NULL, NULL));
 
     REPORTER_ASSERT(reporter, table->count() == count);
     for (int i = 0; i < count; ++i) {
         size_t size;
         REPORTER_ASSERT(reporter, table->atSize(i) == sizeof(int));
         REPORTER_ASSERT(reporter, *table->atT<const char>(i, &size) == i);
         REPORTER_ASSERT(reporter, sizeof(int) == size);
     }
-    test_datatable_flatten(reporter, table);
 }
 
 static void TestDataTable(skiatest::Reporter* reporter) {
     test_emptytable(reporter);
     test_simpletable(reporter);
     test_vartable(reporter);
     test_tablebuilder(reporter);
     test_globaltable(reporter);
 }
 
@@ skipping 87 matching lines @@
     assert_len(reporter, tmp, 0);
     tmp->unref();
 
     test_cstring(reporter);
     test_files(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Data", DataTestClass, TestData)
 DEFINE_TESTCLASS("DataTable", DataTableTestClass, TestDataTable)