SkPDF: in-place font subsetting

tests/PDFPrimitivesTest.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 "Resources.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 13 matching lines @@
 #include "SkStream.h"
 #include "SkTypes.h"
 #include "Test.h"
 #include "sk_tool_utils.h"
 
 #include <cstdlib>
 #include <cmath>
 
 #define DUMMY_TEXT "DCT compessed stream."
 
-namespace {
-struct Catalog {
-    SkPDFSubstituteMap substitutes;
-    SkPDFObjNumMap numbers;
-};
-}  // namespace
-
 template <typename T>
-static SkString emit_to_string(T& obj, Catalog* catPtr = nullptr) {
-    Catalog catalog;
+static SkString emit_to_string(T& obj, SkPDFObjNumMap* catPtr = nullptr) {
+    SkPDFObjNumMap catalog;
     SkDynamicMemoryWStream buffer;
     if (!catPtr) {
         catPtr = &catalog;
     }
-    obj.emitObject(&buffer, catPtr->numbers, catPtr->substitutes);
+    obj.emitObject(&buffer, *catPtr);
     SkString tmp(buffer.bytesWritten());
     buffer.copyTo(tmp.writable_str());
     return tmp;
 }
 
 static bool eq(const SkString& str, const char* strPtr, size_t len) {
     return len == str.size() && 0 == memcmp(str.c_str(), strPtr, len);
 }
 
 static void assert_eql(skiatest::Reporter* reporter,
@@ skipping 82 matching lines @@
     // Assert that repeated calls to get the object number return
     // consistent result.
     REPORTER_ASSERT(reporter, objNumMap.getObjectNumber(a1.get()) == 1);
 }
 
 static void TestObjectRef(skiatest::Reporter* reporter) {
     sk_sp<SkPDFArray> a1(new SkPDFArray);
     sk_sp<SkPDFArray> a2(new SkPDFArray);
     a2->appendObjRef(a1);
 
-    Catalog catalog;
-    catalog.numbers.addObject(a1.get());
-    REPORTER_ASSERT(reporter, catalog.numbers.getObjectNumber(a1.get()) == 1);
+    SkPDFObjNumMap catalog;
+    catalog.addObject(a1.get());
+    REPORTER_ASSERT(reporter, catalog.getObjectNumber(a1.get()) == 1);
 
     SkString result = emit_to_string(*a2, &catalog);
     // If appendObjRef misbehaves, then the result would
     // be [[]], not [1 0 R].
     assert_eq(reporter, result, "[1 0 R]");
 }
 
-static void TestSubstitute(skiatest::Reporter* reporter) {
-    sk_sp<SkPDFDict> proxy(new SkPDFDict());
-    sk_sp<SkPDFDict> stub(new SkPDFDict());
-
-    proxy->insertInt("Value", 33);
-    stub->insertInt("Value", 44);
-
-    SkPDFSubstituteMap substituteMap;
-    substituteMap.setSubstitute(proxy.get(), stub.get());
-    SkPDFObjNumMap catalog;
-    catalog.addObject(proxy.get());
-
-    REPORTER_ASSERT(reporter, stub.get() == substituteMap.getSubstitute(proxy.get()));
-    REPORTER_ASSERT(reporter, proxy.get() != substituteMap.getSubstitute(stub.get()));
-}
-
 // This test used to assert without the fix submitted for
 // http://code.google.com/p/skia/issues/detail?id=1083.
 // SKP files might have invalid glyph ids. This test ensures they are ignored,
 // and there is no assert on input data in Debug mode.
 static void test_issue1083() {
     SkDynamicMemoryWStream outStream;
     sk_sp<SkDocument> doc(SkDocument::MakePDF(&outStream));
     SkCanvas* canvas = doc->beginPage(100.0f, 100.0f);
     SkPaint paint;
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
@@ skipping 89 matching lines @@
                    "(Another String)]");
 
     sk_sp<SkPDFArray> innerArray(new SkPDFArray);
     innerArray->appendInt(-1);
     array->appendObject(std::move(innerArray));
     assert_emit_eq(reporter, *array,
                    "[42 .5 0 true /ThisName /AnotherName (This String) "
                    "(Another String) [-1]]");
 
     sk_sp<SkPDFArray> referencedArray(new SkPDFArray);
-    Catalog catalog;
-    catalog.numbers.addObject(referencedArray.get());
-    REPORTER_ASSERT(reporter, catalog.numbers.getObjectNumber(
+    SkPDFObjNumMap catalog;
+    catalog.addObject(referencedArray.get());
+    REPORTER_ASSERT(reporter, catalog.getObjectNumber(
                             referencedArray.get()) == 1);
     array->appendObjRef(std::move(referencedArray));
 
     SkString result = emit_to_string(*array, &catalog);
     assert_eq(reporter, result,
               "[42 .5 0 true /ThisName /AnotherName (This String) "
               "(Another String) [-1] 1 0 R]");
 }
 
 static void TestPDFDict(skiatest::Reporter* reporter) {
@@ skipping 41 matching lines @@
                    "/n5 /AnotherName\n/n6 (A String)>>");
 
     dict->insertString("n7", SkString("Another String"));
     assert_emit_eq(reporter, *dict, "<</n1 24\n/n2 99\n/n3 .5\n/n4 /AName\n"
                    "/n5 /AnotherName\n/n6 (A String)\n/n7 (Another String)>>");
 
     dict.reset(new SkPDFDict("DType"));
     assert_emit_eq(reporter, *dict, "<</Type /DType>>");
 
     sk_sp<SkPDFArray> referencedArray(new SkPDFArray);
-    Catalog catalog;
-    catalog.numbers.addObject(referencedArray.get());
-    REPORTER_ASSERT(reporter, catalog.numbers.getObjectNumber(
+    SkPDFObjNumMap catalog;
+    catalog.addObject(referencedArray.get());
+    REPORTER_ASSERT(reporter, catalog.getObjectNumber(
                             referencedArray.get()) == 1);
     dict->insertObjRef("n1", std::move(referencedArray));
     SkString result = emit_to_string(*dict, &catalog);
     assert_eq(reporter, result, "<</Type /DType\n/n1 1 0 R>>");
 }
 
 DEF_TEST(PDFPrimitives, reporter) {
     TestPDFUnion(reporter);
     TestPDFArray(reporter);
     TestPDFDict(reporter);
     TestPDFStream(reporter);
     TestObjectNumberMap(reporter);
     TestObjectRef(reporter);
-    TestSubstitute(reporter);
     test_issue1083();
 }
 
 namespace {
 
 class DummyImageFilter : public SkImageFilter {
 public:
     static sk_sp<DummyImageFilter> Make(bool visited = false) {
         return sk_sp<DummyImageFilter>(new DummyImageFilter(visited));
     }
@@ skipping 124 matching lines @@
     char buffer[5];
     for (int i = 0; i < 256; ++i) {
         size_t len = SkPDFUtils::ColorToDecimal(i, buffer);
         REPORTER_ASSERT(reporter, len == strlen(buffer));
         float f;
         REPORTER_ASSERT(reporter, 1 == sscanf(buffer, "%f", &f));
         int roundTrip = (int)(0.5 + f * 255);
         REPORTER_ASSERT(reporter, roundTrip == i);
     }
 }