SkPDF: in-place font subsetting

tests/PDFGlyphsToUnicodeTest.cpp

 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "SkBitSet.h"
 #include "SkData.h"
-#include "SkPDFFont.h"
 #include "SkPDFMakeToUnicodeCmap.h"
 #include "SkStream.h"
 #include "Test.h"
 
+static const int kMaximumGlyphCount = SK_MaxU16 + 1;
+
 static bool stream_equals(const SkDynamicMemoryWStream& stream, size_t offset,
                           const char* buffer, size_t len) {
     sk_sp<SkData> data(stream.copyToData());
     if (offset + len > data->size()) {
         return false;
     }
     if (len != strlen(buffer)) {
         return false;
     }
     return memcmp(data->bytes() + offset, buffer, len) == 0;
 }
 
 DEF_TEST(ToUnicode, reporter) {
     SkTDArray<SkUnichar> glyphToUnicode;
     SkTDArray<uint16_t> glyphsInSubset;
-    SkPDFGlyphSet subset;
+    SkBitSet subset(kMaximumGlyphCount);
 
     glyphToUnicode.push(0);  // 0
     glyphToUnicode.push(0);  // 1
     glyphToUnicode.push(0);  // 2
     glyphsInSubset.push(3);
     glyphToUnicode.push(0x20);  // 3
     glyphsInSubset.push(4);
     glyphToUnicode.push(0x25);  // 4
     glyphsInSubset.push(5);
     glyphToUnicode.push(0x27);  // 5
@@ skipping 18 matching lines @@
     glyphsInSubset.push(0xFE);
     glyphToUnicode.push(0x1010);
     glyphsInSubset.push(0xFF);
     glyphToUnicode.push(0x1011);
     glyphsInSubset.push(0x100);
     glyphToUnicode.push(0x1012);
     glyphsInSubset.push(0x101);
     glyphToUnicode.push(0x1013);
 
     SkDynamicMemoryWStream buffer;
-    subset.set(glyphsInSubset.begin(), glyphsInSubset.count());
+    subset.setAll(glyphsInSubset.begin(), glyphsInSubset.count());
     SkPDFAppendCmapSections(glyphToUnicode, &subset, &buffer, true, 0, 0xFFFF);
 
     char expectedResult[] =
 "4 beginbfchar\n\
 <0003> <0020>\n\
 <0004> <0025>\n\
 <0008> <002F>\n\
 <0009> <0033>\n\
 endbfchar\n\
 4 beginbfrange\n\
@@ skipping 50 matching lines @@
 1 beginbfrange\n\
 <0003> <0006> <1010>\n\
 endbfrange\n";
 
     REPORTER_ASSERT(reporter, stream_equals(buffer, 0,
                                             expectedResultSingleBytes,
                                             buffer.getOffset()));
 
     glyphToUnicode.reset();
     glyphsInSubset.reset();
-    SkPDFGlyphSet subset2;
+    SkBitSet subset2(kMaximumGlyphCount);
 
     // Test mapping:
     //           I  n  s  t  a  l
     // Glyph id 2c 51 56 57 44 4f
     // Unicode  49 6e 73 74 61 6c
     for (SkUnichar i = 0; i < 100; ++i) {
       glyphToUnicode.push(i + 29);
     }
 
     glyphsInSubset.push(0x2C);
     glyphsInSubset.push(0x44);
     glyphsInSubset.push(0x4F);
     glyphsInSubset.push(0x51);
     glyphsInSubset.push(0x56);
     glyphsInSubset.push(0x57);
 
     SkDynamicMemoryWStream buffer2;
-    subset2.set(glyphsInSubset.begin(), glyphsInSubset.count());
+    subset2.setAll(glyphsInSubset.begin(), glyphsInSubset.count());
     SkPDFAppendCmapSections(glyphToUnicode, &subset2, &buffer2, true, 0, 0xffff);
 
     char expectedResult2[] =
 "4 beginbfchar\n\
 <002C> <0049>\n\
 <0044> <0061>\n\
 <004F> <006C>\n\
 <0051> <006E>\n\
 endbfchar\n\
 1 beginbfrange\n\
 <0056> <0057> <0073>\n\
 endbfrange\n";
 
     REPORTER_ASSERT(reporter, stream_equals(buffer2, 0, expectedResult2,
                                             buffer2.getOffset()));
 }