Basic support for Type3 Fonts in Pdf + various refactorings

Review URL: https://codereview.chromium.org/17748002

git-svn-id: http://skia.googlecode.com/svn/trunk@9757 2bbb7eff-a529-9590-31e7-b0007b416f81

experimental/PdfViewer/SkPdfBasics.h

@@ -0,0 +1,136 @@
+#ifndef __DEFINED__SkPdfBasics
+#define __DEFINED__SkPdfBasics
+
+#include "podofo.h"
+using namespace PoDoFo;
+
+#include <iostream>
+#include <cstdio>
+#include <stack>
+
+//#define PDF_TRACE
+//#define PDF_TRACE_DIFF_IN_PNG
+//#define PDF_DEBUG_NO_CLIPING
+//#define PDF_DEBUG_NO_PAGE_CLIPING
+//#define PDF_DEBUG_3X
+
+class SkPdfFont;
+class SkPdfDoc;
+
+// TODO(edisonn): better class design.
+struct PdfColorOperator {
+    std::string fColorSpace;  // TODO(edisonn): use SkString
+    SkColor fColor;
+    double fOpacity;  // ca or CA
+    // TODO(edisonn): add here other color space options.
+
+    void setRGBColor(SkColor color) {
+        // TODO(edisonn): ASSERT DeviceRGB is the color space.
+        fColor = color;
+    }
+    // TODO(edisonn): double check the default values for all fields.
+    PdfColorOperator() : fColor(SK_ColorBLACK), fOpacity(1) {}
+
+    void applyGraphicsState(SkPaint* paint) {
+        paint->setColor(SkColorSetA(fColor, fOpacity * 255));
+    }
+};
+
+// TODO(edisonn): better class design.
+struct PdfGraphicsState {
+    SkMatrix            fMatrix;
+    SkMatrix            fMatrixTm;
+    SkMatrix            fMatrixTlm;
+
+    double              fCurPosX;
+    double              fCurPosY;
+
+    double              fCurFontSize;
+    bool                fTextBlock;
+    SkPdfFont*          fSkFont;
+    SkPath              fPath;
+    bool                fPathClosed;
+
+    // Clip that is applied after the drawing is done!!!
+    bool                fHasClipPathToApply;
+    SkPath              fClipPath;
+
+    PdfColorOperator    fStroking;
+    PdfColorOperator    fNonStroking;
+
+    double              fLineWidth;
+    double              fTextLeading;
+    double              fWordSpace;
+    double              fCharSpace;
+
+    SkPdfResourceDictionary* fResources;
+
+    SkBitmap            fSMask;
+
+    PdfGraphicsState() {
+        fCurPosX      = 0.0;
+        fCurPosY      = 0.0;
+        fCurFontSize  = 0.0;
+        fTextBlock    = false;
+        fMatrix       = SkMatrix::I();
+        fMatrixTm     = SkMatrix::I();
+        fMatrixTlm    = SkMatrix::I();
+        fPathClosed   = true;
+        fLineWidth    = 0;
+        fTextLeading  = 0;
+        fWordSpace    = 0;
+        fCharSpace    = 0;
+        fHasClipPathToApply = false;
+        fResources    = NULL;
+        fSkFont       = NULL;
+    }
+
+    void applyGraphicsState(SkPaint* paint, bool stroking) {
+        if (stroking) {
+            fStroking.applyGraphicsState(paint);
+        } else {
+            fNonStroking.applyGraphicsState(paint);
+        }
+
+        // TODO(edisonn): get this from pdfContext->options,
+        // or pdfContext->addPaintOptions(&paint);
+        paint->setAntiAlias(true);
+
+        // TODO(edisonn): dashing, miter, ...
+        paint->setStrokeWidth(SkDoubleToScalar(fLineWidth));
+    }
+};
+
+// TODO(edisonn): better class design.
+struct PdfInlineImage {
+    std::map<std::string, std::string> fKeyValuePairs;
+    std::string fImageData;
+};
+
+// TODO(edisonn): better class design.
+struct PdfContext {
+    std::stack<SkPdfObject*>        fObjectStack;
+    std::stack<PdfGraphicsState>    fStateStack;
+    PdfGraphicsState                fGraphicsState;
+    SkPdfDoc*                       fPdfDoc;
+    SkMatrix                        fOriginalMatrix;
+
+    PdfInlineImage                  fInlineImage;
+
+    PdfContext(SkPdfDoc* doc) :  fPdfDoc(doc) {}
+
+};
+
+//  TODO(edisonn): temporary code, to report how much of the PDF we actually think we rendered.
+enum PdfResult {
+    kOK_PdfResult,
+    kPartial_PdfResult,
+    kNYI_PdfResult,
+    kIgnoreError_PdfResult,
+    kError_PdfResult,
+    kUnsupported_PdfResult,
+
+    kCount_PdfResult
+};
+
+#endif  // __DEFINED__SkPdfBasics

experimental/PdfViewer/SkPdfFont.cpp

@@ -70,6 +70,7 @@ std::map<std::string, SkPdfStandardFontEntry>& getStandardFonts() {
         // see FT_Get_Postscript_Name
         // Font config is not using it, yet.
         //https://bugs.freedesktop.org/show_bug.cgi?id=18095
+
         gPdfStandardFonts["Arial-Black"] = {"Arial", true, false};
         gPdfStandardFonts["DejaVuSans"] = {"DejaVu Sans", false, false};
         gPdfStandardFonts["DejaVuSansMono"] = {"DejaVuSans Mono", false, false};
@@ -82,6 +83,34 @@ std::map<std::string, SkPdfStandardFontEntry>& getStandardFonts() {
         gPdfStandardFonts["TrebuchetMS-Bold"] = {"Trebuchet MS", true, false};
         gPdfStandardFonts["Verdana-Bold"] = {"Verdana", true, false};
         gPdfStandardFonts["WenQuanYiMicroHei"] = {"WenQuanYi Micro Hei", false, false};
+
+        // TODO(edisonn): list all phonts available, builf post script name as in pdf spec
+        /*
+         * The PostScript name for the value of BaseFontis determined in one of two ways:
+• Use the PostScript name that is an optional entry in the “name” table of the
+TrueType font itself.
+• In the absence of such an entry in the “name” table, derive a PostScript name
+from the name by which the font is known in the host operating system: on a
+Windows system, it is based on the lfFaceName field in a LOGFONT structure; in
+the Mac OS, it is based on the name of the FONDresource. If the name contains
+any spaces, the spaces are removed.
+If the font in a source document uses a bold or italic style, but there is no font
+data for that style, the host operating system will synthesize the style. In this case,
+a comma and the style name (one of Bold, Italic, or BoldItalic) are appended to the
+font name. For example, for a TrueType font that is a bold variant of the New
+         */
+
+        /*
+         * If the value of Subtype is MMType1.
+• If the PostScript name of the instance contains spaces, the spaces are replaced
+by underscores in the value of BaseFont. For instance, as illustrated in Example
+5.7, the name “MinionMM 366 465 11 ” (which ends with a space character)
+becomes /MinionMM_366_465_11_.
+         */
+
+        // might not work on all oses ?
+        //
+
     }
 
     return gPdfStandardFonts;
@@ -178,6 +207,8 @@ SkPdfType3Font* SkPdfFont::fontFromType3FontDictionary(SkPdfType3FontDictionary*
         return NULL;  // default one?
     }
 
+
+
     return new SkPdfType3Font(dict);
 }
 
@@ -213,26 +244,11 @@ static int skstoi(const SkPdfString* str) {
     return ret;
 }
 
