SkPDF: ResourceDict replaced by factory function

src/pdf/SkPDFDevice.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 "SkPDFDevice.h"
 
 #include "SkAnnotation.h"
@@ skipping 1263 matching lines @@
         fLastMarginContentEntry = contentEntry;
     }
 }
 
 void SkPDFDevice::setDrawingArea(DrawingArea drawingArea) {
     // A ScopedContentEntry only exists during the course of a draw call, so
     // this can't be called while a ScopedContentEntry exists.
     fDrawingArea = drawingArea;
 }
 
-SkPDFResourceDict* SkPDFDevice::createResourceDict() const {
-    SkAutoTUnref<SkPDFResourceDict> resourceDict(SkNEW(SkPDFResourceDict));
-    if (fGraphicStateResources.count()) {
-        for (int i = 0; i < fGraphicStateResources.count(); i++) {
-            resourceDict->insertResourceAsReference(
-                    SkPDFResourceDict::kExtGState_ResourceType,
-                    i, fGraphicStateResources[i]);
-        }
+SkPDFDict* SkPDFDevice::createResourceDict() const {
+    SkTDArray<SkPDFObject*> fonts;
+    fonts.setReserve(fFontResources.count());
+    for (SkPDFFont* font : fFontResources) {
+        fonts.push(font);
     }
-
-    if (fXObjectResources.count()) {
-        for (int i = 0; i < fXObjectResources.count(); i++) {
-            resourceDict->insertResourceAsReference(
-                    SkPDFResourceDict::kXObject_ResourceType,
-                    i, fXObjectResources[i]);
-        }
-    }
-
-    if (fFontResources.count()) {
-        for (int i = 0; i < fFontResources.count(); i++) {
-            resourceDict->insertResourceAsReference(
-                    SkPDFResourceDict::kFont_ResourceType,
-                    i, fFontResources[i]);
-        }
-    }
-
-    if (fShaderResources.count()) {
-        SkAutoTUnref<SkPDFDict> patterns(new SkPDFDict());
-        for (int i = 0; i < fShaderResources.count(); i++) {
-            resourceDict->insertResourceAsReference(
-                    SkPDFResourceDict::kPattern_ResourceType,
-                    i, fShaderResources[i]);
-        }
-    }
-    return resourceDict.detach();
+    return SkPDFResourceDict::Create(
+            &fGraphicStateResources,
+            &fShaderResources,
+            &fXObjectResources,
+            &fonts);
 }
 
 const SkTDArray<SkPDFFont*>& SkPDFDevice::getFontResources() const {
     return fFontResources;
 }
 
 SkPDFArray* SkPDFDevice::copyMediaBox() const {
     // should this be a singleton?
     SkAutoTUnref<SkPDFInt> zero(SkNEW_ARGS(SkPDFInt, (0)));
 
@@ skipping 838 matching lines @@
         return;
     }
     SkAutoTUnref<SkPDFObject> image(SkPDFBitmap::Create(fCanon, subsetBitmap));
     if (!image) {
         return;
     }
 
     SkPDFUtils::DrawFormXObject(this->addXObjectResource(image.get()),
                                 &content.entry()->fContent);
 }