Revert "Adds SkPDFResourceDict class, refactor existing code to use it."

src/pdf/SkPDFFormXObject.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 "SkPDFFormXObject.h"
 
 #include "SkMatrix.h"
 #include "SkPDFCatalog.h"
 #include "SkPDFDevice.h"
-#include "SkPDFResourceDict.h"
 #include "SkPDFUtils.h"
 #include "SkStream.h"
 #include "SkTypes.h"
 
 SkPDFFormXObject::SkPDFFormXObject(SkPDFDevice* device) {
     // We don't want to keep around device because we'd have two copies
     // of content, so reference or copy everything we need (content and
     // resources).
     SkTSet<SkPDFObject*> emptySet;
-    SkPDFResourceDict* resourceDict = device->getResourceDict();
-    resourceDict->getResources(emptySet, &fResources, false);
+    device->getResources(emptySet, &fResources, false);
 
     SkAutoTUnref<SkStream> content(device->content());
     setData(content.get());
 
     insertName("Type", "XObject");
     insertName("Subtype", "Form");
     SkSafeUnref(this->insert("BBox", device->copyMediaBox()));
-    insert("Resources", resourceDict);
+    insert("Resources", device->getResourceDict());
 
     // We invert the initial transform and apply that to the xobject so that
     // it doesn't get applied twice. We can't just undo it because it's
     // embedded in things like shaders and images.
     if (!device->initialTransform().isIdentity()) {
         SkMatrix inverse;
         if (!device->initialTransform().invert(&inverse)) {
             // The initial transform should be invertible.
             SkASSERT(false);
             inverse.reset();
@@ skipping 13 matching lines @@
     fResources.unrefAll();
 }
 
 void SkPDFFormXObject::getResources(
         const SkTSet<SkPDFObject*>& knownResourceObjects,
         SkTSet<SkPDFObject*>* newResourceObjects) {
     GetResourcesHelper(&fResources.toArray(),
                        knownResourceObjects,
                        newResourceObjects);
 }