-SkPdfType0Font::SkPdfType0Font(SkPdfType0FontDictionary* dict) {
-    fBaseFont = SkPdfFontFromName(dict, dict->BaseFont().c_str());
-
-    // TODO(edisonn): load encoding, let it now to be Identity-H by default
-    if (dict->has_Encoding()) {
-        if (dict->isEncodingAName()) {
-            //report encoding not supported
-            //fEncoding = loadEncodingFromName(dict->getEncodingAsName().c_str());
-        } else if (dict->isEncodingAStream()) {
-            //fEncoding = loadEncodingFromStream(dict->getEncodingAsStream());
-        } else {
-            // error
-        }
-    }
-
+SkPdfToUnicode::SkPdfToUnicode(const SkPdfStream* stream) {
     fCMapEncoding = NULL;
     fCMapEncodingFlag = NULL;
 
-    if (dict->has_ToUnicode()) {
-        const SkPdfStream* stream = dict->ToUnicode();
+    if (stream) {
         SkPdfTokenizer tokenizer(stream);
         PdfToken token;
 
@@ -318,3 +334,44 @@ SkPdfType0Font::SkPdfType0Font(SkPdfType0FontDictionary* dict) {
         }
     }
 }
+
+
+SkPdfType0Font::SkPdfType0Font(SkPdfType0FontDictionary* dict) {
+    fBaseFont = SkPdfFontFromName(dict, dict->BaseFont().c_str());
+    fEncoding = NULL;
+
+    if (dict->has_Encoding()) {
+        if (dict->isEncodingAName()) {
+            fEncoding = SkPdfEncoding::fromName(dict->getEncodingAsName().c_str());
+        } else if (dict->isEncodingAStream()) {
+            //fEncoding = loadEncodingFromStream(dict->getEncodingAsStream());
+        } else {
+            // TODO(edisonn): error ... warning .. assert?
+        }
+    }
+
+    if (dict->has_ToUnicode()) {
+        fToUnicode = new SkPdfToUnicode(dict->ToUnicode());
+    }
+}
+
+std::map<std::string, SkPdfEncoding*>& getStandardEncodings() {
+    static std::map<std::string, SkPdfEncoding*> encodings;
+    if (encodings.empty()) {
+        encodings["Identity-H"] = SkPdfIdentityHEncoding::instance();
+    }
+
+    return encodings;
+}
+
+
+SkPdfEncoding* SkPdfEncoding::fromName(const char* name) {
+    SkPdfEncoding* encoding = getStandardEncodings()[name];
+
+#ifdef PDF_TRACE
+    if (encoding == NULL) {
+        printf("Encoding not found: %s\n", name);
+    }
+#endif
+    return encoding;
+}

experimental/PdfViewer/SkPdfFont.h

@@ -8,6 +8,9 @@
 #include <string>
 
 #include "SkUtils.h"
+#include "SkPdfBasics.h"
+#include "SkPdfUtils.h"
+
 
 class SkPdfType0Font;
 class SkPdfType1Font;
@@ -42,6 +45,9 @@ public:
 struct SkDecodedText {
     uint16_t* text;
     int len;
+public:
+    unsigned int operator[](int i) const { return text[i]; }
+    int size() const { return len; }
 };
 
 struct SkUnicodeText {
@@ -56,8 +62,21 @@ public:
 class SkPdfEncoding {
 public:
     virtual bool decodeText(const SkUnencodedText& textIn, SkDecodedText* textOut) const = 0;
+    static SkPdfEncoding* fromName(const char* name);
 };
 
+std::map<std::string, SkPdfEncoding*>& getStandardEncodings();
+
+class SkPdfToUnicode {
+    // TODO(edisonn): hide public members
+public:
+    unsigned short* fCMapEncoding;
+    unsigned char* fCMapEncodingFlag;
+
+    SkPdfToUnicode(const SkPdfStream* stream);
+};
+
+
 class SkPdfIdentityHEncoding : public SkPdfEncoding {
 public:
     virtual bool decodeText(const SkUnencodedText& textIn, SkDecodedText* textOut) const {
@@ -80,25 +99,66 @@ public:
     }
 };
 
+
+class SkPdfCIDToGIDMapIdentityEncoding : public SkPdfEncoding {
+public:
+    virtual bool decodeText(const SkUnencodedText& textIn, SkDecodedText* textOut) const {
+        // TODO(edisonn): SkASSERT(textIn.len % 2 == 0); or report error?
+
+        unsigned char* text = (unsigned char*)textIn.text;
+        textOut->text = new uint16_t[textIn.len];
+        textOut->len = textIn.len;
+
+        for (int i = 0; i < textOut->len; i++) {
+            textOut->text[i] = text[i];
+        }
+
+        return true;
+    }
+
+    static SkPdfCIDToGIDMapIdentityEncoding* instance() {
+        static SkPdfCIDToGIDMapIdentityEncoding* inst = new SkPdfCIDToGIDMapIdentityEncoding();
+        return inst;
+    }
+};
+
 class SkPdfFont {
 public:
     SkPdfFont* fBaseFont;
     SkPdfEncoding* fEncoding;
+    SkPdfToUnicode* fToUnicode;
+
 
 public:
-    SkPdfFont() : fBaseFont(NULL), fEncoding(SkPdfIdentityHEncoding::instance()) {}
+    SkPdfFont() : fBaseFont(NULL), fEncoding(NULL), fToUnicode(NULL) {}
 
     const SkPdfEncoding* encoding() const {return fEncoding;}
 
-    void drawText(const SkUnicodeText& text, SkPaint* paint, SkCanvas* canvas, SkMatrix* matrix) {
+    void drawText(const SkDecodedText& text, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
         for (int i = 0 ; i < text.size(); i++) {
-            drawOneChar(text[i], paint, canvas, matrix);
+            drawOneChar(text[i], paint, pdfContext, canvas, matrix);
         }
     }
 
-    virtual void ToUnicode(const SkDecodedText& textIn, SkUnicodeText* textOut) const {
-        textOut->text = textIn.text;
-        textOut->len = textIn.len;
+    void ToUnicode(const SkDecodedText& textIn, SkUnicodeText* textOut) const {
+        if (fToUnicode) {
+            textOut->text = new uint16_t[textIn.len];
+            textOut->len = textIn.len;
+            for (int i = 0; i < textIn.len; i++) {
+                textOut->text[i] = fToUnicode->fCMapEncoding[textIn.text[i]];
+            }
+        } else {
+            textOut->text = textIn.text;
+            textOut->len = textIn.len;
+        }
+    };
+
+    inline unsigned int ToUnicode(unsigned int ch) const {
+        if (fToUnicode) {
+            return fToUnicode->fCMapEncoding[ch];
+        } else {
+            return ch;
+        }
     };
 
     static SkPdfFont* fontFromPdfDictionary(SkPdfFontDictionary* dict);
@@ -112,7 +172,7 @@ public:
     static SkPdfMultiMasterFont* fontFromMultiMasterFontDictionary(SkPdfMultiMasterFontDictionary* dict);
 
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, SkCanvas* canvas, SkMatrix* matrix) = 0;
+    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) = 0;
     virtual void afterChar(SkPaint* paint, SkMatrix* matrix) = 0;
     virtual void afterWord(SkPaint* paint, SkMatrix* matrix) = 0;
 };
@@ -124,7 +184,7 @@ public:
     SkPdfStandardFont(SkTypeface* typeface) : fTypeface(typeface) {}
 
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, SkCanvas* canvas, SkMatrix* matrix) {
+    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
         paint->setTypeface(fTypeface);
         paint->setTextEncoding(SkPaint::kUTF8_TextEncoding);
 
@@ -142,24 +202,14 @@ public:
     virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {}
 };
 
-
 class SkPdfType0Font : public SkPdfFont {
-    unsigned short* fCMapEncoding;
-    unsigned char* fCMapEncodingFlag;
 public:
     SkPdfType0Font(SkPdfType0FontDictionary* dict);
 
 public:
-    virtual void ToUnicode(const SkDecodedText& textIn, SkUnicodeText* textOut) const {
-        textOut->text = new uint16_t[textIn.len];
-        textOut->len = textIn.len;
-        for (int i = 0; i < textIn.len; i++) {
-            textOut->text[i] = fCMapEncoding[textIn.text[i]];
-        }
-    };
 
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, SkCanvas* canvas, SkMatrix* matrix) {
-        fBaseFont->drawOneChar(ch, paint, canvas, matrix);
+    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
+        fBaseFont->drawOneChar(ToUnicode(ch), paint, pdfContext, canvas, matrix);
     }
 
     virtual void afterChar(SkPaint* paint, SkMatrix* matrix) {
@@ -167,7 +217,6 @@ public:
     }
 
     virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {
-
     }
 };
 
@@ -178,7 +227,7 @@ public:
     }
 
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, SkCanvas* canvas, SkMatrix* matrix) {
+    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
 
     }
 
@@ -200,7 +249,7 @@ public:
 
 
 public:
-      virtual void drawOneChar(unsigned int ch, SkPaint* paint, SkCanvas* canvas, SkMatrix* matrix) {
+      virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
 
       }
 
@@ -221,7 +270,7 @@ public:
     }
 
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, SkCanvas* canvas, SkMatrix* matrix) {
+    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
 
     }
 
@@ -241,7 +290,7 @@ public:
     }
 
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, SkCanvas* canvas, SkMatrix* matrix) {
+    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
 
     }
 
@@ -253,20 +302,130 @@ public:
 
     }
 };
