Add SkPDFResourceDict class, refactor existing code

src/pdf/SkPDFResourceDict.cpp

+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPDFResourceDict.h"
+#include "SkPostConfig.h"
+
+SK_DEFINE_INST_COUNT(SkPDFResourceDict)
+
+// Sanity check that the values of enum SkPDFResourceType correspond to the
+// expected values as defined in the arrays below.
+// If these are failing, you may need to update the resource_type_prefixes
+// and resource_type_names arrays below.
+SK_COMPILE_ASSERT(SkPDFResourceDict::kExtGState_ResourceType == 0,
+                  resource_type_mismatch);
+SK_COMPILE_ASSERT(SkPDFResourceDict::kPattern_ResourceType == 1,
+                  resource_type_mismatch);
+SK_COMPILE_ASSERT(SkPDFResourceDict::kXObject_ResourceType == 2,
+                  resource_type_mismatch);
+SK_COMPILE_ASSERT(SkPDFResourceDict::kFont_ResourceType == 3,
+                  resource_type_mismatch);
+
+static char resource_type_prefixes[] = {

[vandebo (ex-Chrome), 2013/07/12 19:14:59]

sorry, this should be const as well.

[ducky, 2013/07/12 21:18:17]

Done.

+        'G',

[vandebo (ex-Chrome), 2013/07/12 19:14:59]

These constants are currently being used directly in SkPDFDevice.  Since we're
making them actual constants here, they should probably be publicly exposed as
constants and used in SkPDFDevice instead of the literal values.

Actually, probably a better alternative is to have a static method on this class
that given a resource type and index, returns/appends the thing "i.e. G0".

[ducky, 2013/07/12 21:18:17]

Done. Also refactored all usage cases.

+        'P',
+        'X',
+        'F'
+};
+
+static const char* resource_type_names[] = {
+        "ExtGState",
+        "Pattern",
+        "XObject",
+        "Font"
+};
+
+static char get_resource_type_prefix(
+        SkPDFResourceDict::SkPDFResourceType type) {
+    SkASSERT(type >= SkPDFResourceDict::kExtGState_ResourceType);
+    SkASSERT(type <= SkPDFResourceDict::kFont_ResourceType);

[vandebo (ex-Chrome), 2013/07/12 19:14:59]

Your asserts here should use 0 and Count

[ducky, 2013/07/12 21:18:17]

Done.

+
+    return resource_type_prefixes[type];
+}
+
+static const char* get_resource_type_name(
+        SkPDFResourceDict::SkPDFResourceType type) {
+    SkASSERT(type >= SkPDFResourceDict::kExtGState_ResourceType);
+    SkASSERT(type <= SkPDFResourceDict::kFont_ResourceType);
+
+    return resource_type_names[type];
+}
+
+SkPDFResourceDict::SkPDFResourceDict() : SkPDFDict() {
+    const char procs[][7] = {"PDF", "Text", "ImageB", "ImageC", "ImageI"};
+    SkPDFArray* procSets = SkNEW(SkPDFArray());
+
+    procSets->reserve(SK_ARRAY_COUNT(procs));
+    for (size_t i = 0; i < SK_ARRAY_COUNT(procs); i++) {
+        procSets->appendName(procs[i]);
+    }
+    insert("ProcSets", procSets)->unref();
+
+    // Actual sub-dicts will be lazily added later
+    fTypes.setCount(kResourceTypeCount);
+    for (size_t i=0; i < kResourceTypeCount; i++) {
+        fTypes[i] = NULL;
+    }
+}
+
+SkPDFObject* SkPDFResourceDict::insertResourceAsRef(
+        SkPDFResourceType type, int key, SkPDFObject* value) {
+    SkAutoTUnref<SkPDFObjRef> ref(SkNEW_ARGS(SkPDFObjRef, (value)));
+    insertResource(type, key, ref);
+    fResources.add(value);
+
+    return value;
+}
+
+void SkPDFResourceDict::getResources(
+        const SkTSet<SkPDFObject*>& knownResourceObjects,
+        SkTSet<SkPDFObject*>* newResourceObjects,
+        bool recursive) const {
+    // TODO: reserve not correct if we need to recursively explore.
+    newResourceObjects->setReserve(newResourceObjects->count() +
+                                   fResources.count());
+
+    for (int i = 0; i < fResources.count(); i++) {
+        if (!knownResourceObjects.contains(fResources[i]) &&
+                !newResourceObjects->contains(fResources[i])) {
+            newResourceObjects->add(fResources[i]);
+            fResources[i]->ref();
+            if (recursive) {
+                fResources[i]->getResources(knownResourceObjects,
+                                            newResourceObjects);
+            }
+        }
+    }
+}
+
+SkPDFObject* SkPDFResourceDict::insertResource(
+        SkPDFResourceType type, int key, SkPDFObject* value) {
+    SkPDFDict* typeDict = fTypes[type];
+    if (NULL == typeDict) {
+        typeDict = SkNEW(SkPDFDict());

[vandebo (ex-Chrome), 2013/07/12 19:14:59]

It'll be the same number of lines, but less fragile to assign to an SkAutoTUnref
and also assign to typeDict

[ducky, 2013/07/12 21:18:17]

Done.

+        SkPDFName* typeName = SkNEW_ARGS(
+                SkPDFName, (get_resource_type_name(type)));
+        insert(typeName, typeDict);  // ref counting handled here
+        fTypes[type] = typeDict;
+        typeDict->unref();
+    }
+
+    SkString keyString;
+    keyString.printf("%c%d", get_resource_type_prefix(type), key);
+    SkPDFName* keyName = SkNEW_ARGS(SkPDFName, (keyString));
+    typeDict->insert(keyName, value);
+    return value;
+}