SkPDF: Refactor SkPDFObject heiararchy.

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"
 
@@ skipping 28 matching lines @@
         SkPDFResourceDict::SkPDFResourceType type) {
     SkASSERT(type >= 0);
     SkASSERT(type < SkPDFResourceDict::kResourceTypeCount);
 
     return resource_type_prefixes[type];
 }
 
 static const char* get_resource_type_name(
         SkPDFResourceDict::SkPDFResourceType type) {
     SkASSERT(type >= 0);
-    SkASSERT(type < SkPDFResourceDict::kResourceTypeCount);
+    SkASSERT(type < SK_ARRAY_COUNT(resource_type_names));
 
     return resource_type_names[type];
 }
 
 SkString SkPDFResourceDict::getResourceName(
         SkPDFResourceDict::SkPDFResourceType type, int key) {
     SkString keyString;
     keyString.printf("%c%d", get_resource_type_prefix(type), key);
     return keyString;
 }
 
 static void add_subdict(
         const SkTDArray<SkPDFObject*>& resourceList,
         SkPDFResourceDict::SkPDFResourceType type,
         SkPDFDict* dst) {
     if (0 == resourceList.count()) {
         return;
     }
     SkAutoTUnref<SkPDFDict> resources(SkNEW(SkPDFDict));
     for (int i = 0; i < resourceList.count(); i++) {
-        SkString keyString = SkPDFResourceDict::getResourceName(type, i);
-        SkAutoTUnref<SkPDFName> keyName(SkNEW_ARGS(SkPDFName, (keyString)));
-        SkAutoTUnref<SkPDFObjRef> ref(
-                SkNEW_ARGS(SkPDFObjRef, (resourceList[i])));
-        resources->insert(keyName, ref);
+        resources->insertObjRef(SkPDFResourceDict::getResourceName(type, i),
+                                SkRef(resourceList[i]));
     }
-    dst->insert(get_resource_type_name(type), resources);
+    dst->insertObject(get_resource_type_name(type), resources.detach());
 }
 
 SkPDFDict* SkPDFResourceDict::Create(
         const SkTDArray<SkPDFObject*>* gStateResources,
         const SkTDArray<SkPDFObject*>* patternResources,
         const SkTDArray<SkPDFObject*>* xObjectResources,
         const SkTDArray<SkPDFObject*>* fontResources) {
     SkAutoTUnref<SkPDFDict> dict(SkNEW(SkPDFDict));
     static const char kProcs[][7] = {
         "PDF", "Text", "ImageB", "ImageC", "ImageI"};
     SkAutoTUnref<SkPDFArray> procSets(SkNEW(SkPDFArray));
 
     procSets->reserve(SK_ARRAY_COUNT(kProcs));
     for (size_t i = 0; i < SK_ARRAY_COUNT(kProcs); i++) {
         procSets->appendName(kProcs[i]);
     }
-    dict->insert("ProcSets", procSets);
+    dict->insertObject("ProcSets", procSets.detach());
 
     if (gStateResources) {
         add_subdict(*gStateResources, kExtGState_ResourceType, dict);
     }
     if (patternResources) {
         add_subdict(*patternResources, kPattern_ResourceType, dict);
     }
     if (xObjectResources) {
         add_subdict(*xObjectResources, kXObject_ResourceType, dict);
     }
     if (fontResources) {
         add_subdict(*fontResources, kFont_ResourceType, dict);
     }
     return dict.detach();
 }