+/*
+class CIDToGIDMap {
+    virtual unsigned int map(unsigned int cid) = 0;
+    static CIDToGIDMap* fromName(const char* name);
+};
+
+class CIDToGIDMap_Identity {
+    virtual unsigned int map(unsigned int cid) { return cid; }
+
+    static CIDToGIDMap_Identity* instance() {
+        static CIDToGIDMap_Identity* inst = new CIDToGIDMap_Identity();
+        return inst;
+    }
+};
+
+CIDToGIDMap* CIDToGIDMap::fromName(const char* name) {
+    // The only one supported right now is Identity
+    if (strcmp(name, "Identity") == 0) {
+        return CIDToGIDMap_Identity::instance();
+    }
+
+#ifdef PDF_TRACE
+    // TODO(edisonn): warning/report
+    printf("Unknown CIDToGIDMap: %s\n", name);
+#endif
+    return NULL;
+}
+CIDToGIDMap* fCidToGid;
+*/
 
 class SkPdfType3Font : public SkPdfFont {
+    struct Type3FontChar {
+        SkPdfObject* fObj;
+        double fWidth;
+    };
+
+    SkPdfDictionary* fCharProcs;
+    SkPdfEncodingDictionary* fEncodingDict;
+    unsigned int fFirstChar;
+    unsigned int fLastChar;
+
+    SkRect fFontBBox;
+    SkMatrix fFonMatrix;
+
+    Type3FontChar* fChars;
+
 public:
     SkPdfType3Font(SkPdfType3FontDictionary* dict) {
         fBaseFont = SkPdfFontFromName(dict, dict->BaseFont().c_str());
+
+        if (dict->has_Encoding()) {
+            if (dict->isEncodingAName()) {
+                 fEncoding = SkPdfEncoding::fromName(dict->getEncodingAsName().c_str());
+            } else if (dict->isEncodingAEncodingdictionary()) {
+                 // technically, there is no encoding.
+                 fEncoding = SkPdfCIDToGIDMapIdentityEncoding::instance();
+                 fEncodingDict = dict->getEncodingAsEncodingdictionary();
+            }
+        }
+
+        // null?
+        fCharProcs = dict->CharProcs();
+
+        fToUnicode = NULL;
+        if (dict->has_ToUnicode()) {
+            fToUnicode = new SkPdfToUnicode(dict->ToUnicode());
+        }
+
+        fFirstChar = dict->FirstChar();
+        fLastChar = dict->LastChar();
+        fFonMatrix = dict->has_FontMatrix() ? *dict->FontMatrix() : SkMatrix::I();
+
+        if (dict->FontBBox()) {
+            fFontBBox = *dict->FontBBox();
+        }
+
+        fChars = new Type3FontChar[fLastChar - fFirstChar + 1];
+
+        memset(fChars, 0, sizeof(fChars[0]) * (fLastChar - fFirstChar + 1));
+
+
+        SkPdfArray* widths = dict->Widths();
+        for (int i = 0 ; i < widths->size(); i++) {
+            if ((fFirstChar + i) < fFirstChar || (fFirstChar + i) > fLastChar) {
+                printf("break; error 1\n");
+            }
+            fChars[i].fWidth = (*widths)[i]->asNumber()->value();
+        }
+
+        SkPdfArray* diffs = fEncodingDict->Differences();
+        int j = fFirstChar;
+        for (int i = 0 ; i < diffs->size(); i++) {
+            if ((*diffs)[i]->asInteger()) {
+                j = (*diffs)[i]->asInteger()->value();
+            } else if ((*diffs)[i]->asName()) {
+                if (j < fFirstChar || j > fLastChar) {
+                    printf("break; error 2\n");
+                }
+                fChars[j - fFirstChar].fObj = fCharProcs->get((*diffs)[i]->asName()->value().c_str());
+                j++;
+            } else {
+                // err
+            }
+        }
     }
 
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, SkCanvas* canvas, SkMatrix* matrix) {
+    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
+        if (ch < fFirstChar || ch > fLastChar || !fChars[ch - fFirstChar].fObj) {
+            fBaseFont->drawOneChar(ToUnicode(ch), paint, pdfContext, canvas, matrix);
+            return;
+        }
 
+#ifdef PDF_TRACE
+        printf("Type 3 char to unicode: %c\n", ToUnicode(ch));
+        if (ToUnicode(ch) == 'A') {
+            printf("break;\n");
+        }
+#endif
+
+        doType3Char(pdfContext, canvas, fChars[ch - fFirstChar].fObj, fFontBBox, fFonMatrix, pdfContext->fGraphicsState.fCurFontSize);
     }
 
     virtual void afterChar(SkPaint* paint, SkMatrix* matrix) {
-
     }
 
     virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {

experimental/PdfViewer/SkPdfParser.h

@@ -0,0 +1,164 @@
+/*
+ * 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 "podofo.h"
+#include "SkPdfHeaders_autogen.h"
+#include "SkPdfPodofoMapper_autogen.h"
+
+#ifndef SkPdfParser_DEFINED
+#define SkPdfParser_DEFINED
+
+
+enum SkPdfTokenType {
+    kKeyword_TokenType,
+    kObject_TokenType,
+    kImageData_TokenType,  // TODO(edisonn): inline images seem to work without it
+};
+
+struct PdfToken {
+    const char*      fKeyword;
+    SkPdfObject*     fObject;
+    SkPdfTokenType   fType;
+
+    PdfToken() : fKeyword(NULL), fObject(NULL) {}
+};
+
+class SkPdfTokenizer {
+    PdfContentsTokenizer* fTokenizer;
+    PdfMemDocument* fDoc;
+
+    char* fUncompressedStream;
+    pdf_long fUncompressedStreamLength;
+
+    bool fEmpty;
+    bool fHasPutBack;
+    PdfToken fPutBack;
+
+public:
+    SkPdfTokenizer(PdfMemDocument* doc = NULL, PdfContentsTokenizer* tokenizer = NULL) : fDoc(doc), fTokenizer(tokenizer), fEmpty(false), fUncompressedStream(NULL), fUncompressedStreamLength(0), fHasPutBack(false) {}
+    SkPdfTokenizer(const SkPdfObject* objWithStream) : fDoc(NULL), fTokenizer(NULL), fHasPutBack(false), fEmpty(false) {
+        fUncompressedStream = NULL;
+        fUncompressedStreamLength = 0;
+
+        fDoc = NULL;
+
+
+        try {
+            objWithStream->podofo()->GetStream()->GetFilteredCopy(&fUncompressedStream, &fUncompressedStreamLength);
+            if (fUncompressedStream != NULL && fUncompressedStreamLength != 0) {
+                fTokenizer = new PdfContentsTokenizer(fUncompressedStream, fUncompressedStreamLength);
+            } else {
+                fEmpty = true;
+            }
+        } catch (PdfError& e) {
+            fEmpty = true;
+        }
+
+    }
+
+    SkPdfTokenizer(const char* buffer, int len) : fDoc(NULL), fTokenizer(NULL), fHasPutBack(false), fUncompressedStream(NULL), fUncompressedStreamLength(0), fEmpty(false) {
+        try {
+            fTokenizer = new PdfContentsTokenizer(buffer, len);
+        } catch (PdfError& e) {
+            fEmpty = true;
+        }
+    }
+
+    ~SkPdfTokenizer() {
+        free(fUncompressedStream);
+    }
+
+    void PutBack(PdfToken token) {
+        SkASSERT(!fHasPutBack);
+        fHasPutBack = true;
+        fPutBack = token;
+    }
+
+    bool readToken(PdfToken* token) {
+        if (fHasPutBack) {
+            *token = fPutBack;
+            fHasPutBack = false;
+            return true;
+        }
+
+        if (fEmpty) {
+            return false;
+        }
+
+        PdfVariant var;
+        EPdfContentsType type;
+
+        token->fKeyword = NULL;
+        token->fObject = NULL;
+
+        bool ret = fTokenizer->ReadNext(type, token->fKeyword, var);
+
+        if (!ret) return ret;
+
+        switch (type) {
+            case ePdfContentsType_Keyword:
+                token->fType = kKeyword_TokenType;
+                break;
+
+            case ePdfContentsType_Variant: {
+                    token->fType = kObject_TokenType;
+                    PdfObject* obj = new PdfObject(var);
+                    PodofoMapper::map(*fDoc, *obj, &token->fObject);
+                }
+                break;
+
+            case ePdfContentsType_ImageData:
+                token->fType = kImageData_TokenType;
+                // TODO(edisonn): inline images seem to work without it
+                break;
+        }
+#ifdef PDF_TRACE
+        std::string str;
+        if (token->fObject) {
+            token->fObject->podofo()->ToString(str);
+        }
+        printf("%s %s\n", token->fType == kKeyword_TokenType ? "Keyword" : token->fType == kObject_TokenType ? "Object" : "ImageData", token->fKeyword ? token->fKeyword : str.c_str());
+#endif
+        return ret;
+    }
+};
+
+class SkPdfDoc {
+    PdfMemDocument fDoc;
+public:
+
+    PdfMemDocument& podofo() {return fDoc;}
+
+    SkPdfDoc(const char* path) : fDoc(path) {}
+
+    int pages() {
+        return fDoc.GetPageCount();
+    }
+
+    // Can return NULL
+    SkPdfPageObjectDictionary* page(int n) {
+        SkPdfPageObjectDictionary* page = NULL;
+        PodofoMapper::map(fDoc, *fDoc.GetPage(n)->GetObject(), &page);
+        return page;
+    }
+
+    SkRect MediaBox(int n) {
+        PdfRect rect = fDoc.GetPage(n)->GetMediaBox();
+        SkRect skrect = SkRect::MakeLTRB(SkDoubleToScalar(rect.GetLeft()),
+                                         SkDoubleToScalar(rect.GetBottom()),
+                                         SkDoubleToScalar(rect.GetLeft() + rect.GetWidth()),
+                                         SkDoubleToScalar(rect.GetBottom() + rect.GetHeight()));
+        return skrect;
+    }
+
+    SkPdfTokenizer* tokenizerOfPage(int n) {
+        PdfContentsTokenizer* t = new PdfContentsTokenizer(fDoc.GetPage(n));
+        return new SkPdfTokenizer(&fDoc, t);
+    }
+};
+
+#endif  // SkPdfParser_DEFINED

experimental/PdfViewer/SkPdfType3FontDictionary_autogen.h

@@ -1,104 +0,0 @@
-#ifndef __DEFINED__SkPdfType3FontDictionary
-#define __DEFINED__SkPdfType3FontDictionary
-
-#include "SkPdfEnums_autogen.h"
-#include "SkPdfArray_autogen.h"
-#include "SkPdfType0FontDictionary_autogen.h"
-
-// Entries in a Type 3 font dictionary
-class SkPdfType3FontDictionary : public SkPdfType0FontDictionary {
-public:
-  virtual SkPdfObjectType getType() const { return kType3FontDictionary_SkPdfObjectType;}
-  virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType3FontDictionary_SkPdfObjectType + 1);}
-public:
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return this;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return this;}
-
-private:
-public:
-private:
-public:
-  SkPdfType3FontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfType0FontDictionary(podofoDoc, podofoObj) {}
-
-  virtual bool valid() const {return true;}
-
-  SkPdfType3FontDictionary& operator=(const SkPdfType3FontDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
-
-/** (Required) The type of PDF object that this dictionary describes; must be
- *  Font for a font dictionary.
-**/
-  bool has_Type() const {
-    return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Type", "", NULL));
-  }
-
-  std::string Type() const {
-    std::string ret;
-    if (NameFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Type", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
-/** (Required) The type of font; must be Type3 for a Type 3 font.
-**/
-  bool has_Subtype() const {
-    return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Subtype", "", NULL));
-  }
-
-  std::string Subtype() const {
-    std::string ret;
-    if (NameFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Subtype", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
-/** (Required in PDF 1.0; optional otherwise) See Table 5.8 on page 317.
-**/
-  bool has_Name() const {
-    return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Name", "", NULL));
-  }
-
-  std::string Name() const {
-    std::string ret;
-    if (NameFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Name", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
-/** (Required) A rectangle (see Section 3.8.3, "Rectangles"), expressed in the
- *  glyph coordinate system, specifying the font bounding box. This is the small-
- *  est rectangle enclosing the shape that would result if all of the glyphs of the
- *  font were placed with their origins coincident and then filled.
- *  If all four elements of the rectangle are zero, no assumptions are made based
- *  on the font bounding box. If any element is nonzero, it is essential that the
- *  font bounding box be accurate; if any glyph's marks fall outside this bound-
- *  ing box, incorrect behavior may result.
-**/
-  bool has_FontBBox() const {
-    return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontBBox", "", NULL));
-  }
-
-  SkRect FontBBox() const {
-    SkRect ret;
-    if (SkRectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontBBox", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkRect();
-  }
-
-/** (Required) An array of six numbers specifying the font matrix, mapping
- *  glyph space to text space (see Section 5.1.3, "Glyph Positioning and
- *  Metrics"). A common practice is to define glyphs in terms of a 1000-unit
-**/
-  bool has_FontMatrix() const {
-    return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontMatrix", "", NULL));
-  }
-
-  SkPdfArray FontMatrix() const {
-    SkPdfArray ret;
-    if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontMatrix", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
-  }
-
-};
-
-#endif  // __DEFINED__SkPdfType3FontDictionary

experimental/PdfViewer/SkPdfUtils.h

@@ -0,0 +1,126 @@
+#ifndef __DEFINED__SkPdfUtils
+#define __DEFINED__SkPdfUtils
+
+#include "podofo.h"
+using namespace PoDoFo;
+
+#include "SkPdfBasics.h"
+
+const PdfObject* resolveReferenceObject(const PdfMemDocument* pdfDoc,
+                                  const PdfObject* obj,
+                                  bool resolveOneElementArrays = false);
+
+bool LongFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        long* data);
+
+bool DoubleFromDictionary(const PdfMemDocument* pdfDoc,
+                          const PdfDictionary& dict,
+                          const char* key,
+                          const char* abr,
+                          double* data);
+
+bool BoolFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        bool* data);
+
+bool NameFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        std::string* data);
+
+bool StringFromDictionary(const PdfMemDocument* pdfDoc,
+                          const PdfDictionary& dict,
+                          const char* key,
+                          const char* abr,
+                          std::string* data);
+
+class SkPdfDictionary;
+bool DictionaryFromDictionary(const PdfMemDocument* pdfDoc,
+                              const PdfDictionary& dict,
+                              const char* key,
+                              const char* abr,
+                              SkPdfDictionary** data);
+
+template <typename T>
+bool DictionaryFromDictionary2(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        T** data);
+
+class SkPdfObject;
+bool ObjectFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        SkPdfObject** data);
+
+
+struct SkPdfFileSpec {};
+class SkPdfArray;
+class SkPdfStream;
+struct SkPdfDate {};
+struct SkPdfTree {};
+struct SkPdfFunction {};
+
+bool ArrayFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        SkPdfArray** data);
+
+bool SkMatrixFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        SkMatrix** data);
+
+bool FileSpecFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        SkPdfFileSpec* data);
+
+
+bool StreamFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        SkPdfStream** data);
+
+bool TreeFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        SkPdfTree** data);
+
+bool DateFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        SkPdfDate* data);
+
+bool SkRectFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        SkRect** data);
+
+bool FunctionFromDictionary(const PdfMemDocument* pdfDoc,
+                        const PdfDictionary& dict,
+                        const char* key,
+                        const char* abr,
+                        SkPdfFunction* data);
+
+bool skpdfmap(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj, SkPdfObject** out);
+SkMatrix SkMatrixFromPdfArray(SkPdfArray* pdfArray);
+
+PdfResult doType3Char(PdfContext* pdfContext, SkCanvas* canvas, SkPdfObject* skobj, SkRect bBox, SkMatrix matrix, double textSize);
+
+#endif   // __DEFINED__SkPdfUtils

experimental/PdfViewer/autogen/SkPdfALinkAnnotationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfALinkAnnotationDictionary
 #define __DEFINED__SkPdfALinkAnnotationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfALinkAnnotationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfALinkAnnotationDictionary(const SkPdfALinkAnnotationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfALinkAnnotationDictionary& operator=(const SkPdfALinkAnnotationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -566,11 +569,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getDestAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getDestAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Dest", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
   bool isDestAName() const {

experimental/PdfViewer/autogen/SkPdfActionDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfActionDictionary
 #define __DEFINED__SkPdfActionDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfActionDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfActionDictionary(const SkPdfActionDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfActionDictionary& operator=(const SkPdfActionDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -578,11 +581,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getNextAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getNextAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Next", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfAlternateImageDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfAlternateImageDictionary
 #define __DEFINED__SkPdfAlternateImageDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfAlternateImageDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfAlternateImageDictionary(const SkPdfAlternateImageDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfAlternateImageDictionary& operator=(const SkPdfAlternateImageDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfAnnotationActionsDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfAnnotationActionsDictionary
 #define __DEFINED__SkPdfAnnotationActionsDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfAnnotationActionsDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfAnnotationActionsDictionary(const SkPdfAnnotationActionsDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfAnnotationActionsDictionary& operator=(const SkPdfAnnotationActionsDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfAnnotationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfAnnotationDictionary
 #define __DEFINED__SkPdfAnnotationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfAnnotationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfAnnotationDictionary(const SkPdfAnnotationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfAnnotationDictionary& operator=(const SkPdfAnnotationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -589,11 +592,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Rect", "", NULL));
   }
 
-  SkRect Rect() const {
-    SkRect ret;
+  SkRect* Rect() const {
+    SkRect* ret;
     if (SkRectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Rect", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkRect();
+    return NULL;
   }
 
 /** (Optional; PDF 1.4) The annotation name, a text string uniquely identifying
@@ -697,11 +700,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Border", "", NULL));
   }
 
-  SkPdfArray Border() const {
-    SkPdfArray ret;
+  SkPdfArray* Border() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Border", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.2) An appearance dictionary specifying how the annotation
@@ -746,11 +749,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "C", "", NULL));
   }
 
-  SkPdfArray C() const {
-    SkPdfArray ret;
+  SkPdfArray* C() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "C", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.4) The constant opacity value to be used in painting the

experimental/PdfViewer/autogen/SkPdfAppearanceCharacteristicsDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfAppearanceCharacteristicsDictionary
 #define __DEFINED__SkPdfAppearanceCharacteristicsDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfAppearanceCharacteristicsDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfAppearanceCharacteristicsDictionary(const SkPdfAppearanceCharacteristicsDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfAppearanceCharacteristicsDictionary& operator=(const SkPdfAppearanceCharacteristicsDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -549,11 +552,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BC", "", NULL));
   }
 
-  SkPdfArray BC() const {
-    SkPdfArray ret;
+  SkPdfArray* BC() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BC", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An array of numbers in the range 0.0 to 1.0 specifying the color of the
@@ -564,11 +567,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BG", "", NULL));
   }
 
-  SkPdfArray BG() const {
-    SkPdfArray ret;
+  SkPdfArray* BG() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BG", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; button fields only) The widget annotation's normal caption, displayed

experimental/PdfViewer/autogen/SkPdfAppearanceDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfAppearanceDictionary
 #define __DEFINED__SkPdfAppearanceDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfAppearanceDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfAppearanceDictionary(const SkPdfAppearanceDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfAppearanceDictionary& operator=(const SkPdfAppearanceDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfApplicationDataDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfApplicationDataDictionary
 #define __DEFINED__SkPdfApplicationDataDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfApplicationDataDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfApplicationDataDictionary(const SkPdfApplicationDataDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfApplicationDataDictionary& operator=(const SkPdfApplicationDataDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfArray_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfArray
 #define __DEFINED__SkPdfArray
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfObject_autogen.h"
@@ -173,9 +174,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -185,6 +183,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -552,6 +553,8 @@ private:
 public:
   SkPdfArray(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfObject(podofoDoc, podofoObj) {}
 
+  SkPdfArray(const SkPdfArray& from) : SkPdfObject(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfArray& operator=(const SkPdfArray& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfArtifactsDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfArtifactsDictionary
 #define __DEFINED__SkPdfArtifactsDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfArtifactsDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfArtifactsDictionary(const SkPdfArtifactsDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfArtifactsDictionary& operator=(const SkPdfArtifactsDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -544,11 +547,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BBox", "", NULL));
   }
 
-  SkRect BBox() const {
-    SkRect ret;
+  SkRect* BBox() const {
+    SkRect* ret;
     if (SkRectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BBox", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkRect();
+    return NULL;
   }
 
 /** (Optional; pagination artifacts only) An array of name objects containing one to
@@ -562,11 +565,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Attached", "", NULL));
   }
 
-  SkPdfArray Attached() const {
-    SkPdfArray ret;
+  SkPdfArray* Attached() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Attached", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfAttributeObjectDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfAttributeObjectDictionary
 #define __DEFINED__SkPdfAttributeObjectDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfAttributeObjectDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfAttributeObjectDictionary(const SkPdfAttributeObjectDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfAttributeObjectDictionary& operator=(const SkPdfAttributeObjectDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfBeadDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfBeadDictionary
 #define __DEFINED__SkPdfBeadDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfBeadDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfBeadDictionary(const SkPdfBeadDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfBeadDictionary& operator=(const SkPdfBeadDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -600,11 +603,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "R", "", NULL));
   }
 
-  SkRect R() const {
-    SkRect ret;
+  SkRect* R() const {
+    SkRect* ret;
     if (SkRectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "R", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkRect();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfBlockLevelStructureElementsDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfBlockLevelStructureElementsDictionary
 #define __DEFINED__SkPdfBlockLevelStructureElementsDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfBlockLevelStructureElementsDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfBlockLevelStructureElementsDictionary(const SkPdfBlockLevelStructureElementsDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfBlockLevelStructureElementsDictionary& operator=(const SkPdfBlockLevelStructureElementsDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -665,11 +668,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BBox", "", NULL));
   }
 
-  SkRect BBox() const {
-    SkRect ret;
+  SkRect* BBox() const {
+    SkRect* ret;
     if (SkRectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BBox", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkRect();
+    return NULL;
   }
 
 /** (Optional; illustrations, tables, table headers, and table cells only; strongly

experimental/PdfViewer/autogen/SkPdfBoolean_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfBoolean
 #define __DEFINED__SkPdfBoolean
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfObject_autogen.h"
@@ -173,9 +174,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -185,6 +183,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -551,6 +552,8 @@ private:
 public:
   SkPdfBoolean(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfObject(podofoDoc, podofoObj) {}
 
+  SkPdfBoolean(const SkPdfBoolean& from) : SkPdfObject(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfBoolean& operator=(const SkPdfBoolean& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfBorderStyleDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfBorderStyleDictionary
 #define __DEFINED__SkPdfBorderStyleDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfBorderStyleDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfBorderStyleDictionary(const SkPdfBorderStyleDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfBorderStyleDictionary& operator=(const SkPdfBorderStyleDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -584,11 +587,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "D", "", NULL));
   }
 
-  SkPdfArray D() const {
-    SkPdfArray ret;
+  SkPdfArray* D() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "D", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfBoxColorInformationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfBoxColorInformationDictionary
 #define __DEFINED__SkPdfBoxColorInformationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfBoxColorInformationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfBoxColorInformationDictionary(const SkPdfBoxColorInformationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfBoxColorInformationDictionary& operator=(const SkPdfBoxColorInformationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfBoxStyleDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfBoxStyleDictionary
 #define __DEFINED__SkPdfBoxStyleDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfBoxStyleDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfBoxStyleDictionary(const SkPdfBoxStyleDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfBoxStyleDictionary& operator=(const SkPdfBoxStyleDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -530,11 +533,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "C", "", NULL));
   }
 
-  SkPdfArray C() const {
-    SkPdfArray ret;
+  SkPdfArray* C() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "C", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) The guideline width in default user space units. Default value: 1.
@@ -578,11 +581,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "D", "", NULL));
   }
 
-  SkPdfArray D() const {
-    SkPdfArray ret;
+  SkPdfArray* D() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "D", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfCIDFontDescriptorDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfCIDFontDescriptorDictionary
 #define __DEFINED__SkPdfCIDFontDescriptorDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfCIDFontDescriptorDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfCIDFontDescriptorDictionary(const SkPdfCIDFontDescriptorDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfCIDFontDescriptorDictionary& operator=(const SkPdfCIDFontDescriptorDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfCIDFontDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfCIDFontDictionary
 #define __DEFINED__SkPdfCIDFontDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfFontDictionary_autogen.h"
@@ -18,9 +19,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -30,11 +28,16 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
 public:
 private:
 public:
   SkPdfCIDFontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfFontDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfCIDFontDictionary(const SkPdfCIDFontDictionary& from) : SkPdfFontDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfCIDFontDictionary& operator=(const SkPdfCIDFontDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -136,11 +139,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "W", "", NULL));
   }
 
-  SkPdfArray W() const {
-    SkPdfArray ret;
+  SkPdfArray* W() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "W", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; applies only to CIDFonts used for vertical writing) An array of two
@@ -151,11 +154,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "DW2", "", NULL));
   }
 
-  SkPdfArray DW2() const {
-    SkPdfArray ret;
+  SkPdfArray* DW2() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "DW2", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; applies only to CIDFonts used for vertical writing) A description of
@@ -167,11 +170,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "W2", "", NULL));
   }
 
-  SkPdfArray W2() const {
-    SkPdfArray ret;
+  SkPdfArray* W2() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "W2", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; Type 2 CIDFonts only) A specification of the mapping from CIDs

experimental/PdfViewer/autogen/SkPdfCIDSystemInfoDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfCIDSystemInfoDictionary
 #define __DEFINED__SkPdfCIDSystemInfoDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfCIDSystemInfoDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfCIDSystemInfoDictionary(const SkPdfCIDSystemInfoDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfCIDSystemInfoDictionary& operator=(const SkPdfCIDSystemInfoDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfCMapDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfCMapDictionary
 #define __DEFINED__SkPdfCMapDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfCMapDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfCMapDictionary(const SkPdfCMapDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfCMapDictionary& operator=(const SkPdfCMapDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -590,11 +593,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getCIDSystemInfoAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getCIDSystemInfoAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "CIDSystemInfo", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A code that determines the writing mode for any CIDFont with

experimental/PdfViewer/autogen/SkPdfCalgrayColorSpaceDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfCalgrayColorSpaceDictionary
 #define __DEFINED__SkPdfCalgrayColorSpaceDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfCalgrayColorSpaceDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfCalgrayColorSpaceDictionary(const SkPdfCalgrayColorSpaceDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfCalgrayColorSpaceDictionary& operator=(const SkPdfCalgrayColorSpaceDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -531,11 +534,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "WhitePoint", "", NULL));
   }
 
-  SkPdfArray WhitePoint() const {
-    SkPdfArray ret;
+  SkPdfArray* WhitePoint() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "WhitePoint", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An array of three numbers [ XB YB ZB ] specifying the tristimulus
@@ -547,11 +550,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BlackPoint", "", NULL));
   }
 
-  SkPdfArray BlackPoint() const {
-    SkPdfArray ret;
+  SkPdfArray* BlackPoint() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BlackPoint", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A number G defining the gamma for the gray (A) component. G

experimental/PdfViewer/autogen/SkPdfCalrgbColorSpaceDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfCalrgbColorSpaceDictionary
 #define __DEFINED__SkPdfCalrgbColorSpaceDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfCalrgbColorSpaceDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfCalrgbColorSpaceDictionary(const SkPdfCalrgbColorSpaceDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfCalrgbColorSpaceDictionary& operator=(const SkPdfCalrgbColorSpaceDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -530,11 +533,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "WhitePoint", "", NULL));
   }
 
-  SkPdfArray WhitePoint() const {
-    SkPdfArray ret;
+  SkPdfArray* WhitePoint() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "WhitePoint", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An array of three numbers [ XB YB ZB ] specifying the tristimulus value, in
@@ -545,11 +548,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BlackPoint", "", NULL));
   }
 
-  SkPdfArray BlackPoint() const {
-    SkPdfArray ret;
+  SkPdfArray* BlackPoint() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BlackPoint", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An array of three numbers [ GR GG GB ] specifying the gamma for the red,
@@ -560,11 +563,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Gamma", "", NULL));
   }
 
-  SkPdfArray Gamma() const {
-    SkPdfArray ret;
+  SkPdfArray* Gamma() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Gamma", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An array of nine numbers [ XA YA ZA XB YB ZB XC YC ZC ] specifying
@@ -576,11 +579,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Matrix", "", NULL));
   }
 
-  SkPdfArray Matrix() const {
-    SkPdfArray ret;
+  SkPdfArray* Matrix() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Matrix", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfCatalogDictionary
 #define __DEFINED__SkPdfCatalogDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfCatalogDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfCatalogDictionary(const SkPdfCatalogDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfCatalogDictionary& operator=(const SkPdfCatalogDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -720,11 +723,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Threads", "", NULL));
   }
 
-  SkPdfArray Threads() const {
-    SkPdfArray ret;
+  SkPdfArray* Threads() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Threads", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.1) A value specifying a destination to be displayed or
@@ -744,11 +747,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getOpenActionAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getOpenActionAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "OpenAction", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
   bool isOpenActionADictionary() const {
@@ -893,11 +896,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "OutputIntents", "", NULL));
   }
 
-  SkPdfArray OutputIntents() const {
-    SkPdfArray ret;
+  SkPdfArray* OutputIntents() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "OutputIntents", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfCcittfaxdecodeFilterDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfCcittfaxdecodeFilterDictionary
 #define __DEFINED__SkPdfCcittfaxdecodeFilterDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfCcittfaxdecodeFilterDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfCcittfaxdecodeFilterDictionary(const SkPdfCcittfaxdecodeFilterDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfCcittfaxdecodeFilterDictionary& operator=(const SkPdfCcittfaxdecodeFilterDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfCheckboxFieldDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfCheckboxFieldDictionary
 #define __DEFINED__SkPdfCheckboxFieldDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfCheckboxFieldDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfCheckboxFieldDictionary(const SkPdfCheckboxFieldDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfCheckboxFieldDictionary& operator=(const SkPdfCheckboxFieldDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfChoiceFieldDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfChoiceFieldDictionary
 #define __DEFINED__SkPdfChoiceFieldDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfChoiceFieldDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfChoiceFieldDictionary(const SkPdfChoiceFieldDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfChoiceFieldDictionary& operator=(const SkPdfChoiceFieldDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -532,11 +535,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Opt", "", NULL));
   }
 
-  SkPdfArray Opt() const {
-    SkPdfArray ret;
+  SkPdfArray* Opt() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Opt", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; inheritable) For scrollable list boxes, the top index (the index in the Opt array
@@ -565,11 +568,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "I", "", NULL));
   }
 
-  SkPdfArray I() const {
-    SkPdfArray ret;
+  SkPdfArray* I() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "I", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfComponentsWithMetadataDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfComponentsWithMetadataDictionary
 #define __DEFINED__SkPdfComponentsWithMetadataDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfComponentsWithMetadataDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfComponentsWithMetadataDictionary(const SkPdfComponentsWithMetadataDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfComponentsWithMetadataDictionary& operator=(const SkPdfComponentsWithMetadataDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfDctdecodeFilterDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfDctdecodeFilterDictionary
 #define __DEFINED__SkPdfDctdecodeFilterDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfDctdecodeFilterDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfDctdecodeFilterDictionary(const SkPdfDctdecodeFilterDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfDctdecodeFilterDictionary& operator=(const SkPdfDctdecodeFilterDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfDeviceNColorSpaceDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfDeviceNColorSpaceDictionary
 #define __DEFINED__SkPdfDeviceNColorSpaceDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfDeviceNColorSpaceDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfDeviceNColorSpaceDictionary(const SkPdfDeviceNColorSpaceDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfDeviceNColorSpaceDictionary& operator=(const SkPdfDeviceNColorSpaceDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfDictionary
 #define __DEFINED__SkPdfDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfObject_autogen.h"
@@ -45,12 +46,14 @@ private:
   virtual const SkPdfHexString* asHexString() const {return NULL;}
 
 public:
-  const SkPdfObject get(const char* dictionaryKeyName) const {return SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));}
-  SkPdfObject get(const char* dictionaryKeyName) {return SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));}
+  SkPdfObject* get(const char* dictionaryKeyName) const {return new SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));}
+  SkPdfObject* get(const char* dictionaryKeyName) {return new SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));}
 private:
 public:
   SkPdfDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfObject(podofoDoc, podofoObj) {}
 
+  SkPdfDictionary(const SkPdfDictionary& from) : SkPdfObject(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfDictionary& operator=(const SkPdfDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfDocumentCatalogActionsDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfDocumentCatalogActionsDictionary
 #define __DEFINED__SkPdfDocumentCatalogActionsDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfDocumentCatalogActionsDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfDocumentCatalogActionsDictionary(const SkPdfDocumentCatalogActionsDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfDocumentCatalogActionsDictionary& operator=(const SkPdfDocumentCatalogActionsDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfDocumentInformationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfDocumentInformationDictionary
 #define __DEFINED__SkPdfDocumentInformationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfDocumentInformationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfDocumentInformationDictionary(const SkPdfDocumentInformationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfDocumentInformationDictionary& operator=(const SkPdfDocumentInformationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfEmbeddedFileParameterDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfEmbeddedFileParameterDictionary
 #define __DEFINED__SkPdfEmbeddedFileParameterDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfEmbeddedFileParameterDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfEmbeddedFileParameterDictionary(const SkPdfEmbeddedFileParameterDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfEmbeddedFileParameterDictionary& operator=(const SkPdfEmbeddedFileParameterDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfEmbeddedFileStreamDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfEmbeddedFileStreamDictionary
 #define __DEFINED__SkPdfEmbeddedFileStreamDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfEmbeddedFileStreamDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfEmbeddedFileStreamDictionary(const SkPdfEmbeddedFileStreamDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfEmbeddedFileStreamDictionary& operator=(const SkPdfEmbeddedFileStreamDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfEmbeddedFontStreamDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfEmbeddedFontStreamDictionary
 #define __DEFINED__SkPdfEmbeddedFontStreamDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfEmbeddedFontStreamDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfEmbeddedFontStreamDictionary(const SkPdfEmbeddedFontStreamDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfEmbeddedFontStreamDictionary& operator=(const SkPdfEmbeddedFontStreamDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfEncodingDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfEncodingDictionary
 #define __DEFINED__SkPdfEncodingDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfEncodingDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfEncodingDictionary(const SkPdfEncodingDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfEncodingDictionary& operator=(const SkPdfEncodingDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -561,16 +564,30 @@ public:
 /** (Optional; not recommended with TrueType fonts) An array describing the differ-
  *  ences from the encoding specified by BaseEncoding or, if BaseEncoding is ab-
  *  sent, from an implicit base encoding. The Differences array is described above.
+ *     The value of the Differences entry is an array of character codes and character
+ *     names organized as follows:
+ *          code1 name1,1 name1,2 ...
+ *          code2 name2,1 name2,2 ...
+ *          ...
+ *          coden namen,1 namen,2 ...
+ *     Each code is the first index in a sequence of characters to be changed. The first
+ *     character name after the code becomes the name corresponding to that code.
+ *     Subsequent names replace consecutive code indices until the next code appears in
+ *     the array or the array ends. These sequences may be specified in any order but
+ *     should not overlap.
+ *     For example, in the encoding dictionary in Example 5.10, the name quotesingle
+ *     ( ' ) is associated with character code 39, Adieresis (A) with code 128, Aring (A)
+ *     with 129, and trademark ((TM)) with 170.
 **/
   bool has_Differences() const {
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Differences", "", NULL));
   }
 
-  SkPdfArray Differences() const {
-    SkPdfArray ret;
+  SkPdfArray* Differences() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Differences", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfEncryptedEmbeddedFileStreamDictionary
 #define __DEFINED__SkPdfEncryptedEmbeddedFileStreamDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfEncryptedEmbeddedFileStreamDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfEncryptedEmbeddedFileStreamDictionary(const SkPdfEncryptedEmbeddedFileStreamDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfEncryptedEmbeddedFileStreamDictionary& operator=(const SkPdfEncryptedEmbeddedFileStreamDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfEncryptionCommonDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfEncryptionCommonDictionary
 #define __DEFINED__SkPdfEncryptionCommonDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfEncryptionCommonDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfEncryptionCommonDictionary(const SkPdfEncryptionCommonDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfEncryptionCommonDictionary& operator=(const SkPdfEncryptionCommonDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfEnums_autogen.h

@@ -57,11 +57,10 @@ enum SkPdfObjectType {
   kFontDictionary_SkPdfObjectType,
   kCIDFontDictionary_SkPdfObjectType,
   kType0FontDictionary_SkPdfObjectType,
-  kType3FontDictionary_SkPdfObjectType,
-  kType0FontDictionary__End_SkPdfObjectType,
   kType1FontDictionary_SkPdfObjectType,
   kMultiMasterFontDictionary_SkPdfObjectType,
   kTrueTypeFontDictionary_SkPdfObjectType,
+  kType3FontDictionary_SkPdfObjectType,
   kType1FontDictionary__End_SkPdfObjectType,
   kFontDictionary__End_SkPdfObjectType,
   kFormFieldActionsDictionary_SkPdfObjectType,

experimental/PdfViewer/autogen/SkPdfFDFCatalogDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFDFCatalogDictionary
 #define __DEFINED__SkPdfFDFCatalogDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFDFCatalogDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFDFCatalogDictionary(const SkPdfFDFCatalogDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFDFCatalogDictionary& operator=(const SkPdfFDFCatalogDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfFDFDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFDFDictionary
 #define __DEFINED__SkPdfFDFDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFDFDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFDFDictionary(const SkPdfFDFDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFDFDictionary& operator=(const SkPdfFDFDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -545,11 +548,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ID", "", NULL));
   }
 
-  SkPdfArray ID() const {
-    SkPdfArray ret;
+  SkPdfArray* ID() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ID", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An array of FDF field dictionaries (see "FDF Fields" on
@@ -561,11 +564,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Fields", "", NULL));
   }
 
-  SkPdfArray Fields() const {
-    SkPdfArray ret;
+  SkPdfArray* Fields() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Fields", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A status string to be displayed indicating the result of an
@@ -594,11 +597,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Pages", "", NULL));
   }
 
-  SkPdfArray Pages() const {
-    SkPdfArray ret;
+  SkPdfArray* Pages() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Pages", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.3) The encoding to be used for any FDF field
@@ -627,11 +630,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Annots", "", NULL));
   }
 
-  SkPdfArray Annots() const {
-    SkPdfArray ret;
+  SkPdfArray* Annots() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Annots", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.4) A stream containing all the bytes in all incre-
@@ -687,11 +690,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "EmbeddedFDFs", "", NULL));
   }
 
-  SkPdfArray EmbeddedFDFs() const {
-    SkPdfArray ret;
+  SkPdfArray* EmbeddedFDFs() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "EmbeddedFDFs", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.4) A JavaScript dictionary (see Table 8.71) defin-

experimental/PdfViewer/autogen/SkPdfFDFFieldDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFDFFieldDictionary
 #define __DEFINED__SkPdfFDFFieldDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFDFFieldDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFDFFieldDictionary(const SkPdfFDFFieldDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFDFFieldDictionary& operator=(const SkPdfFDFFieldDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -530,11 +533,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Kids", "", NULL));
   }
 
-  SkPdfArray Kids() const {
-    SkPdfArray ret;
+  SkPdfArray* Kids() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Kids", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Required) The partial field name (see "Field Names" on page 532).
@@ -723,11 +726,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Opt", "", NULL));
   }
 
-  SkPdfArray Opt() const {
-    SkPdfArray ret;
+  SkPdfArray* Opt() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Opt", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An action to be performed when this field's widget annotation is activat-

experimental/PdfViewer/autogen/SkPdfFDFFileAnnotationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFDFFileAnnotationDictionary
 #define __DEFINED__SkPdfFDFFileAnnotationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFDFFileAnnotationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFDFFileAnnotationDictionary(const SkPdfFDFFileAnnotationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFDFFileAnnotationDictionary& operator=(const SkPdfFDFFileAnnotationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfFDFNamedPageReferenceDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFDFNamedPageReferenceDictionary
 #define __DEFINED__SkPdfFDFNamedPageReferenceDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFDFNamedPageReferenceDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFDFNamedPageReferenceDictionary(const SkPdfFDFNamedPageReferenceDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFDFNamedPageReferenceDictionary& operator=(const SkPdfFDFNamedPageReferenceDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfFDFPageDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFDFPageDictionary
 #define __DEFINED__SkPdfFDFPageDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFDFPageDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFDFPageDictionary(const SkPdfFDFPageDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFDFPageDictionary& operator=(const SkPdfFDFPageDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -529,11 +532,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Templates", "", NULL));
   }
 
-  SkPdfArray Templates() const {
-    SkPdfArray ret;
+  SkPdfArray* Templates() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Templates", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An FDF page information dictionary containing additional informa-

experimental/PdfViewer/autogen/SkPdfFDFTemplateDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFDFTemplateDictionary
 #define __DEFINED__SkPdfFDFTemplateDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFDFTemplateDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFDFTemplateDictionary(const SkPdfFDFTemplateDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFDFTemplateDictionary& operator=(const SkPdfFDFTemplateDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -544,11 +547,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Fields", "", NULL));
   }
 
-  SkPdfArray Fields() const {
-    SkPdfArray ret;
+  SkPdfArray* Fields() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Fields", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A flag specifying whether fields imported from the template may be

experimental/PdfViewer/autogen/SkPdfFDFTrailerDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFDFTrailerDictionary
 #define __DEFINED__SkPdfFDFTrailerDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFDFTrailerDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFDFTrailerDictionary(const SkPdfFDFTrailerDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFDFTrailerDictionary& operator=(const SkPdfFDFTrailerDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfFieldDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFieldDictionary
 #define __DEFINED__SkPdfFieldDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFieldDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFieldDictionary(const SkPdfFieldDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFieldDictionary& operator=(const SkPdfFieldDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -568,11 +571,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Kids", "", NULL));
   }
 
-  SkPdfArray Kids() const {
-    SkPdfArray ret;
+  SkPdfArray* Kids() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Kids", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) The partial field name (see "Field Names," below; see also imple-

experimental/PdfViewer/autogen/SkPdfFileAttachmentAnnotationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFileAttachmentAnnotationDictionary
 #define __DEFINED__SkPdfFileAttachmentAnnotationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFileAttachmentAnnotationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFileAttachmentAnnotationDictionary(const SkPdfFileAttachmentAnnotationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFileAttachmentAnnotationDictionary& operator=(const SkPdfFileAttachmentAnnotationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfFileSpecificationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFileSpecificationDictionary
 #define __DEFINED__SkPdfFileSpecificationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFileSpecificationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFileSpecificationDictionary(const SkPdfFileSpecificationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFileSpecificationDictionary& operator=(const SkPdfFileSpecificationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -621,11 +624,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ID", "", NULL));
   }
 
-  SkPdfArray ID() const {
-    SkPdfArray ret;
+  SkPdfArray* ID() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ID", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.2) A flag indicating whether the file referenced by the file specifica-

experimental/PdfViewer/autogen/SkPdfFileTrailerDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFileTrailerDictionary
 #define __DEFINED__SkPdfFileTrailerDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFileTrailerDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFileTrailerDictionary(const SkPdfFileTrailerDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFileTrailerDictionary& operator=(const SkPdfFileTrailerDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -600,11 +603,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ID", "", NULL));
   }
 
-  SkPdfArray ID() const {
-    SkPdfArray ret;
+  SkPdfArray* ID() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ID", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfFontDescriptorDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFontDescriptorDictionary
 #define __DEFINED__SkPdfFontDescriptorDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -165,9 +166,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -177,6 +175,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFontDescriptorDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFontDescriptorDictionary(const SkPdfFontDescriptorDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFontDescriptorDictionary& operator=(const SkPdfFontDescriptorDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -574,11 +577,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontBBox", "", NULL));
   }
 
-  SkRect FontBBox() const {
-    SkRect ret;
+  SkRect* FontBBox() const {
+    SkRect* ret;
     if (SkRectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontBBox", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkRect();
+    return NULL;
   }
 
 /** (Required) The angle, expressed in degrees counterclockwise from the verti-

experimental/PdfViewer/autogen/SkPdfFontDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFontDictionary
 #define __DEFINED__SkPdfFontDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -499,6 +500,8 @@ private:
 public:
   SkPdfFontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFontDictionary(const SkPdfFontDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFontDictionary& operator=(const SkPdfFontDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfFormFieldActionsDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFormFieldActionsDictionary
 #define __DEFINED__SkPdfFormFieldActionsDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFreeTextAnnotationDictionary* asFreeTextAnnotationDictionary() {return NULL;}
   virtual const SkPdfFreeTextAnnotationDictionary* asFreeTextAnnotationDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFormFieldActionsDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFormFieldActionsDictionary(const SkPdfFormFieldActionsDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFormFieldActionsDictionary& operator=(const SkPdfFormFieldActionsDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfFreeTextAnnotationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFreeTextAnnotationDictionary
 #define __DEFINED__SkPdfFreeTextAnnotationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFreeTextAnnotationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFreeTextAnnotationDictionary(const SkPdfFreeTextAnnotationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFreeTextAnnotationDictionary& operator=(const SkPdfFreeTextAnnotationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfFunctionCommonDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfFunctionCommonDictionary
 #define __DEFINED__SkPdfFunctionCommonDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfFunctionCommonDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfFunctionCommonDictionary(const SkPdfFunctionCommonDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfFunctionCommonDictionary& operator=(const SkPdfFunctionCommonDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -549,11 +552,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Domain", "", NULL));
   }
 
-  SkPdfArray Domain() const {
-    SkPdfArray ret;
+  SkPdfArray* Domain() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Domain", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Required for type 0 and type 4 functions, optional otherwise; see below) An
@@ -567,11 +570,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Range", "", NULL));
   }
 
-  SkPdfArray Range() const {
-    SkPdfArray ret;
+  SkPdfArray* Range() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Range", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfGoToActionDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfGoToActionDictionary
 #define __DEFINED__SkPdfGoToActionDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfGoToActionDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfGoToActionDictionary(const SkPdfGoToActionDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfGoToActionDictionary& operator=(const SkPdfGoToActionDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -574,11 +577,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getDAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getDAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "D", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfGraphicsStateDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfGraphicsStateDictionary
 #define __DEFINED__SkPdfGraphicsStateDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfGraphicsStateDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfGraphicsStateDictionary(const SkPdfGraphicsStateDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfGraphicsStateDictionary& operator=(const SkPdfGraphicsStateDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -596,11 +599,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "D", "", NULL));
   }
 
-  SkPdfArray D() const {
-    SkPdfArray ret;
+  SkPdfArray* D() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "D", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.3) The name of the rendering intent (see "Rendering
@@ -675,11 +678,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Font", "", NULL));
   }
 
-  SkPdfArray Font() const {
-    SkPdfArray ret;
+  SkPdfArray* Font() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Font", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) The black-generation function, which maps the interval [0.0 1.0]
@@ -811,11 +814,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getTRAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getTRAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "TR", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
   bool isTRAName() const {
@@ -859,11 +862,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getTR2AsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getTR2AsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "TR2", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
   bool isTR2AName() const {
@@ -995,11 +998,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getBMAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getBMAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BM", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.4) The current soft mask, specifying the mask shape or

experimental/PdfViewer/autogen/SkPdfGroupAttributesDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfGroupAttributesDictionary
 #define __DEFINED__SkPdfGroupAttributesDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfGroupAttributesDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfGroupAttributesDictionary(const SkPdfGroupAttributesDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfGroupAttributesDictionary& operator=(const SkPdfGroupAttributesDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfHexString_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfHexString
 #define __DEFINED__SkPdfHexString
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfString_autogen.h"
@@ -20,6 +21,8 @@ private:
 public:
   SkPdfHexString(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfString(podofoDoc, podofoObj) {}
 
+  SkPdfHexString(const SkPdfHexString& from) : SkPdfString(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfHexString& operator=(const SkPdfHexString& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfHideActionDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfHideActionDictionary
 #define __DEFINED__SkPdfHideActionDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfHideActionDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfHideActionDictionary(const SkPdfHideActionDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfHideActionDictionary& operator=(const SkPdfHideActionDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -580,11 +583,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getTAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getTAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "T", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A flag indicating whether to hide the annotation (true) or show it (false).

experimental/PdfViewer/autogen/SkPdfIccProfileStreamDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfIccProfileStreamDictionary
 #define __DEFINED__SkPdfIccProfileStreamDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfIccProfileStreamDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfIccProfileStreamDictionary(const SkPdfIccProfileStreamDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfIccProfileStreamDictionary& operator=(const SkPdfIccProfileStreamDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -559,11 +562,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getAlternateAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getAlternateAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Alternate", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
   bool isAlternateAName() const {
@@ -588,11 +591,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Range", "", NULL));
   }
 
-  SkPdfArray Range() const {
-    SkPdfArray ret;
+  SkPdfArray* Range() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Range", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.4) A metadata stream containing metadata for the color space (see

experimental/PdfViewer/autogen/SkPdfIconFitDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfIconFitDictionary
 #define __DEFINED__SkPdfIconFitDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfIconFitDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfIconFitDictionary(const SkPdfIconFitDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfIconFitDictionary& operator=(const SkPdfIconFitDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -571,11 +574,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "A", "", NULL));
   }
 
-  SkPdfArray A() const {
-    SkPdfArray ret;
+  SkPdfArray* A() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "A", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfImageDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfImageDictionary
 #define __DEFINED__SkPdfImageDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfXObjectDictionary_autogen.h"
@@ -23,6 +24,8 @@ private:
 public:
   SkPdfImageDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfXObjectDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfImageDictionary(const SkPdfImageDictionary& from) : SkPdfXObjectDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfImageDictionary& operator=(const SkPdfImageDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -108,11 +111,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getColorSpaceAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getColorSpaceAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ColorSpace", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Required except for image masks; optional for image masks) The number of
@@ -200,11 +203,11 @@ public:
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray getMaskAsArray() const {
-    SkPdfArray ret = SkPdfArray();
+  SkPdfArray* getMaskAsArray() const {
+    SkPdfArray* ret = NULL;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Mask", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.4) A subsidiary image XObject defining a soft-mask
@@ -240,11 +243,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Decode", "", NULL));
   }
 
-  SkPdfArray Decode() const {
-    SkPdfArray ret;
+  SkPdfArray* Decode() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Decode", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A flag indicating whether image interpolation is to be per-
@@ -270,11 +273,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Alternates", "", NULL));
   }
 
-  SkPdfArray Alternates() const {
-    SkPdfArray ret;
+  SkPdfArray* Alternates() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Alternates", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Required in PDF 1.0; optional otherwise) The name by which this image

experimental/PdfViewer/autogen/SkPdfImportDataActionDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfImportDataActionDictionary
 #define __DEFINED__SkPdfImportDataActionDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfImportDataActionDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfImportDataActionDictionary(const SkPdfImportDataActionDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfImportDataActionDictionary& operator=(const SkPdfImportDataActionDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfInkAnnotationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfInkAnnotationDictionary
 #define __DEFINED__SkPdfInkAnnotationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfInkAnnotationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfInkAnnotationDictionary(const SkPdfInkAnnotationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfInkAnnotationDictionary& operator=(const SkPdfInkAnnotationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -560,11 +563,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "InkList", "", NULL));
   }
 
-  SkPdfArray InkList() const {
-    SkPdfArray ret;
+  SkPdfArray* InkList() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "InkList", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A border style dictionary (see Table 8.12 on page 495) specifying the

experimental/PdfViewer/autogen/SkPdfInlineLevelStructureElementsDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfInlineLevelStructureElementsDictionary
 #define __DEFINED__SkPdfInlineLevelStructureElementsDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfInlineLevelStructureElementsDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfInlineLevelStructureElementsDictionary(const SkPdfInlineLevelStructureElementsDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfInlineLevelStructureElementsDictionary& operator=(const SkPdfInlineLevelStructureElementsDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfInteger_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfInteger
 #define __DEFINED__SkPdfInteger
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfObject_autogen.h"
@@ -176,9 +177,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -188,6 +186,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -548,6 +549,8 @@ private:
 public:
   SkPdfInteger(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfObject(podofoDoc, podofoObj) {}
 
+  SkPdfInteger(const SkPdfInteger& from) : SkPdfObject(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfInteger& operator=(const SkPdfInteger& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfInteractiveFormDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfInteractiveFormDictionary
 #define __DEFINED__SkPdfInteractiveFormDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfInteractiveFormDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfInteractiveFormDictionary(const SkPdfInteractiveFormDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfInteractiveFormDictionary& operator=(const SkPdfInteractiveFormDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -529,11 +532,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Fields", "", NULL));
   }
 
-  SkPdfArray Fields() const {
-    SkPdfArray ret;
+  SkPdfArray* Fields() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Fields", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A flag specifying whether to construct appearance streams and
@@ -576,11 +579,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "CO", "", NULL));
   }
 
-  SkPdfArray CO() const {
-    SkPdfArray ret;
+  SkPdfArray* CO() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "CO", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A document-wide default value for the DR attribute of variable

experimental/PdfViewer/autogen/SkPdfJavascriptActionDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfJavascriptActionDictionary
 #define __DEFINED__SkPdfJavascriptActionDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfJavascriptActionDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfJavascriptActionDictionary(const SkPdfJavascriptActionDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfJavascriptActionDictionary& operator=(const SkPdfJavascriptActionDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfJavascriptDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfJavascriptDictionary
 #define __DEFINED__SkPdfJavascriptDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfJavascriptDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfJavascriptDictionary(const SkPdfJavascriptDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfJavascriptDictionary& operator=(const SkPdfJavascriptDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -602,11 +605,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Doc", "", NULL));
   }
 
-  SkPdfArray Doc() const {
-    SkPdfArray ret;
+  SkPdfArray* Doc() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Doc", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfJbig2DecodeFilterDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfJbig2DecodeFilterDictionary
 #define __DEFINED__SkPdfJbig2DecodeFilterDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfJbig2DecodeFilterDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfJbig2DecodeFilterDictionary(const SkPdfJbig2DecodeFilterDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfJbig2DecodeFilterDictionary& operator=(const SkPdfJbig2DecodeFilterDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfLabColorSpaceDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfLabColorSpaceDictionary
 #define __DEFINED__SkPdfLabColorSpaceDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfLabColorSpaceDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfLabColorSpaceDictionary(const SkPdfLabColorSpaceDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfLabColorSpaceDictionary& operator=(const SkPdfLabColorSpaceDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -531,11 +534,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "WhitePoint", "", NULL));
   }
 
-  SkPdfArray WhitePoint() const {
-    SkPdfArray ret;
+  SkPdfArray* WhitePoint() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "WhitePoint", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An array of three numbers [ XB YB ZB ] specifying the tristimulus value, in
@@ -547,11 +550,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BlackPoint", "", NULL));
   }
 
-  SkPdfArray BlackPoint() const {
-    SkPdfArray ret;
+  SkPdfArray* BlackPoint() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "BlackPoint", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) An array of four numbers [ amin amax bmin bmax ] specifying the range of
@@ -566,11 +569,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Range", "", NULL));
   }
 
-  SkPdfArray Range() const {
-    SkPdfArray ret;
+  SkPdfArray* Range() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Range", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfLaunchActionDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfLaunchActionDictionary
 #define __DEFINED__SkPdfLaunchActionDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfLaunchActionDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfLaunchActionDictionary(const SkPdfLaunchActionDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfLaunchActionDictionary& operator=(const SkPdfLaunchActionDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfLineAnnotationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfLineAnnotationDictionary
 #define __DEFINED__SkPdfLineAnnotationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfLineAnnotationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfLineAnnotationDictionary(const SkPdfLineAnnotationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfLineAnnotationDictionary& operator=(const SkPdfLineAnnotationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -557,11 +560,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "L", "", NULL));
   }
 
-  SkPdfArray L() const {
-    SkPdfArray ret;
+  SkPdfArray* L() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "L", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) A border style dictionary (see Table 8.12 on page 495) specifying the
@@ -590,11 +593,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "LE", "", NULL));
   }
 
-  SkPdfArray LE() const {
-    SkPdfArray ret;
+  SkPdfArray* LE() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "LE", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional; PDF 1.4) An array of three numbers in the range 0.0 to 1.0 specifying
@@ -606,11 +609,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "IC", "", NULL));
   }
 
-  SkPdfArray IC() const {
-    SkPdfArray ret;
+  SkPdfArray* IC() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "IC", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfListAttributeDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfListAttributeDictionary
 #define __DEFINED__SkPdfListAttributeDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfListAttributeDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfListAttributeDictionary(const SkPdfListAttributeDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfListAttributeDictionary& operator=(const SkPdfListAttributeDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfLzwdecodeAndFlatedecodeFiltersDictionary
 #define __DEFINED__SkPdfLzwdecodeAndFlatedecodeFiltersDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfLzwdecodeAndFlatedecodeFiltersDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfLzwdecodeAndFlatedecodeFiltersDictionary(const SkPdfLzwdecodeAndFlatedecodeFiltersDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfLzwdecodeAndFlatedecodeFiltersDictionary& operator=(const SkPdfLzwdecodeAndFlatedecodeFiltersDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfMacOsFileInformationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMacOsFileInformationDictionary
 #define __DEFINED__SkPdfMacOsFileInformationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfMacOsFileInformationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMacOsFileInformationDictionary(const SkPdfMacOsFileInformationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMacOsFileInformationDictionary& operator=(const SkPdfMacOsFileInformationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfMarkInformationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMarkInformationDictionary
 #define __DEFINED__SkPdfMarkInformationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfMarkInformationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMarkInformationDictionary(const SkPdfMarkInformationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMarkInformationDictionary& operator=(const SkPdfMarkInformationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfMarkedContentReferenceDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMarkedContentReferenceDictionary
 #define __DEFINED__SkPdfMarkedContentReferenceDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfMarkedContentReferenceDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMarkedContentReferenceDictionary(const SkPdfMarkedContentReferenceDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMarkedContentReferenceDictionary& operator=(const SkPdfMarkedContentReferenceDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfMarkupAnnotationsDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMarkupAnnotationsDictionary
 #define __DEFINED__SkPdfMarkupAnnotationsDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfMarkupAnnotationsDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMarkupAnnotationsDictionary(const SkPdfMarkupAnnotationsDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMarkupAnnotationsDictionary& operator=(const SkPdfMarkupAnnotationsDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -576,11 +579,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "QuadPoints", "", NULL));
   }
 
-  SkPdfArray QuadPoints() const {
-    SkPdfArray ret;
+  SkPdfArray* QuadPoints() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "QuadPoints", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfMetadataStreamDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMetadataStreamDictionary
 #define __DEFINED__SkPdfMetadataStreamDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfMetadataStreamDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMetadataStreamDictionary(const SkPdfMetadataStreamDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMetadataStreamDictionary& operator=(const SkPdfMetadataStreamDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfMovieActionDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMovieActionDictionary
 #define __DEFINED__SkPdfMovieActionDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfMovieActionDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMovieActionDictionary(const SkPdfMovieActionDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMovieActionDictionary& operator=(const SkPdfMovieActionDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfMovieActivationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMovieActivationDictionary
 #define __DEFINED__SkPdfMovieActivationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfMovieActivationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMovieActivationDictionary(const SkPdfMovieActivationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMovieActivationDictionary& operator=(const SkPdfMovieActivationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -655,11 +658,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FWScale", "", NULL));
   }
 
-  SkPdfArray FWScale() const {
-    SkPdfArray ret;
+  SkPdfArray* FWScale() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FWScale", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) For floating play windows, the relative position of the window on
@@ -674,11 +677,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FWPosition", "", NULL));
   }
 
-  SkPdfArray FWPosition() const {
-    SkPdfArray ret;
+  SkPdfArray* FWPosition() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FWPosition", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfMovieAnnotationDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMovieAnnotationDictionary
 #define __DEFINED__SkPdfMovieAnnotationDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfMovieAnnotationDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMovieAnnotationDictionary(const SkPdfMovieAnnotationDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMovieAnnotationDictionary& operator=(const SkPdfMovieAnnotationDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfMovieDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMovieDictionary
 #define __DEFINED__SkPdfMovieDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfMovieDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMovieDictionary(const SkPdfMovieDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMovieDictionary& operator=(const SkPdfMovieDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -545,11 +548,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Aspect", "", NULL));
   }
 
-  SkPdfArray Aspect() const {
-    SkPdfArray ret;
+  SkPdfArray* Aspect() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Aspect", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Optional) The number of degrees by which the movie is rotated clockwise

experimental/PdfViewer/autogen/SkPdfMultiMasterFontDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfMultiMasterFontDictionary
 #define __DEFINED__SkPdfMultiMasterFontDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfType1FontDictionary_autogen.h"
@@ -17,11 +18,16 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
 public:
 private:
 public:
   SkPdfMultiMasterFontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfType1FontDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfMultiMasterFontDictionary(const SkPdfMultiMasterFontDictionary& from) : SkPdfType1FontDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfMultiMasterFontDictionary& operator=(const SkPdfMultiMasterFontDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfNameDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfNameDictionary
 #define __DEFINED__SkPdfNameDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfNameDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfNameDictionary(const SkPdfNameDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfNameDictionary& operator=(const SkPdfNameDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}

experimental/PdfViewer/autogen/SkPdfNameTreeNodeDictionary_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfNameTreeNodeDictionary
 #define __DEFINED__SkPdfNameTreeNodeDictionary
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfDictionary_autogen.h"
@@ -168,9 +169,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -180,6 +178,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -518,6 +519,8 @@ private:
 public:
   SkPdfNameTreeNodeDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
+  SkPdfNameTreeNodeDictionary(const SkPdfNameTreeNodeDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfNameTreeNodeDictionary& operator=(const SkPdfNameTreeNodeDictionary& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}
@@ -530,11 +533,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Kids", "", NULL));
   }
 
-  SkPdfArray Kids() const {
-    SkPdfArray ret;
+  SkPdfArray* Kids() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Kids", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Root and leaf nodes only; required in leaf nodes; present in the root node if and only if Kids
@@ -547,11 +550,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Names", "", NULL));
   }
 
-  SkPdfArray Names() const {
-    SkPdfArray ret;
+  SkPdfArray* Names() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Names", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 /** (Intermediate and leaf nodes only; required) An array of two strings, specifying the (lexi-
@@ -562,11 +565,11 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Limits", "", NULL));
   }
 
-  SkPdfArray Limits() const {
-    SkPdfArray ret;
+  SkPdfArray* Limits() const {
+    SkPdfArray* ret;
     if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Limits", "", &ret)) return ret;
     // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfArray();
+    return NULL;
   }
 
 };

experimental/PdfViewer/autogen/SkPdfName_autogen.h

@@ -1,6 +1,7 @@
 #ifndef __DEFINED__SkPdfName
 #define __DEFINED__SkPdfName
 
+#include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
 #include "SkPdfObject_autogen.h"
@@ -176,9 +177,6 @@ private:
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
-  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
-  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
@@ -188,6 +186,9 @@ private:
   virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;}
   virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;}
 
+  virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
+  virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
+
   virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
   virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
 
@@ -551,6 +552,8 @@ private:
 public:
   SkPdfName(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfObject(podofoDoc, podofoObj) {}
 
+  SkPdfName(const SkPdfName& from) : SkPdfObject(from.fPodofoDoc, from.fPodofoObj) {}
+
   virtual bool valid() const {return true;}
 
   SkPdfName& operator=(const SkPdfName& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}