From 6e49c345b132ca55830c7dad746108cd3624eb8b Mon Sep 17 00:00:00 2001
From: "edisonn@google.com"
 <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Thu, 27 Jun 2013 20:03:43 +0000
Subject: more work on pdf fonts, more to come

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9796 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 experimental/PdfViewer/SkPdfFont.cpp               |  79 ++--
 experimental/PdfViewer/SkPdfFont.h                 | 141 +++---
 experimental/PdfViewer/SkPdfParser.cpp             |  13 +-
 .../SkPdfALinkAnnotationDictionary_autogen.cpp     |   1 +
 .../SkPdfALinkAnnotationDictionary_autogen.h       |   6 +-
 .../autogen/SkPdfActionDictionary_autogen.cpp      |   1 +
 .../autogen/SkPdfActionDictionary_autogen.h        |   6 +-
 .../SkPdfAlternateImageDictionary_autogen.cpp      |   1 +
 .../SkPdfAlternateImageDictionary_autogen.h        |   6 +-
 .../SkPdfAnnotationActionsDictionary_autogen.cpp   |   1 +
 .../SkPdfAnnotationActionsDictionary_autogen.h     |   6 +-
 .../autogen/SkPdfAnnotationDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfAnnotationDictionary_autogen.h    |   6 +-
 ...AppearanceCharacteristicsDictionary_autogen.cpp |   1 +
 ...dfAppearanceCharacteristicsDictionary_autogen.h |   6 +-
 .../autogen/SkPdfAppearanceDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfAppearanceDictionary_autogen.h    |   6 +-
 .../SkPdfApplicationDataDictionary_autogen.cpp     |   1 +
 .../SkPdfApplicationDataDictionary_autogen.h       |   6 +-
 .../PdfViewer/autogen/SkPdfArray_autogen.cpp       |   1 +
 .../PdfViewer/autogen/SkPdfArray_autogen.h         |   6 +-
 .../autogen/SkPdfArtifactsDictionary_autogen.cpp   |   1 +
 .../autogen/SkPdfArtifactsDictionary_autogen.h     |   6 +-
 .../SkPdfAttributeObjectDictionary_autogen.cpp     |   1 +
 .../SkPdfAttributeObjectDictionary_autogen.h       |   6 +-
 .../autogen/SkPdfBeadDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfBeadDictionary_autogen.h          |   6 +-
 ...ockLevelStructureElementsDictionary_autogen.cpp |   1 +
 ...BlockLevelStructureElementsDictionary_autogen.h |   6 +-
 .../PdfViewer/autogen/SkPdfBoolean_autogen.cpp     |   1 +
 .../PdfViewer/autogen/SkPdfBoolean_autogen.h       |   6 +-
 .../autogen/SkPdfBorderStyleDictionary_autogen.cpp |   1 +
 .../autogen/SkPdfBorderStyleDictionary_autogen.h   |   6 +-
 .../SkPdfBoxColorInformationDictionary_autogen.cpp |   1 +
 .../SkPdfBoxColorInformationDictionary_autogen.h   |   6 +-
 .../autogen/SkPdfBoxStyleDictionary_autogen.cpp    |   1 +
 .../autogen/SkPdfBoxStyleDictionary_autogen.h      |   6 +-
 .../SkPdfCIDFontDescriptorDictionary_autogen.cpp   |   1 +
 .../SkPdfCIDFontDescriptorDictionary_autogen.h     |   6 +-
 .../autogen/SkPdfCIDFontDictionary_autogen.cpp     |   7 +-
 .../autogen/SkPdfCIDFontDictionary_autogen.h       | 493 ++++++++++++++++++++-
 .../SkPdfCIDSystemInfoDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfCIDSystemInfoDictionary_autogen.h |   6 +-
 .../autogen/SkPdfCMapDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfCMapDictionary_autogen.h          |   6 +-
 .../SkPdfCalgrayColorSpaceDictionary_autogen.cpp   |   1 +
 .../SkPdfCalgrayColorSpaceDictionary_autogen.h     |   6 +-
 .../SkPdfCalrgbColorSpaceDictionary_autogen.cpp    |   1 +
 .../SkPdfCalrgbColorSpaceDictionary_autogen.h      |   6 +-
 .../autogen/SkPdfCatalogDictionary_autogen.cpp     |   1 +
 .../autogen/SkPdfCatalogDictionary_autogen.h       |   6 +-
 ...SkPdfCcittfaxdecodeFilterDictionary_autogen.cpp |   1 +
 .../SkPdfCcittfaxdecodeFilterDictionary_autogen.h  |   6 +-
 .../SkPdfCheckboxFieldDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfCheckboxFieldDictionary_autogen.h |   6 +-
 .../autogen/SkPdfChoiceFieldDictionary_autogen.cpp |   1 +
 .../autogen/SkPdfChoiceFieldDictionary_autogen.h   |   6 +-
 ...PdfComponentsWithMetadataDictionary_autogen.cpp |   1 +
 ...SkPdfComponentsWithMetadataDictionary_autogen.h |   6 +-
 .../SkPdfDctdecodeFilterDictionary_autogen.cpp     |   1 +
 .../SkPdfDctdecodeFilterDictionary_autogen.h       |   6 +-
 .../SkPdfDeviceNColorSpaceDictionary_autogen.cpp   |   1 +
 .../SkPdfDeviceNColorSpaceDictionary_autogen.h     |   6 +-
 .../PdfViewer/autogen/SkPdfDictionary_autogen.cpp  |   1 +
 ...PdfDocumentCatalogActionsDictionary_autogen.cpp |   1 +
 ...SkPdfDocumentCatalogActionsDictionary_autogen.h |   6 +-
 .../SkPdfDocumentInformationDictionary_autogen.cpp |   1 +
 .../SkPdfDocumentInformationDictionary_autogen.h   |   6 +-
 ...kPdfEmbeddedFileParameterDictionary_autogen.cpp |   1 +
 .../SkPdfEmbeddedFileParameterDictionary_autogen.h |   6 +-
 .../SkPdfEmbeddedFileStreamDictionary_autogen.cpp  |   1 +
 .../SkPdfEmbeddedFileStreamDictionary_autogen.h    |   6 +-
 .../SkPdfEmbeddedFontStreamDictionary_autogen.cpp  |   1 +
 .../SkPdfEmbeddedFontStreamDictionary_autogen.h    |   6 +-
 .../autogen/SkPdfEncodingDictionary_autogen.cpp    |   1 +
 .../autogen/SkPdfEncodingDictionary_autogen.h      |   6 +-
 ...cryptedEmbeddedFileStreamDictionary_autogen.cpp |   1 +
 ...EncryptedEmbeddedFileStreamDictionary_autogen.h |   6 +-
 .../SkPdfEncryptionCommonDictionary_autogen.cpp    |   1 +
 .../SkPdfEncryptionCommonDictionary_autogen.h      |   6 +-
 .../PdfViewer/autogen/SkPdfEnums_autogen.h         |   2 +-
 .../autogen/SkPdfFDFCatalogDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfFDFCatalogDictionary_autogen.h    |   6 +-
 .../autogen/SkPdfFDFDictionary_autogen.cpp         |   1 +
 .../PdfViewer/autogen/SkPdfFDFDictionary_autogen.h |   6 +-
 .../autogen/SkPdfFDFFieldDictionary_autogen.cpp    |   1 +
 .../autogen/SkPdfFDFFieldDictionary_autogen.h      |   6 +-
 .../SkPdfFDFFileAnnotationDictionary_autogen.cpp   |   1 +
 .../SkPdfFDFFileAnnotationDictionary_autogen.h     |   6 +-
 ...kPdfFDFNamedPageReferenceDictionary_autogen.cpp |   1 +
 .../SkPdfFDFNamedPageReferenceDictionary_autogen.h |   6 +-
 .../autogen/SkPdfFDFPageDictionary_autogen.cpp     |   1 +
 .../autogen/SkPdfFDFPageDictionary_autogen.h       |   6 +-
 .../autogen/SkPdfFDFTemplateDictionary_autogen.cpp |   1 +
 .../autogen/SkPdfFDFTemplateDictionary_autogen.h   |   6 +-
 .../autogen/SkPdfFDFTrailerDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfFDFTrailerDictionary_autogen.h    |   6 +-
 .../autogen/SkPdfFieldDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfFieldDictionary_autogen.h         |   6 +-
 ...fFileAttachmentAnnotationDictionary_autogen.cpp |   1 +
 ...PdfFileAttachmentAnnotationDictionary_autogen.h |   6 +-
 .../SkPdfFileSpecificationDictionary_autogen.cpp   |   1 +
 .../SkPdfFileSpecificationDictionary_autogen.h     |   6 +-
 .../autogen/SkPdfFileTrailerDictionary_autogen.cpp |   1 +
 .../autogen/SkPdfFileTrailerDictionary_autogen.h   |   6 +-
 .../SkPdfFontDescriptorDictionary_autogen.cpp      |   1 +
 .../SkPdfFontDescriptorDictionary_autogen.h        |   6 +-
 .../autogen/SkPdfFontDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfFontDictionary_autogen.h          |   3 +
 .../SkPdfFormFieldActionsDictionary_autogen.cpp    |   1 +
 .../SkPdfFormFieldActionsDictionary_autogen.h      |   6 +-
 .../SkPdfFreeTextAnnotationDictionary_autogen.cpp  |   1 +
 .../SkPdfFreeTextAnnotationDictionary_autogen.h    |   6 +-
 .../SkPdfFunctionCommonDictionary_autogen.cpp      |   1 +
 .../SkPdfFunctionCommonDictionary_autogen.h        |   6 +-
 .../autogen/SkPdfGoToActionDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfGoToActionDictionary_autogen.h    |   6 +-
 .../SkPdfGraphicsStateDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfGraphicsStateDictionary_autogen.h |   6 +-
 .../SkPdfGroupAttributesDictionary_autogen.cpp     |   1 +
 .../SkPdfGroupAttributesDictionary_autogen.h       |   6 +-
 .../PdfViewer/autogen/SkPdfHexString_autogen.cpp   |   1 +
 .../autogen/SkPdfHideActionDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfHideActionDictionary_autogen.h    |   6 +-
 .../SkPdfIccProfileStreamDictionary_autogen.cpp    |   1 +
 .../SkPdfIccProfileStreamDictionary_autogen.h      |   6 +-
 .../autogen/SkPdfIconFitDictionary_autogen.cpp     |   1 +
 .../autogen/SkPdfIconFitDictionary_autogen.h       |   6 +-
 .../autogen/SkPdfImageDictionary_autogen.cpp       |   1 +
 .../SkPdfImportDataActionDictionary_autogen.cpp    |   1 +
 .../SkPdfImportDataActionDictionary_autogen.h      |   6 +-
 .../SkPdfInkAnnotationDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfInkAnnotationDictionary_autogen.h |   6 +-
 ...ineLevelStructureElementsDictionary_autogen.cpp |   1 +
 ...nlineLevelStructureElementsDictionary_autogen.h |   6 +-
 .../PdfViewer/autogen/SkPdfInteger_autogen.cpp     |   1 +
 .../PdfViewer/autogen/SkPdfInteger_autogen.h       |   6 +-
 .../SkPdfInteractiveFormDictionary_autogen.cpp     |   1 +
 .../SkPdfInteractiveFormDictionary_autogen.h       |   6 +-
 .../SkPdfJavascriptActionDictionary_autogen.cpp    |   1 +
 .../SkPdfJavascriptActionDictionary_autogen.h      |   6 +-
 .../autogen/SkPdfJavascriptDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfJavascriptDictionary_autogen.h    |   6 +-
 .../SkPdfJbig2DecodeFilterDictionary_autogen.cpp   |   1 +
 .../SkPdfJbig2DecodeFilterDictionary_autogen.h     |   6 +-
 .../SkPdfLabColorSpaceDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfLabColorSpaceDictionary_autogen.h |   6 +-
 .../SkPdfLaunchActionDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfLaunchActionDictionary_autogen.h  |   6 +-
 .../SkPdfLineAnnotationDictionary_autogen.cpp      |   1 +
 .../SkPdfLineAnnotationDictionary_autogen.h        |   6 +-
 .../SkPdfListAttributeDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfListAttributeDictionary_autogen.h |   6 +-
 ...codeAndFlatedecodeFiltersDictionary_autogen.cpp |   1 +
 ...decodeAndFlatedecodeFiltersDictionary_autogen.h |   6 +-
 ...SkPdfMacOsFileInformationDictionary_autogen.cpp |   1 +
 .../SkPdfMacOsFileInformationDictionary_autogen.h  |   6 +-
 .../SkPdfMarkInformationDictionary_autogen.cpp     |   1 +
 .../SkPdfMarkInformationDictionary_autogen.h       |   6 +-
 ...PdfMarkedContentReferenceDictionary_autogen.cpp |   1 +
 ...SkPdfMarkedContentReferenceDictionary_autogen.h |   6 +-
 .../SkPdfMarkupAnnotationsDictionary_autogen.cpp   |   1 +
 .../SkPdfMarkupAnnotationsDictionary_autogen.h     |   6 +-
 .../SkPdfMetadataStreamDictionary_autogen.cpp      |   1 +
 .../SkPdfMetadataStreamDictionary_autogen.h        |   6 +-
 .../autogen/SkPdfMovieActionDictionary_autogen.cpp |   1 +
 .../autogen/SkPdfMovieActionDictionary_autogen.h   |   6 +-
 .../SkPdfMovieActivationDictionary_autogen.cpp     |   1 +
 .../SkPdfMovieActivationDictionary_autogen.h       |   6 +-
 .../SkPdfMovieAnnotationDictionary_autogen.cpp     |   1 +
 .../SkPdfMovieAnnotationDictionary_autogen.h       |   6 +-
 .../autogen/SkPdfMovieDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfMovieDictionary_autogen.h         |   6 +-
 .../SkPdfMultiMasterFontDictionary_autogen.cpp     |   1 +
 .../autogen/SkPdfNameDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfNameDictionary_autogen.h          |   6 +-
 .../SkPdfNameTreeNodeDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfNameTreeNodeDictionary_autogen.h  |   6 +-
 .../PdfViewer/autogen/SkPdfName_autogen.cpp        |   1 +
 experimental/PdfViewer/autogen/SkPdfName_autogen.h |   6 +-
 .../SkPdfNamedActionsDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfNamedActionsDictionary_autogen.h  |   6 +-
 .../PdfViewer/autogen/SkPdfNull_autogen.cpp        |   1 +
 experimental/PdfViewer/autogen/SkPdfNull_autogen.h |   6 +-
 .../SkPdfNumberTreeNodeDictionary_autogen.cpp      |   1 +
 .../SkPdfNumberTreeNodeDictionary_autogen.h        |   6 +-
 .../PdfViewer/autogen/SkPdfNumber_autogen.cpp      |   1 +
 .../SkPdfObjectReferenceDictionary_autogen.cpp     |   1 +
 .../SkPdfObjectReferenceDictionary_autogen.h       |   6 +-
 .../PdfViewer/autogen/SkPdfObject_autogen.cpp      |   1 +
 .../PdfViewer/autogen/SkPdfObject_autogen.h        |   6 +-
 .../autogen/SkPdfOpiVersionDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfOpiVersionDictionary_autogen.h    |   6 +-
 .../autogen/SkPdfOutlineDictionary_autogen.cpp     |   1 +
 .../autogen/SkPdfOutlineDictionary_autogen.h       |   6 +-
 .../autogen/SkPdfOutlineItemDictionary_autogen.cpp |   1 +
 .../autogen/SkPdfOutlineItemDictionary_autogen.h   |   6 +-
 .../SkPdfPDF_XOutputIntentDictionary_autogen.cpp   |   1 +
 .../SkPdfPDF_XOutputIntentDictionary_autogen.h     |   6 +-
 .../autogen/SkPdfPSXobjectDictionary_autogen.cpp   |   1 +
 .../autogen/SkPdfPSXobjectDictionary_autogen.h     |   6 +-
 .../autogen/SkPdfPageLabelDictionary_autogen.cpp   |   1 +
 .../autogen/SkPdfPageLabelDictionary_autogen.h     |   6 +-
 .../SkPdfPageObjectActionsDictionary_autogen.cpp   |   1 +
 .../SkPdfPageObjectActionsDictionary_autogen.h     |   6 +-
 .../autogen/SkPdfPageObjectDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfPageObjectDictionary_autogen.h    |   6 +-
 .../autogen/SkPdfPagePieceDictionary_autogen.h     |   6 +-
 .../SkPdfPageTreeNodeDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfPageTreeNodeDictionary_autogen.h  |   6 +-
 .../autogen/SkPdfPodofoMapper_autogen.cpp          |   3 +-
 .../SkPdfPopUpAnnotationDictionary_autogen.cpp     |   1 +
 .../SkPdfPopUpAnnotationDictionary_autogen.h       |   6 +-
 ...kPdfPrinterMarkAnnotationDictionary_autogen.cpp |   1 +
 .../SkPdfPrinterMarkAnnotationDictionary_autogen.h |   6 +-
 .../SkPdfPrinterMarkFormDictionary_autogen.cpp     |   1 +
 .../SkPdfPrinterMarkFormDictionary_autogen.h       |   6 +-
 .../SkPdfRadioButtonFieldDictionary_autogen.cpp    |   1 +
 .../SkPdfRadioButtonFieldDictionary_autogen.h      |   6 +-
 .../autogen/SkPdfReferenceDictionary_autogen.cpp   |   1 +
 .../autogen/SkPdfReferenceDictionary_autogen.h     |   6 +-
 .../PdfViewer/autogen/SkPdfReference_autogen.cpp   |   1 +
 .../PdfViewer/autogen/SkPdfReference_autogen.h     |   6 +-
 .../SkPdfRemoteGoToActionDictionary_autogen.cpp    |   1 +
 .../SkPdfRemoteGoToActionDictionary_autogen.h      |   6 +-
 .../SkPdfResetFormActionDictionary_autogen.cpp     |   1 +
 .../SkPdfResetFormActionDictionary_autogen.h       |   6 +-
 .../autogen/SkPdfResourceDictionary_autogen.cpp    |   1 +
 .../autogen/SkPdfResourceDictionary_autogen.h      |   6 +-
 ...kPdfRubberStampAnnotationDictionary_autogen.cpp |   1 +
 .../SkPdfRubberStampAnnotationDictionary_autogen.h |   6 +-
 .../autogen/SkPdfSeparationDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfSeparationDictionary_autogen.h    |   6 +-
 .../autogen/SkPdfShadingDictionary_autogen.cpp     |   1 +
 .../autogen/SkPdfShadingDictionary_autogen.h       |   6 +-
 .../autogen/SkPdfSignatureDictionary_autogen.cpp   |   1 +
 .../autogen/SkPdfSignatureDictionary_autogen.h     |   6 +-
 .../autogen/SkPdfSoftMaskDictionary_autogen.cpp    |   1 +
 .../autogen/SkPdfSoftMaskDictionary_autogen.h      |   6 +-
 .../SkPdfSoftMaskImageDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfSoftMaskImageDictionary_autogen.h |   6 +-
 .../autogen/SkPdfSoundActionDictionary_autogen.cpp |   1 +
 .../autogen/SkPdfSoundActionDictionary_autogen.h   |   6 +-
 .../SkPdfSoundAnnotationDictionary_autogen.cpp     |   1 +
 .../SkPdfSoundAnnotationDictionary_autogen.h       |   6 +-
 .../autogen/SkPdfSoundObjectDictionary_autogen.cpp |   1 +
 .../autogen/SkPdfSoundObjectDictionary_autogen.h   |   6 +-
 .../SkPdfSourceInformationDictionary_autogen.cpp   |   1 +
 .../SkPdfSourceInformationDictionary_autogen.h     |   6 +-
 .../SkPdfSquareOrCircleAnnotation_autogen.cpp      |   1 +
 .../SkPdfSquareOrCircleAnnotation_autogen.h        |   6 +-
 ...dfStandardSecurityHandlerDictionary_autogen.cpp |   1 +
 ...kPdfStandardSecurityHandlerDictionary_autogen.h |   6 +-
 .../SkPdfStandardStructureDictionary_autogen.cpp   |   1 +
 .../SkPdfStandardStructureDictionary_autogen.h     |   6 +-
 .../SkPdfStreamCommonDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfStreamCommonDictionary_autogen.h  |   6 +-
 .../PdfViewer/autogen/SkPdfStream_autogen.cpp      |   1 +
 .../PdfViewer/autogen/SkPdfStream_autogen.h        |   6 +-
 .../PdfViewer/autogen/SkPdfString_autogen.cpp      |   1 +
 .../PdfViewer/autogen/SkPdfString_autogen.h        |   6 +-
 ...PdfStructureElementAccessDictionary_autogen.cpp |   1 +
 ...SkPdfStructureElementAccessDictionary_autogen.h |   6 +-
 .../SkPdfStructureElementDictionary_autogen.cpp    |   1 +
 .../SkPdfStructureElementDictionary_autogen.h      |   6 +-
 .../SkPdfStructureTreeRootDictionary_autogen.cpp   |   1 +
 .../SkPdfStructureTreeRootDictionary_autogen.h     |   6 +-
 .../SkPdfSubmitFormActionDictionary_autogen.cpp    |   1 +
 .../SkPdfSubmitFormActionDictionary_autogen.h      |   6 +-
 .../SkPdfTableAttributesDictionary_autogen.cpp     |   1 +
 .../SkPdfTableAttributesDictionary_autogen.h       |   6 +-
 .../SkPdfTextAnnotationDictionary_autogen.cpp      |   1 +
 .../SkPdfTextAnnotationDictionary_autogen.h        |   6 +-
 .../autogen/SkPdfTextFieldDictionary_autogen.cpp   |   1 +
 .../autogen/SkPdfTextFieldDictionary_autogen.h     |   6 +-
 .../SkPdfThreadActionDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfThreadActionDictionary_autogen.h  |   6 +-
 .../autogen/SkPdfThreadDictionary_autogen.cpp      |   1 +
 .../autogen/SkPdfThreadDictionary_autogen.h        |   6 +-
 .../autogen/SkPdfTransitionDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfTransitionDictionary_autogen.h    |   6 +-
 .../SkPdfTransparencyGroupDictionary_autogen.cpp   |   1 +
 .../SkPdfTransparencyGroupDictionary_autogen.h     |   6 +-
 ...kPdfTrapNetworkAnnotationDictionary_autogen.cpp |   1 +
 .../SkPdfTrapNetworkAnnotationDictionary_autogen.h |   6 +-
 ...apNetworkAppearanceStreamDictionary_autogen.cpp |   1 +
 ...TrapNetworkAppearanceStreamDictionary_autogen.h |   6 +-
 .../SkPdfTrueTypeFontDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfType0FontDictionary_autogen.cpp   |   1 +
 .../autogen/SkPdfType0FontDictionary_autogen.h     |   3 -
 .../SkPdfType0FunctionDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfType0FunctionDictionary_autogen.h |   6 +-
 .../SkPdfType10HalftoneDictionary_autogen.cpp      |   1 +
 .../SkPdfType10HalftoneDictionary_autogen.h        |   6 +-
 .../SkPdfType16HalftoneDictionary_autogen.cpp      |   1 +
 .../SkPdfType16HalftoneDictionary_autogen.h        |   6 +-
 .../autogen/SkPdfType1FontDictionary_autogen.cpp   |   7 +-
 .../autogen/SkPdfType1FontDictionary_autogen.h     |   5 +-
 .../autogen/SkPdfType1FormDictionary_autogen.cpp   |   1 +
 .../SkPdfType1HalftoneDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfType1HalftoneDictionary_autogen.h |   6 +-
 .../SkPdfType1PatternDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfType1PatternDictionary_autogen.h  |   6 +-
 .../SkPdfType1ShadingDictionary_autogen.cpp        |   1 +
 .../SkPdfType2FunctionDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfType2FunctionDictionary_autogen.h |   6 +-
 .../SkPdfType2PatternDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfType2PatternDictionary_autogen.h  |   6 +-
 .../SkPdfType2ShadingDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfType3FontDictionary_autogen.cpp   |   1 +
 .../SkPdfType3FunctionDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfType3FunctionDictionary_autogen.h |   6 +-
 .../SkPdfType3ShadingDictionary_autogen.cpp        |   1 +
 .../SkPdfType4ShadingDictionary_autogen.cpp        |   1 +
 .../SkPdfType5HalftoneDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfType5HalftoneDictionary_autogen.h |   6 +-
 .../SkPdfType5ShadingDictionary_autogen.cpp        |   1 +
 .../SkPdfType6HalftoneDictionary_autogen.cpp       |   1 +
 .../autogen/SkPdfType6HalftoneDictionary_autogen.h |   6 +-
 .../SkPdfType6ShadingDictionary_autogen.cpp        |   1 +
 .../autogen/SkPdfURIActionDictionary_autogen.cpp   |   1 +
 .../autogen/SkPdfURIActionDictionary_autogen.h     |   6 +-
 .../autogen/SkPdfURIDictionary_autogen.cpp         |   1 +
 .../PdfViewer/autogen/SkPdfURIDictionary_autogen.h |   6 +-
 .../autogen/SkPdfURLAliasDictionary_autogen.cpp    |   1 +
 .../autogen/SkPdfURLAliasDictionary_autogen.h      |   6 +-
 .../SkPdfVariableTextFieldDictionary_autogen.cpp   |   1 +
 .../SkPdfVariableTextFieldDictionary_autogen.h     |   6 +-
 .../SkPdfViewerPreferencesDictionary_autogen.cpp   |   1 +
 .../SkPdfViewerPreferencesDictionary_autogen.h     |   6 +-
 .../SkPdfWebCaptureCommandDictionary_autogen.cpp   |   1 +
 .../SkPdfWebCaptureCommandDictionary_autogen.h     |   6 +-
 ...WebCaptureCommandSettingsDictionary_autogen.cpp |   1 +
 ...dfWebCaptureCommandSettingsDictionary_autogen.h |   6 +-
 .../autogen/SkPdfWebCaptureDictionary_autogen.cpp  |   1 +
 .../autogen/SkPdfWebCaptureDictionary_autogen.h    |   6 +-
 .../SkPdfWebCaptureImageSetDictionary_autogen.cpp  |   1 +
 .../SkPdfWebCaptureImageSetDictionary_autogen.h    |   6 +-
 ...kPdfWebCaptureInformationDictionary_autogen.cpp |   1 +
 .../SkPdfWebCaptureInformationDictionary_autogen.h |   6 +-
 .../SkPdfWebCapturePageSetDictionary_autogen.cpp   |   1 +
 .../SkPdfWebCapturePageSetDictionary_autogen.h     |   6 +-
 .../SkPdfWidgetAnnotationDictionary_autogen.cpp    |   1 +
 .../SkPdfWidgetAnnotationDictionary_autogen.h      |   6 +-
 .../SkPdfWindowsLaunchActionDictionary_autogen.cpp |   1 +
 .../SkPdfWindowsLaunchActionDictionary_autogen.h   |   6 +-
 .../autogen/SkPdfXObjectDictionary_autogen.cpp     |   1 +
 .../autogen/SkPdfXObjectDictionary_autogen.h       |   6 +-
 experimental/PdfViewer/autogen/pdfspec_autogen.py  |   6 +-
 experimental/PdfViewer/generate_code.py            |   5 +-
 experimental/PdfViewer/spec2def.py                 |   2 +-
 351 files changed, 1270 insertions(+), 641 deletions(-)

(limited to 'experimental')

diff --git a/experimental/PdfViewer/SkPdfFont.cpp b/experimental/PdfViewer/SkPdfFont.cpp
index 42c8056da8..8170453508 100644
--- a/experimental/PdfViewer/SkPdfFont.cpp
+++ b/experimental/PdfViewer/SkPdfFont.cpp
@@ -148,49 +148,51 @@ SkTypeface* SkTypefaceFromPdfStandardFont(const char* fontName, bool bold, bool
     return typeface;
 }
 
-static SkPdfFont* fontFromFontDescriptor(SkPdfFontDescriptorDictionary* fd) {
+SkPdfFont* SkPdfFont::fontFromFontDescriptor(SkPdfFontDescriptorDictionary* fd, bool loadFromName) {
+    // TODO(edisonn): partial implementation
     // Only one, at most be available
+    SkPdfStream* pdfStream = NULL;
     if (fd->has_FontFile()) {
-
+        pdfStream = fd->FontFile();
     } else if (fd->has_FontFile2()) {
-        SkPdfStream* pdfStream = fd->FontFile2();
-
-        if (!pdfStream->podofo()->GetStream()) {
-            // TODO(edisonn): report warning to be used in testing.
-            return NULL;
-        }
-
-        char* uncompressedStream = NULL;
-        pdf_long uncompressedStreamLength = 0;
-
-        // TODO(edisonn): get rid of try/catch exceptions! We should not throw on user data!
-        try {
-            pdfStream->podofo()->GetStream()->GetFilteredCopy(&uncompressedStream, &uncompressedStreamLength);
-        } catch (PdfError& e) {
-            // TODO(edisonn): report warning to be used in testing.
-            return NULL;
-        }
-        SkMemoryStream* skStream = new SkMemoryStream(uncompressedStream, uncompressedStreamLength);
-        SkTypeface* face = SkTypeface::CreateFromStream(skStream);
-
-        if (face == NULL) {
-            // TODO(edisonn): report warning to be used in testing.
-            return NULL;
+        pdfStream = fd->FontFile2();
+    } if (fd->has_FontFile3()) {
+        pdfStream = fd->FontFile3();
+    } else {
+        if (loadFromName) {
+            return fontFromName(fd, fd->FontName().c_str());
         }
+    }
 
-        face->ref();
+    if (!pdfStream || !pdfStream->podofo()->GetStream()) {
+        // TODO(edisonn): report warning to be used in testing.
+        return NULL;
+    }
 
-        return new SkPdfStandardFont(face);
-    } if (fd->has_FontFile3()) {
+    char* uncompressedStream = NULL;
+    pdf_long uncompressedStreamLength = 0;
 
-    } else {
+    // TODO(edisonn): get rid of try/catch exceptions! We should not throw on user data!
+    try {
+        pdfStream->podofo()->GetStream()->GetFilteredCopy(&uncompressedStream, &uncompressedStreamLength);
+    } catch (PdfError& e) {
+        // TODO(edisonn): report warning to be used in testing.
+        return NULL;
+    }
+    SkMemoryStream* skStream = new SkMemoryStream(uncompressedStream, uncompressedStreamLength);
+    SkTypeface* face = SkTypeface::CreateFromStream(skStream);
 
+    if (face == NULL) {
+        // TODO(edisonn): report warning to be used in testing.
+        return NULL;
     }
 
-    return NULL;
+    face->ref();
+
+    return new SkPdfStandardFont(face);
 }
 
-SkPdfFont* SkPdfFontFromName(SkPdfObject* obj, const char* fontName) {
+SkPdfFont* fontFromName(SkPdfObject* obj, const char* fontName) {
     SkTypeface* typeface = SkTypefaceFromPdfStandardFont(fontName, false, false);
     if (typeface != NULL) {
         return new SkPdfStandardFont(typeface);
@@ -203,7 +205,7 @@ SkPdfFont* SkPdfFontFromName(SkPdfObject* obj, const char* fontName) {
         SkPdfFontDescriptorDictionary* fd = NULL;
         if (mapFontDescriptorDictionary(*obj->doc(), *podofoFont, &fd)) {
             if (fd->has_FontName() && fd->FontName() == fontName) {
-                SkPdfFont* font = fontFromFontDescriptor(fd);
+                SkPdfFont* font = SkPdfFont::fontFromFontDescriptor(fd, false);
                 if (font) {
                     return font;
                 } else {
@@ -233,9 +235,6 @@ SkPdfFont* SkPdfFont::fontFromPdfDictionary(SkPdfFontDictionary* dict) {
         case kType1FontDictionary_SkPdfObjectType:
             return fontFromType1FontDictionary(dict->asType1FontDictionary());
 
-        case kCIDFontDictionary_SkPdfObjectType:
-            return fontFromCIDFontDictionary(dict->asCIDFontDictionary());
-
         case kMultiMasterFontDictionary_SkPdfObjectType:
             return fontFromMultiMasterFontDictionary(dict->asMultiMasterFontDictionary());
 
@@ -279,14 +278,6 @@ SkPdfTrueTypeFont* SkPdfFont::fontFromTrueTypeFontDictionary(SkPdfTrueTypeFontDi
     return new SkPdfTrueTypeFont(dict);
 }
 
-SkPdfCIDFont* SkPdfFont::fontFromCIDFontDictionary(SkPdfCIDFontDictionary* dict) {
-    if (dict == NULL) {
-        return NULL;  // default one?
-    }
-
-    return new SkPdfCIDFont(dict);
-}
-
 SkPdfMultiMasterFont* SkPdfFont::fontFromMultiMasterFontDictionary(SkPdfMultiMasterFontDictionary* dict) {
     if (dict == NULL) {
         return NULL;  // default one?
@@ -396,7 +387,7 @@ SkPdfToUnicode::SkPdfToUnicode(const SkPdfStream* stream) {
 
 
 SkPdfType0Font::SkPdfType0Font(SkPdfType0FontDictionary* dict) {
-    fBaseFont = SkPdfFontFromName(dict, dict->BaseFont().c_str());
+    fBaseFont = fontFromName(dict, dict->BaseFont().c_str());
     fEncoding = NULL;
 
     if (dict->has_Encoding()) {
diff --git a/experimental/PdfViewer/SkPdfFont.h b/experimental/PdfViewer/SkPdfFont.h
index 85b9fc41fb..90fe3b0f16 100644
--- a/experimental/PdfViewer/SkPdfFont.h
+++ b/experimental/PdfViewer/SkPdfFont.h
@@ -17,7 +17,6 @@ class SkPdfType0Font;
 class SkPdfType1Font;
 class SkPdfType3Font;
 class SkPdfTrueTypeFont;
-class SkPdfCIDFont;
 class SkPdfMultiMasterFont;
 class SkPdfFont;
 
@@ -30,7 +29,7 @@ struct SkPdfStandardFontEntry {
 
 std::map<std::string, SkPdfStandardFontEntry>& getStandardFonts();
 SkTypeface* SkTypefaceFromPdfStandardFont(const char* fontName, bool bold, bool italic);
-SkPdfFont* SkPdfFontFromName(SkPdfObject* obj, const char* fontName);
+SkPdfFont* fontFromName(SkPdfObject* obj, const char* fontName);
 
 struct SkUnencodedText {
     void* text;
@@ -100,6 +99,28 @@ public:
     }
 };
 
+// TODO(edisonn): using this one when no encoding is specified
+class SkPdfDefaultEncoding : 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 SkPdfDefaultEncoding* instance() {
+        static SkPdfDefaultEncoding* inst = new SkPdfDefaultEncoding();
+        return inst;
+    }
+};
 
 class SkPdfCIDToGIDMapIdentityEncoding : public SkPdfEncoding {
 public:
@@ -131,13 +152,15 @@ public:
 
 
 public:
-    SkPdfFont() : fBaseFont(NULL), fEncoding(NULL), fToUnicode(NULL) {}
+    SkPdfFont() : fBaseFont(NULL), fEncoding(SkPdfDefaultEncoding::instance()), fToUnicode(NULL) {}
 
     const SkPdfEncoding* encoding() const {return fEncoding;}
 
-    void drawText(const SkDecodedText& text, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
+    void drawText(const SkDecodedText& text, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas) {
         for (int i = 0 ; i < text.size(); i++) {
-            drawOneChar(text[i], paint, pdfContext, canvas, matrix);
+            double width = drawOneChar(text[i], paint, pdfContext, canvas);
+            pdfContext->fGraphicsState.fMatrixTm.preTranslate(SkDoubleToScalar(width), SkDoubleToScalar(0.0));
+            canvas->translate(SkDoubleToScalar(width), SkDoubleToScalar(0.0));
         }
     }
 
@@ -163,18 +186,18 @@ public:
     };
 
     static SkPdfFont* fontFromPdfDictionary(SkPdfFontDictionary* dict);
-    static SkPdfFont* Default() {return SkPdfFontFromName(NULL, "TimesNewRoman");}
+    static SkPdfFont* Default() {return fontFromName(NULL, "TimesNewRoman");}
 
     static SkPdfType0Font* fontFromType0FontDictionary(SkPdfType0FontDictionary* dict);
     static SkPdfType1Font* fontFromType1FontDictionary(SkPdfType1FontDictionary* dict);
     static SkPdfType3Font* fontFromType3FontDictionary(SkPdfType3FontDictionary* dict);
     static SkPdfTrueTypeFont* fontFromTrueTypeFontDictionary(SkPdfTrueTypeFontDictionary* dict);
-    static SkPdfCIDFont* fontFromCIDFontDictionary(SkPdfCIDFontDictionary* dict);
     static SkPdfMultiMasterFont* fontFromMultiMasterFontDictionary(SkPdfMultiMasterFontDictionary* dict);
 
+    static SkPdfFont* fontFromFontDescriptor(SkPdfFontDescriptorDictionary* fd, bool loadFromName = true);
+
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) = 0;
-    virtual void afterChar(SkPaint* paint, SkMatrix* matrix) = 0;
+    virtual double drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas) = 0;
     virtual void afterWord(SkPaint* paint, SkMatrix* matrix) = 0;
 };
 
@@ -185,7 +208,7 @@ public:
     SkPdfStandardFont(SkTypeface* typeface) : fTypeface(typeface) {}
 
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
+    virtual double drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas) {
         paint->setTypeface(fTypeface);
         paint->setTextEncoding(SkPaint::kUTF8_TextEncoding);
 
@@ -196,10 +219,9 @@ public:
         canvas->drawText(utf8, len, SkDoubleToScalar(0), SkDoubleToScalar(0), *paint);
 
         SkScalar textWidth = paint->measureText(utf8, len);
-        matrix->preTranslate(textWidth, SkDoubleToScalar(0.0));
+        return SkScalarToDouble(textWidth);
     }
 
-    virtual void afterChar(SkPaint* paint, SkMatrix* matrix) {}
     virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {}
 };
 
@@ -209,98 +231,43 @@ public:
 
 public:
 
-    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) {
-
-    }
-
-    virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {
-    }
-};
-
-class SkPdfTrueTypeFont : public SkPdfFont {
-public:
-    SkPdfTrueTypeFont(SkPdfTrueTypeFontDictionary* dict) {
-        fBaseFont = SkPdfFontFromName(dict, dict->BaseFont().c_str());
-    }
-
-public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
-
-    }
-
-    virtual void afterChar(SkPaint* paint, SkMatrix* matrix) {
-
+    virtual double drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas) {
+        return fBaseFont->drawOneChar(ToUnicode(ch), paint, pdfContext, canvas);
     }
 
     virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {
-
     }
 };
 
-
 class SkPdfType1Font : public SkPdfFont {
 public:
     SkPdfType1Font(SkPdfType1FontDictionary* dict) {
-        fBaseFont = SkPdfFontFromName(dict, dict->BaseFont().c_str());
+        if (dict->has_FontDescriptor()) {
+            fBaseFont = SkPdfFont::fontFromFontDescriptor(dict->FontDescriptor());
+        } else {
+            fBaseFont = fontFromName(dict, dict->BaseFont().c_str());
+        }
     }
 
-
 public:
-      virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
-
-      }
-
-      virtual void afterChar(SkPaint* paint, SkMatrix* matrix) {
-
+      virtual double drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas) {
+          return fBaseFont->drawOneChar(ToUnicode(ch), paint, pdfContext, canvas);
       }
 
       virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {
 
       }
- };
-
-
-class SkPdfCIDFont : public SkPdfFont {
-public:
-    SkPdfCIDFont(SkPdfCIDFontDictionary* dict) {
-        fBaseFont = SkPdfFontFromName(dict, dict->BaseFont().c_str());
-    }
-
-public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
-
-    }
-
-    virtual void afterChar(SkPaint* paint, SkMatrix* matrix) {
-
-    }
-
-    virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {
-
-    }
 };
 
-class SkPdfMultiMasterFont : public SkPdfFont {
+class SkPdfTrueTypeFont : public SkPdfType1Font {
 public:
-    SkPdfMultiMasterFont(SkPdfMultiMasterFontDictionary* dict) {
-        fBaseFont = SkPdfFontFromName(dict, dict->BaseFont().c_str());
+    SkPdfTrueTypeFont(SkPdfTrueTypeFontDictionary* dict) : SkPdfType1Font(dict) {
     }
+};
 
+class SkPdfMultiMasterFont : public SkPdfType1Font {
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
-
-    }
-
-    virtual void afterChar(SkPaint* paint, SkMatrix* matrix) {
-
-    }
-
-    virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {
-
+    SkPdfMultiMasterFont(SkPdfMultiMasterFontDictionary* dict) : SkPdfType1Font(dict) {
     }
 };
 /*
@@ -351,7 +318,7 @@ class SkPdfType3Font : public SkPdfFont {
 
 public:
     SkPdfType3Font(SkPdfType3FontDictionary* dict) {
-        fBaseFont = SkPdfFontFromName(dict, dict->BaseFont().c_str());
+        fBaseFont = fontFromName(dict, dict->BaseFont().c_str());
 
         if (dict->has_Encoding()) {
             if (dict->isEncodingAName()) {
@@ -410,10 +377,9 @@ public:
     }
 
 public:
-    virtual void drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas, SkMatrix* matrix) {
+    virtual double drawOneChar(unsigned int ch, SkPaint* paint, PdfContext* pdfContext, SkCanvas* canvas) {
         if (ch < fFirstChar || ch > fLastChar || !fChars[ch - fFirstChar].fObj) {
-            fBaseFont->drawOneChar(ToUnicode(ch), paint, pdfContext, canvas, matrix);
-            return;
+            return fBaseFont->drawOneChar(ToUnicode(ch), paint, pdfContext, canvas);
         }
 
 #ifdef PDF_TRACE
@@ -424,9 +390,10 @@ public:
 #endif
 
         doType3Char(pdfContext, canvas, fChars[ch - fFirstChar].fObj, fFontBBox, fFonMatrix, pdfContext->fGraphicsState.fCurFontSize);
-    }
 
-    virtual void afterChar(SkPaint* paint, SkMatrix* matrix) {
+        // TODO(edisonn): verify/test translate code, not tested yet
+        pdfContext->fGraphicsState.fMatrixTm.preTranslate(SkDoubleToScalar(pdfContext->fGraphicsState.fCurFontSize * fChars[ch - fFirstChar].fWidth),
+                             SkDoubleToScalar(0.0));
     }
 
     virtual void afterWord(SkPaint* paint, SkMatrix* matrix) {
diff --git a/experimental/PdfViewer/SkPdfParser.cpp b/experimental/PdfViewer/SkPdfParser.cpp
index 0a6c6e60c8..94dd5dd498 100644
--- a/experimental/PdfViewer/SkPdfParser.cpp
+++ b/experimental/PdfViewer/SkPdfParser.cpp
@@ -34,6 +34,8 @@ __SK_FORCE_IMAGE_DECODER_LINKING;
 
 // TODO(edisonn): security - validate all the user input, all pdf!
 
+// TODO(edisonn): put drawtext in #ifdefs, so comparations will ignore minor changes in text positioning and font
+// this way, we look more at other features and layout in diffs
 
 #include "SkPdfHeaders_autogen.h"
 #include "SkPdfPodofoMapper_autogen.h"
@@ -386,7 +388,7 @@ PdfResult DrawText(PdfContext* pdfContext,
     SkTraceMatrix(matrix, "mirrored");
 #endif
 
-    skfont->drawText(decoded, &paint, pdfContext, canvas, &pdfContext->fGraphicsState.fMatrixTm);
+    skfont->drawText(decoded, &paint, pdfContext, canvas);
     canvas->restore();
 
     return kPartial_PdfResult;
@@ -2334,7 +2336,14 @@ bool SkPdfViewer::load(const SkString inputFileName, SkPicture* out) {
                 doc.drawPage(pn, &canvas);
 
                 SkString out;
-                out.appendf("%s-%i.png", inputFileName.c_str(), pn);
+                if (doc.pages() > 1) {
+                    out.appendf("%s-%i.png", inputFileName.c_str(), pn);
+                } else {
+                    out = inputFileName;
+                    // .pdf -> .png
+                    out[out.size() - 2] = 'n';
+                    out[out.size() - 1] = 'g';
+                }
                 SkImageEncoder::EncodeFile(out.c_str(), bitmap, SkImageEncoder::kPNG_Type, 100);
             }
             return true;
diff --git a/experimental/PdfViewer/autogen/SkPdfALinkAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfALinkAnnotationDictionary_autogen.cpp
index ee5def7dff..38d8fb87e2 100644
--- a/experimental/PdfViewer/autogen/SkPdfALinkAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfALinkAnnotationDictionary_autogen.cpp
@@ -48,3 +48,4 @@ SkPdfDictionary* SkPdfALinkAnnotationDictionary::PA() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfALinkAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfALinkAnnotationDictionary_autogen.h
index e2ba74e515..70e7a5e809 100644
--- a/experimental/PdfViewer/autogen/SkPdfALinkAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfALinkAnnotationDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfActionDictionary_autogen.cpp
index 9080dc1203..ed91efcd58 100644
--- a/experimental/PdfViewer/autogen/SkPdfActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfActionDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfActionDictionary::getNextAsArray() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfActionDictionary_autogen.h
index 56f648e404..2ff141ac40 100644
--- a/experimental/PdfViewer/autogen/SkPdfActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfActionDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfAlternateImageDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfAlternateImageDictionary_autogen.cpp
index f9d87a2dbf..3d262e449c 100644
--- a/experimental/PdfViewer/autogen/SkPdfAlternateImageDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfAlternateImageDictionary_autogen.cpp
@@ -13,3 +13,4 @@ bool SkPdfAlternateImageDictionary::DefaultForPrinting() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfAlternateImageDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfAlternateImageDictionary_autogen.h
index 4e9b8866df..0dccdef0c7 100644
--- a/experimental/PdfViewer/autogen/SkPdfAlternateImageDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfAlternateImageDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfAnnotationActionsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfAnnotationActionsDictionary_autogen.cpp
index 9ed1acd6c2..183dbd1ee6 100644
--- a/experimental/PdfViewer/autogen/SkPdfAnnotationActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfAnnotationActionsDictionary_autogen.cpp
@@ -41,3 +41,4 @@ SkPdfDictionary* SkPdfAnnotationActionsDictionary::Bl() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfAnnotationActionsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfAnnotationActionsDictionary_autogen.h
index 9ded5eeadb..b5c2a699d0 100644
--- a/experimental/PdfViewer/autogen/SkPdfAnnotationActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfAnnotationActionsDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfAnnotationDictionary_autogen.cpp
index 422dbe5ee1..0e29966ba0 100644
--- a/experimental/PdfViewer/autogen/SkPdfAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfAnnotationDictionary_autogen.cpp
@@ -132,3 +132,4 @@ long SkPdfAnnotationDictionary::StructParent() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfAnnotationDictionary_autogen.h
index 9b7f08aa30..b5a800a04f 100644
--- a/experimental/PdfViewer/autogen/SkPdfAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfAnnotationDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfAppearanceCharacteristicsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfAppearanceCharacteristicsDictionary_autogen.cpp
index 504f1ab6a3..96b6b4e4d0 100644
--- a/experimental/PdfViewer/autogen/SkPdfAppearanceCharacteristicsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfAppearanceCharacteristicsDictionary_autogen.cpp
@@ -76,3 +76,4 @@ long SkPdfAppearanceCharacteristicsDictionary::TP() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfAppearanceCharacteristicsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfAppearanceCharacteristicsDictionary_autogen.h
index a3814a6cbb..ab59a698fa 100644
--- a/experimental/PdfViewer/autogen/SkPdfAppearanceCharacteristicsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfAppearanceCharacteristicsDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfAppearanceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfAppearanceDictionary_autogen.cpp
index fbfc46ec40..54ba878dc8 100644
--- a/experimental/PdfViewer/autogen/SkPdfAppearanceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfAppearanceDictionary_autogen.cpp
@@ -41,3 +41,4 @@ SkPdfDictionary* SkPdfAppearanceDictionary::getDAsDictionary() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfAppearanceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfAppearanceDictionary_autogen.h
index 3e8782bea8..7bf9e7b1b7 100644
--- a/experimental/PdfViewer/autogen/SkPdfAppearanceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfAppearanceDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfApplicationDataDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfApplicationDataDictionary_autogen.cpp
index cada2fc781..ff3a3a101e 100644
--- a/experimental/PdfViewer/autogen/SkPdfApplicationDataDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfApplicationDataDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfObject* SkPdfApplicationDataDictionary::Private() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfApplicationDataDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfApplicationDataDictionary_autogen.h
index e82ecc36a5..d9ba85f785 100644
--- a/experimental/PdfViewer/autogen/SkPdfApplicationDataDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfApplicationDataDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfArray_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfArray_autogen.cpp
index d27e5a261d..fd25276b04 100644
--- a/experimental/PdfViewer/autogen/SkPdfArray_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfArray_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfArray_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfArray_autogen.h b/experimental/PdfViewer/autogen/SkPdfArray_autogen.h
index 3c34ceab2a..ec7874be87 100644
--- a/experimental/PdfViewer/autogen/SkPdfArray_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfArray_autogen.h
@@ -69,6 +69,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -168,9 +171,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfArtifactsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfArtifactsDictionary_autogen.cpp
index 59bc9d5c0d..bac501df9e 100644
--- a/experimental/PdfViewer/autogen/SkPdfArtifactsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfArtifactsDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfArtifactsDictionary::Attached() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfArtifactsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfArtifactsDictionary_autogen.h
index d63a649990..cb753b7096 100644
--- a/experimental/PdfViewer/autogen/SkPdfArtifactsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfArtifactsDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfAttributeObjectDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfAttributeObjectDictionary_autogen.cpp
index ca2c10a399..7810f46af4 100644
--- a/experimental/PdfViewer/autogen/SkPdfAttributeObjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfAttributeObjectDictionary_autogen.cpp
@@ -6,3 +6,4 @@ std::string SkPdfAttributeObjectDictionary::O() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfAttributeObjectDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfAttributeObjectDictionary_autogen.h
index 6c07fa8615..a45f01c0e2 100644
--- a/experimental/PdfViewer/autogen/SkPdfAttributeObjectDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfAttributeObjectDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfBeadDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfBeadDictionary_autogen.cpp
index 440a93e075..69c6b07160 100644
--- a/experimental/PdfViewer/autogen/SkPdfBeadDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfBeadDictionary_autogen.cpp
@@ -41,3 +41,4 @@ SkRect* SkPdfBeadDictionary::R() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfBeadDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfBeadDictionary_autogen.h
index 24611f7ed2..bc9cccf032 100644
--- a/experimental/PdfViewer/autogen/SkPdfBeadDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfBeadDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfBlockLevelStructureElementsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfBlockLevelStructureElementsDictionary_autogen.cpp
index bbf43bce9f..720eaca3b8 100644
--- a/experimental/PdfViewer/autogen/SkPdfBlockLevelStructureElementsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfBlockLevelStructureElementsDictionary_autogen.cpp
@@ -90,3 +90,4 @@ std::string SkPdfBlockLevelStructureElementsDictionary::InlineAlign() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfBlockLevelStructureElementsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfBlockLevelStructureElementsDictionary_autogen.h
index 777911a64e..01f78fb199 100644
--- a/experimental/PdfViewer/autogen/SkPdfBlockLevelStructureElementsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfBlockLevelStructureElementsDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfBoolean_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfBoolean_autogen.cpp
index 14860e0e18..1528b04381 100644
--- a/experimental/PdfViewer/autogen/SkPdfBoolean_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfBoolean_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfBoolean_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfBoolean_autogen.h b/experimental/PdfViewer/autogen/SkPdfBoolean_autogen.h
index 1a0ba84f0d..e0b57e4352 100644
--- a/experimental/PdfViewer/autogen/SkPdfBoolean_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfBoolean_autogen.h
@@ -69,6 +69,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -168,9 +171,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfBorderStyleDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfBorderStyleDictionary_autogen.cpp
index 482287d234..f26588a3e1 100644
--- a/experimental/PdfViewer/autogen/SkPdfBorderStyleDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfBorderStyleDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfBorderStyleDictionary::D() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfBorderStyleDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfBorderStyleDictionary_autogen.h
index e4d66b93f4..eb15785a7b 100644
--- a/experimental/PdfViewer/autogen/SkPdfBorderStyleDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfBorderStyleDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfBoxColorInformationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfBoxColorInformationDictionary_autogen.cpp
index 063b6fab11..7ce6524e7c 100644
--- a/experimental/PdfViewer/autogen/SkPdfBoxColorInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfBoxColorInformationDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfDictionary* SkPdfBoxColorInformationDictionary::ArtBox() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfBoxColorInformationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfBoxColorInformationDictionary_autogen.h
index bd28198ed3..20219141ee 100644
--- a/experimental/PdfViewer/autogen/SkPdfBoxColorInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfBoxColorInformationDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfBoxStyleDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfBoxStyleDictionary_autogen.cpp
index 9f29d0f798..d2dccef576 100644
--- a/experimental/PdfViewer/autogen/SkPdfBoxStyleDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfBoxStyleDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfBoxStyleDictionary::D() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfBoxStyleDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfBoxStyleDictionary_autogen.h
index 92d2b5abcd..04310d5937 100644
--- a/experimental/PdfViewer/autogen/SkPdfBoxStyleDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfBoxStyleDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfCIDFontDescriptorDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfCIDFontDescriptorDictionary_autogen.cpp
index bb4c5b86c7..56ece282f0 100644
--- a/experimental/PdfViewer/autogen/SkPdfCIDFontDescriptorDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfCIDFontDescriptorDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfStream* SkPdfCIDFontDescriptorDictionary::CIDSet() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfCIDFontDescriptorDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfCIDFontDescriptorDictionary_autogen.h
index f544eaaaf6..70218d9b2c 100644
--- a/experimental/PdfViewer/autogen/SkPdfCIDFontDescriptorDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfCIDFontDescriptorDictionary_autogen.h
@@ -61,6 +61,9 @@ private:
   virtual SkPdfBoxStyleDictionary* asBoxStyleDictionary() {return NULL;}
   virtual const SkPdfBoxStyleDictionary* asBoxStyleDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfCIDFontDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfCIDFontDictionary_autogen.cpp
index 1f7d27a01d..2c5d9f975d 100644
--- a/experimental/PdfViewer/autogen/SkPdfCIDFontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfCIDFontDictionary_autogen.cpp
@@ -28,9 +28,9 @@ SkPdfDictionary* SkPdfCIDFontDictionary::CIDSystemInfo() const {
   return NULL;
 }
 
-SkPdfDictionary* SkPdfCIDFontDictionary::FontDescriptor() const {
-  SkPdfDictionary* ret;
-  if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontDescriptor", "", &ret)) return ret;
+SkPdfFontDescriptorDictionary* SkPdfCIDFontDictionary::FontDescriptor() const {
+  SkPdfFontDescriptorDictionary* ret;
+  if (FontDescriptorDictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontDescriptor", "", &ret)) return ret;
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
@@ -76,3 +76,4 @@ std::string SkPdfCIDFontDictionary::getCIDToGIDMapAsName() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfCIDFontDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfCIDFontDictionary_autogen.h
index 1ebc2ee493..88996a8f4b 100644
--- a/experimental/PdfViewer/autogen/SkPdfCIDFontDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfCIDFontDictionary_autogen.h
@@ -4,10 +4,10 @@
 #include "SkPdfUtils.h"
 #include "SkPdfEnums_autogen.h"
 #include "SkPdfArray_autogen.h"
-#include "SkPdfFontDictionary_autogen.h"
+#include "SkPdfDictionary_autogen.h"
 
 // Entries in a CIDFont dictionary
-class SkPdfCIDFontDictionary : public SkPdfFontDictionary {
+class SkPdfCIDFontDictionary : public SkPdfDictionary {
 public:
   virtual SkPdfObjectType getType() const { return kCIDFontDictionary_SkPdfObjectType;}
   virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCIDFontDictionary_SkPdfObjectType + 1);}
@@ -16,6 +16,153 @@ public:
   virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return this;}
 
 private:
+  virtual SkPdfALinkAnnotationDictionary* asALinkAnnotationDictionary() {return NULL;}
+  virtual const SkPdfALinkAnnotationDictionary* asALinkAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfActionDictionary* asActionDictionary() {return NULL;}
+  virtual const SkPdfActionDictionary* asActionDictionary() const {return NULL;}
+
+  virtual SkPdfAlternateImageDictionary* asAlternateImageDictionary() {return NULL;}
+  virtual const SkPdfAlternateImageDictionary* asAlternateImageDictionary() const {return NULL;}
+
+  virtual SkPdfAnnotationActionsDictionary* asAnnotationActionsDictionary() {return NULL;}
+  virtual const SkPdfAnnotationActionsDictionary* asAnnotationActionsDictionary() const {return NULL;}
+
+  virtual SkPdfAnnotationDictionary* asAnnotationDictionary() {return NULL;}
+  virtual const SkPdfAnnotationDictionary* asAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfAppearanceCharacteristicsDictionary* asAppearanceCharacteristicsDictionary() {return NULL;}
+  virtual const SkPdfAppearanceCharacteristicsDictionary* asAppearanceCharacteristicsDictionary() const {return NULL;}
+
+  virtual SkPdfAppearanceDictionary* asAppearanceDictionary() {return NULL;}
+  virtual const SkPdfAppearanceDictionary* asAppearanceDictionary() const {return NULL;}
+
+  virtual SkPdfApplicationDataDictionary* asApplicationDataDictionary() {return NULL;}
+  virtual const SkPdfApplicationDataDictionary* asApplicationDataDictionary() const {return NULL;}
+
+  virtual SkPdfArtifactsDictionary* asArtifactsDictionary() {return NULL;}
+  virtual const SkPdfArtifactsDictionary* asArtifactsDictionary() const {return NULL;}
+
+  virtual SkPdfAttributeObjectDictionary* asAttributeObjectDictionary() {return NULL;}
+  virtual const SkPdfAttributeObjectDictionary* asAttributeObjectDictionary() const {return NULL;}
+
+  virtual SkPdfBeadDictionary* asBeadDictionary() {return NULL;}
+  virtual const SkPdfBeadDictionary* asBeadDictionary() const {return NULL;}
+
+  virtual SkPdfBlockLevelStructureElementsDictionary* asBlockLevelStructureElementsDictionary() {return NULL;}
+  virtual const SkPdfBlockLevelStructureElementsDictionary* asBlockLevelStructureElementsDictionary() const {return NULL;}
+
+  virtual SkPdfBorderStyleDictionary* asBorderStyleDictionary() {return NULL;}
+  virtual const SkPdfBorderStyleDictionary* asBorderStyleDictionary() const {return NULL;}
+
+  virtual SkPdfBoxColorInformationDictionary* asBoxColorInformationDictionary() {return NULL;}
+  virtual const SkPdfBoxColorInformationDictionary* asBoxColorInformationDictionary() const {return NULL;}
+
+  virtual SkPdfBoxStyleDictionary* asBoxStyleDictionary() {return NULL;}
+  virtual const SkPdfBoxStyleDictionary* asBoxStyleDictionary() const {return NULL;}
+
+  virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
+
+  virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
+  virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
+
+  virtual SkPdfCMapDictionary* asCMapDictionary() {return NULL;}
+  virtual const SkPdfCMapDictionary* asCMapDictionary() const {return NULL;}
+
+  virtual SkPdfCalgrayColorSpaceDictionary* asCalgrayColorSpaceDictionary() {return NULL;}
+  virtual const SkPdfCalgrayColorSpaceDictionary* asCalgrayColorSpaceDictionary() const {return NULL;}
+
+  virtual SkPdfCalrgbColorSpaceDictionary* asCalrgbColorSpaceDictionary() {return NULL;}
+  virtual const SkPdfCalrgbColorSpaceDictionary* asCalrgbColorSpaceDictionary() const {return NULL;}
+
+  virtual SkPdfCatalogDictionary* asCatalogDictionary() {return NULL;}
+  virtual const SkPdfCatalogDictionary* asCatalogDictionary() const {return NULL;}
+
+  virtual SkPdfCcittfaxdecodeFilterDictionary* asCcittfaxdecodeFilterDictionary() {return NULL;}
+  virtual const SkPdfCcittfaxdecodeFilterDictionary* asCcittfaxdecodeFilterDictionary() const {return NULL;}
+
+  virtual SkPdfCheckboxFieldDictionary* asCheckboxFieldDictionary() {return NULL;}
+  virtual const SkPdfCheckboxFieldDictionary* asCheckboxFieldDictionary() const {return NULL;}
+
+  virtual SkPdfChoiceFieldDictionary* asChoiceFieldDictionary() {return NULL;}
+  virtual const SkPdfChoiceFieldDictionary* asChoiceFieldDictionary() const {return NULL;}
+
+  virtual SkPdfComponentsWithMetadataDictionary* asComponentsWithMetadataDictionary() {return NULL;}
+  virtual const SkPdfComponentsWithMetadataDictionary* asComponentsWithMetadataDictionary() const {return NULL;}
+
+  virtual SkPdfDctdecodeFilterDictionary* asDctdecodeFilterDictionary() {return NULL;}
+  virtual const SkPdfDctdecodeFilterDictionary* asDctdecodeFilterDictionary() const {return NULL;}
+
+  virtual SkPdfDeviceNColorSpaceDictionary* asDeviceNColorSpaceDictionary() {return NULL;}
+  virtual const SkPdfDeviceNColorSpaceDictionary* asDeviceNColorSpaceDictionary() const {return NULL;}
+
+  virtual SkPdfDocumentCatalogActionsDictionary* asDocumentCatalogActionsDictionary() {return NULL;}
+  virtual const SkPdfDocumentCatalogActionsDictionary* asDocumentCatalogActionsDictionary() const {return NULL;}
+
+  virtual SkPdfDocumentInformationDictionary* asDocumentInformationDictionary() {return NULL;}
+  virtual const SkPdfDocumentInformationDictionary* asDocumentInformationDictionary() const {return NULL;}
+
+  virtual SkPdfEmbeddedFileParameterDictionary* asEmbeddedFileParameterDictionary() {return NULL;}
+  virtual const SkPdfEmbeddedFileParameterDictionary* asEmbeddedFileParameterDictionary() const {return NULL;}
+
+  virtual SkPdfEmbeddedFileStreamDictionary* asEmbeddedFileStreamDictionary() {return NULL;}
+  virtual const SkPdfEmbeddedFileStreamDictionary* asEmbeddedFileStreamDictionary() const {return NULL;}
+
+  virtual SkPdfEmbeddedFontStreamDictionary* asEmbeddedFontStreamDictionary() {return NULL;}
+  virtual const SkPdfEmbeddedFontStreamDictionary* asEmbeddedFontStreamDictionary() const {return NULL;}
+
+  virtual SkPdfEncodingDictionary* asEncodingDictionary() {return NULL;}
+  virtual const SkPdfEncodingDictionary* asEncodingDictionary() const {return NULL;}
+
+  virtual SkPdfEncryptedEmbeddedFileStreamDictionary* asEncryptedEmbeddedFileStreamDictionary() {return NULL;}
+  virtual const SkPdfEncryptedEmbeddedFileStreamDictionary* asEncryptedEmbeddedFileStreamDictionary() const {return NULL;}
+
+  virtual SkPdfEncryptionCommonDictionary* asEncryptionCommonDictionary() {return NULL;}
+  virtual const SkPdfEncryptionCommonDictionary* asEncryptionCommonDictionary() const {return NULL;}
+
+  virtual SkPdfFDFCatalogDictionary* asFDFCatalogDictionary() {return NULL;}
+  virtual const SkPdfFDFCatalogDictionary* asFDFCatalogDictionary() const {return NULL;}
+
+  virtual SkPdfFDFDictionary* asFDFDictionary() {return NULL;}
+  virtual const SkPdfFDFDictionary* asFDFDictionary() const {return NULL;}
+
+  virtual SkPdfFDFFieldDictionary* asFDFFieldDictionary() {return NULL;}
+  virtual const SkPdfFDFFieldDictionary* asFDFFieldDictionary() const {return NULL;}
+
+  virtual SkPdfFDFFileAnnotationDictionary* asFDFFileAnnotationDictionary() {return NULL;}
+  virtual const SkPdfFDFFileAnnotationDictionary* asFDFFileAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfFDFNamedPageReferenceDictionary* asFDFNamedPageReferenceDictionary() {return NULL;}
+  virtual const SkPdfFDFNamedPageReferenceDictionary* asFDFNamedPageReferenceDictionary() const {return NULL;}
+
+  virtual SkPdfFDFPageDictionary* asFDFPageDictionary() {return NULL;}
+  virtual const SkPdfFDFPageDictionary* asFDFPageDictionary() const {return NULL;}
+
+  virtual SkPdfFDFTemplateDictionary* asFDFTemplateDictionary() {return NULL;}
+  virtual const SkPdfFDFTemplateDictionary* asFDFTemplateDictionary() const {return NULL;}
+
+  virtual SkPdfFDFTrailerDictionary* asFDFTrailerDictionary() {return NULL;}
+  virtual const SkPdfFDFTrailerDictionary* asFDFTrailerDictionary() const {return NULL;}
+
+  virtual SkPdfFieldDictionary* asFieldDictionary() {return NULL;}
+  virtual const SkPdfFieldDictionary* asFieldDictionary() const {return NULL;}
+
+  virtual SkPdfFileAttachmentAnnotationDictionary* asFileAttachmentAnnotationDictionary() {return NULL;}
+  virtual const SkPdfFileAttachmentAnnotationDictionary* asFileAttachmentAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfFileSpecificationDictionary* asFileSpecificationDictionary() {return NULL;}
+  virtual const SkPdfFileSpecificationDictionary* asFileSpecificationDictionary() const {return NULL;}
+
+  virtual SkPdfFileTrailerDictionary* asFileTrailerDictionary() {return NULL;}
+  virtual const SkPdfFileTrailerDictionary* asFileTrailerDictionary() const {return NULL;}
+
+  virtual SkPdfFontDescriptorDictionary* asFontDescriptorDictionary() {return NULL;}
+  virtual const SkPdfFontDescriptorDictionary* asFontDescriptorDictionary() const {return NULL;}
+
+  virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
+  virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
+
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
@@ -31,12 +178,348 @@ private:
   virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;}
   virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;}
 
+  virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;}
+  virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;}
+
+  virtual SkPdfFreeTextAnnotationDictionary* asFreeTextAnnotationDictionary() {return NULL;}
+  virtual const SkPdfFreeTextAnnotationDictionary* asFreeTextAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfFunctionCommonDictionary* asFunctionCommonDictionary() {return NULL;}
+  virtual const SkPdfFunctionCommonDictionary* asFunctionCommonDictionary() const {return NULL;}
+
+  virtual SkPdfGoToActionDictionary* asGoToActionDictionary() {return NULL;}
+  virtual const SkPdfGoToActionDictionary* asGoToActionDictionary() const {return NULL;}
+
+  virtual SkPdfGraphicsStateDictionary* asGraphicsStateDictionary() {return NULL;}
+  virtual const SkPdfGraphicsStateDictionary* asGraphicsStateDictionary() const {return NULL;}
+
+  virtual SkPdfGroupAttributesDictionary* asGroupAttributesDictionary() {return NULL;}
+  virtual const SkPdfGroupAttributesDictionary* asGroupAttributesDictionary() const {return NULL;}
+
+  virtual SkPdfHideActionDictionary* asHideActionDictionary() {return NULL;}
+  virtual const SkPdfHideActionDictionary* asHideActionDictionary() const {return NULL;}
+
+  virtual SkPdfIccProfileStreamDictionary* asIccProfileStreamDictionary() {return NULL;}
+  virtual const SkPdfIccProfileStreamDictionary* asIccProfileStreamDictionary() const {return NULL;}
+
+  virtual SkPdfIconFitDictionary* asIconFitDictionary() {return NULL;}
+  virtual const SkPdfIconFitDictionary* asIconFitDictionary() const {return NULL;}
+
+  virtual SkPdfImportDataActionDictionary* asImportDataActionDictionary() {return NULL;}
+  virtual const SkPdfImportDataActionDictionary* asImportDataActionDictionary() const {return NULL;}
+
+  virtual SkPdfInkAnnotationDictionary* asInkAnnotationDictionary() {return NULL;}
+  virtual const SkPdfInkAnnotationDictionary* asInkAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfInlineLevelStructureElementsDictionary* asInlineLevelStructureElementsDictionary() {return NULL;}
+  virtual const SkPdfInlineLevelStructureElementsDictionary* asInlineLevelStructureElementsDictionary() const {return NULL;}
+
+  virtual SkPdfInteractiveFormDictionary* asInteractiveFormDictionary() {return NULL;}
+  virtual const SkPdfInteractiveFormDictionary* asInteractiveFormDictionary() const {return NULL;}
+
+  virtual SkPdfJavascriptActionDictionary* asJavascriptActionDictionary() {return NULL;}
+  virtual const SkPdfJavascriptActionDictionary* asJavascriptActionDictionary() const {return NULL;}
+
+  virtual SkPdfJavascriptDictionary* asJavascriptDictionary() {return NULL;}
+  virtual const SkPdfJavascriptDictionary* asJavascriptDictionary() const {return NULL;}
+
+  virtual SkPdfJbig2DecodeFilterDictionary* asJbig2DecodeFilterDictionary() {return NULL;}
+  virtual const SkPdfJbig2DecodeFilterDictionary* asJbig2DecodeFilterDictionary() const {return NULL;}
+
+  virtual SkPdfLabColorSpaceDictionary* asLabColorSpaceDictionary() {return NULL;}
+  virtual const SkPdfLabColorSpaceDictionary* asLabColorSpaceDictionary() const {return NULL;}
+
+  virtual SkPdfLaunchActionDictionary* asLaunchActionDictionary() {return NULL;}
+  virtual const SkPdfLaunchActionDictionary* asLaunchActionDictionary() const {return NULL;}
+
+  virtual SkPdfLineAnnotationDictionary* asLineAnnotationDictionary() {return NULL;}
+  virtual const SkPdfLineAnnotationDictionary* asLineAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfListAttributeDictionary* asListAttributeDictionary() {return NULL;}
+  virtual const SkPdfListAttributeDictionary* asListAttributeDictionary() const {return NULL;}
+
+  virtual SkPdfLzwdecodeAndFlatedecodeFiltersDictionary* asLzwdecodeAndFlatedecodeFiltersDictionary() {return NULL;}
+  virtual const SkPdfLzwdecodeAndFlatedecodeFiltersDictionary* asLzwdecodeAndFlatedecodeFiltersDictionary() const {return NULL;}
+
+  virtual SkPdfMacOsFileInformationDictionary* asMacOsFileInformationDictionary() {return NULL;}
+  virtual const SkPdfMacOsFileInformationDictionary* asMacOsFileInformationDictionary() const {return NULL;}
+
+  virtual SkPdfMarkInformationDictionary* asMarkInformationDictionary() {return NULL;}
+  virtual const SkPdfMarkInformationDictionary* asMarkInformationDictionary() const {return NULL;}
+
+  virtual SkPdfMarkedContentReferenceDictionary* asMarkedContentReferenceDictionary() {return NULL;}
+  virtual const SkPdfMarkedContentReferenceDictionary* asMarkedContentReferenceDictionary() const {return NULL;}
+
+  virtual SkPdfMarkupAnnotationsDictionary* asMarkupAnnotationsDictionary() {return NULL;}
+  virtual const SkPdfMarkupAnnotationsDictionary* asMarkupAnnotationsDictionary() const {return NULL;}
+
+  virtual SkPdfMetadataStreamDictionary* asMetadataStreamDictionary() {return NULL;}
+  virtual const SkPdfMetadataStreamDictionary* asMetadataStreamDictionary() const {return NULL;}
+
+  virtual SkPdfMovieActionDictionary* asMovieActionDictionary() {return NULL;}
+  virtual const SkPdfMovieActionDictionary* asMovieActionDictionary() const {return NULL;}
+
+  virtual SkPdfMovieActivationDictionary* asMovieActivationDictionary() {return NULL;}
+  virtual const SkPdfMovieActivationDictionary* asMovieActivationDictionary() const {return NULL;}
+
+  virtual SkPdfMovieAnnotationDictionary* asMovieAnnotationDictionary() {return NULL;}
+  virtual const SkPdfMovieAnnotationDictionary* asMovieAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfMovieDictionary* asMovieDictionary() {return NULL;}
+  virtual const SkPdfMovieDictionary* asMovieDictionary() const {return NULL;}
+
+  virtual SkPdfNameDictionary* asNameDictionary() {return NULL;}
+  virtual const SkPdfNameDictionary* asNameDictionary() const {return NULL;}
+
+  virtual SkPdfNameTreeNodeDictionary* asNameTreeNodeDictionary() {return NULL;}
+  virtual const SkPdfNameTreeNodeDictionary* asNameTreeNodeDictionary() const {return NULL;}
+
+  virtual SkPdfNamedActionsDictionary* asNamedActionsDictionary() {return NULL;}
+  virtual const SkPdfNamedActionsDictionary* asNamedActionsDictionary() const {return NULL;}
+
+  virtual SkPdfNumberTreeNodeDictionary* asNumberTreeNodeDictionary() {return NULL;}
+  virtual const SkPdfNumberTreeNodeDictionary* asNumberTreeNodeDictionary() const {return NULL;}
+
+  virtual SkPdfObjectReferenceDictionary* asObjectReferenceDictionary() {return NULL;}
+  virtual const SkPdfObjectReferenceDictionary* asObjectReferenceDictionary() const {return NULL;}
+
+  virtual SkPdfOpiVersionDictionary* asOpiVersionDictionary() {return NULL;}
+  virtual const SkPdfOpiVersionDictionary* asOpiVersionDictionary() const {return NULL;}
+
+  virtual SkPdfOutlineDictionary* asOutlineDictionary() {return NULL;}
+  virtual const SkPdfOutlineDictionary* asOutlineDictionary() const {return NULL;}
+
+  virtual SkPdfOutlineItemDictionary* asOutlineItemDictionary() {return NULL;}
+  virtual const SkPdfOutlineItemDictionary* asOutlineItemDictionary() const {return NULL;}
+
+  virtual SkPdfPDF_XOutputIntentDictionary* asPDF_XOutputIntentDictionary() {return NULL;}
+  virtual const SkPdfPDF_XOutputIntentDictionary* asPDF_XOutputIntentDictionary() const {return NULL;}
+
+  virtual SkPdfPSXobjectDictionary* asPSXobjectDictionary() {return NULL;}
+  virtual const SkPdfPSXobjectDictionary* asPSXobjectDictionary() const {return NULL;}
+
+  virtual SkPdfPageLabelDictionary* asPageLabelDictionary() {return NULL;}
+  virtual const SkPdfPageLabelDictionary* asPageLabelDictionary() const {return NULL;}
+
+  virtual SkPdfPageObjectActionsDictionary* asPageObjectActionsDictionary() {return NULL;}
+  virtual const SkPdfPageObjectActionsDictionary* asPageObjectActionsDictionary() const {return NULL;}
+
+  virtual SkPdfPageObjectDictionary* asPageObjectDictionary() {return NULL;}
+  virtual const SkPdfPageObjectDictionary* asPageObjectDictionary() const {return NULL;}
+
+  virtual SkPdfPagePieceDictionary* asPagePieceDictionary() {return NULL;}
+  virtual const SkPdfPagePieceDictionary* asPagePieceDictionary() const {return NULL;}
+
+  virtual SkPdfPageTreeNodeDictionary* asPageTreeNodeDictionary() {return NULL;}
+  virtual const SkPdfPageTreeNodeDictionary* asPageTreeNodeDictionary() const {return NULL;}
+
+  virtual SkPdfPopUpAnnotationDictionary* asPopUpAnnotationDictionary() {return NULL;}
+  virtual const SkPdfPopUpAnnotationDictionary* asPopUpAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfPrinterMarkAnnotationDictionary* asPrinterMarkAnnotationDictionary() {return NULL;}
+  virtual const SkPdfPrinterMarkAnnotationDictionary* asPrinterMarkAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfPrinterMarkFormDictionary* asPrinterMarkFormDictionary() {return NULL;}
+  virtual const SkPdfPrinterMarkFormDictionary* asPrinterMarkFormDictionary() const {return NULL;}
+
+  virtual SkPdfRadioButtonFieldDictionary* asRadioButtonFieldDictionary() {return NULL;}
+  virtual const SkPdfRadioButtonFieldDictionary* asRadioButtonFieldDictionary() const {return NULL;}
+
+  virtual SkPdfReferenceDictionary* asReferenceDictionary() {return NULL;}
+  virtual const SkPdfReferenceDictionary* asReferenceDictionary() const {return NULL;}
+
+  virtual SkPdfRemoteGoToActionDictionary* asRemoteGoToActionDictionary() {return NULL;}
+  virtual const SkPdfRemoteGoToActionDictionary* asRemoteGoToActionDictionary() const {return NULL;}
+
+  virtual SkPdfResetFormActionDictionary* asResetFormActionDictionary() {return NULL;}
+  virtual const SkPdfResetFormActionDictionary* asResetFormActionDictionary() const {return NULL;}
+
+  virtual SkPdfResourceDictionary* asResourceDictionary() {return NULL;}
+  virtual const SkPdfResourceDictionary* asResourceDictionary() const {return NULL;}
+
+  virtual SkPdfRubberStampAnnotationDictionary* asRubberStampAnnotationDictionary() {return NULL;}
+  virtual const SkPdfRubberStampAnnotationDictionary* asRubberStampAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfSeparationDictionary* asSeparationDictionary() {return NULL;}
+  virtual const SkPdfSeparationDictionary* asSeparationDictionary() const {return NULL;}
+
+  virtual SkPdfShadingDictionary* asShadingDictionary() {return NULL;}
+  virtual const SkPdfShadingDictionary* asShadingDictionary() const {return NULL;}
+
+  virtual SkPdfType1ShadingDictionary* asType1ShadingDictionary() {return NULL;}
+  virtual const SkPdfType1ShadingDictionary* asType1ShadingDictionary() const {return NULL;}
+
+  virtual SkPdfType2ShadingDictionary* asType2ShadingDictionary() {return NULL;}
+  virtual const SkPdfType2ShadingDictionary* asType2ShadingDictionary() const {return NULL;}
+
+  virtual SkPdfType3ShadingDictionary* asType3ShadingDictionary() {return NULL;}
+  virtual const SkPdfType3ShadingDictionary* asType3ShadingDictionary() const {return NULL;}
+
+  virtual SkPdfType4ShadingDictionary* asType4ShadingDictionary() {return NULL;}
+  virtual const SkPdfType4ShadingDictionary* asType4ShadingDictionary() const {return NULL;}
+
+  virtual SkPdfType5ShadingDictionary* asType5ShadingDictionary() {return NULL;}
+  virtual const SkPdfType5ShadingDictionary* asType5ShadingDictionary() const {return NULL;}
+
+  virtual SkPdfType6ShadingDictionary* asType6ShadingDictionary() {return NULL;}
+  virtual const SkPdfType6ShadingDictionary* asType6ShadingDictionary() const {return NULL;}
+
+  virtual SkPdfSignatureDictionary* asSignatureDictionary() {return NULL;}
+  virtual const SkPdfSignatureDictionary* asSignatureDictionary() const {return NULL;}
+
+  virtual SkPdfSoftMaskDictionary* asSoftMaskDictionary() {return NULL;}
+  virtual const SkPdfSoftMaskDictionary* asSoftMaskDictionary() const {return NULL;}
+
+  virtual SkPdfSoftMaskImageDictionary* asSoftMaskImageDictionary() {return NULL;}
+  virtual const SkPdfSoftMaskImageDictionary* asSoftMaskImageDictionary() const {return NULL;}
+
+  virtual SkPdfSoundActionDictionary* asSoundActionDictionary() {return NULL;}
+  virtual const SkPdfSoundActionDictionary* asSoundActionDictionary() const {return NULL;}
+
+  virtual SkPdfSoundAnnotationDictionary* asSoundAnnotationDictionary() {return NULL;}
+  virtual const SkPdfSoundAnnotationDictionary* asSoundAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfSoundObjectDictionary* asSoundObjectDictionary() {return NULL;}
+  virtual const SkPdfSoundObjectDictionary* asSoundObjectDictionary() const {return NULL;}
+
+  virtual SkPdfSourceInformationDictionary* asSourceInformationDictionary() {return NULL;}
+  virtual const SkPdfSourceInformationDictionary* asSourceInformationDictionary() const {return NULL;}
+
+  virtual SkPdfSquareOrCircleAnnotation* asSquareOrCircleAnnotation() {return NULL;}
+  virtual const SkPdfSquareOrCircleAnnotation* asSquareOrCircleAnnotation() const {return NULL;}
+
+  virtual SkPdfStandardSecurityHandlerDictionary* asStandardSecurityHandlerDictionary() {return NULL;}
+  virtual const SkPdfStandardSecurityHandlerDictionary* asStandardSecurityHandlerDictionary() const {return NULL;}
+
+  virtual SkPdfStandardStructureDictionary* asStandardStructureDictionary() {return NULL;}
+  virtual const SkPdfStandardStructureDictionary* asStandardStructureDictionary() const {return NULL;}
+
+  virtual SkPdfStreamCommonDictionary* asStreamCommonDictionary() {return NULL;}
+  virtual const SkPdfStreamCommonDictionary* asStreamCommonDictionary() const {return NULL;}
+
+  virtual SkPdfStructureElementAccessDictionary* asStructureElementAccessDictionary() {return NULL;}
+  virtual const SkPdfStructureElementAccessDictionary* asStructureElementAccessDictionary() const {return NULL;}
+
+  virtual SkPdfStructureElementDictionary* asStructureElementDictionary() {return NULL;}
+  virtual const SkPdfStructureElementDictionary* asStructureElementDictionary() const {return NULL;}
+
+  virtual SkPdfStructureTreeRootDictionary* asStructureTreeRootDictionary() {return NULL;}
+  virtual const SkPdfStructureTreeRootDictionary* asStructureTreeRootDictionary() const {return NULL;}
+
+  virtual SkPdfSubmitFormActionDictionary* asSubmitFormActionDictionary() {return NULL;}
+  virtual const SkPdfSubmitFormActionDictionary* asSubmitFormActionDictionary() const {return NULL;}
+
+  virtual SkPdfTableAttributesDictionary* asTableAttributesDictionary() {return NULL;}
+  virtual const SkPdfTableAttributesDictionary* asTableAttributesDictionary() const {return NULL;}
+
+  virtual SkPdfTextAnnotationDictionary* asTextAnnotationDictionary() {return NULL;}
+  virtual const SkPdfTextAnnotationDictionary* asTextAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfTextFieldDictionary* asTextFieldDictionary() {return NULL;}
+  virtual const SkPdfTextFieldDictionary* asTextFieldDictionary() const {return NULL;}
+
+  virtual SkPdfThreadActionDictionary* asThreadActionDictionary() {return NULL;}
+  virtual const SkPdfThreadActionDictionary* asThreadActionDictionary() const {return NULL;}
+
+  virtual SkPdfThreadDictionary* asThreadDictionary() {return NULL;}
+  virtual const SkPdfThreadDictionary* asThreadDictionary() const {return NULL;}
+
+  virtual SkPdfTransitionDictionary* asTransitionDictionary() {return NULL;}
+  virtual const SkPdfTransitionDictionary* asTransitionDictionary() const {return NULL;}
+
+  virtual SkPdfTransparencyGroupDictionary* asTransparencyGroupDictionary() {return NULL;}
+  virtual const SkPdfTransparencyGroupDictionary* asTransparencyGroupDictionary() const {return NULL;}
+
+  virtual SkPdfTrapNetworkAnnotationDictionary* asTrapNetworkAnnotationDictionary() {return NULL;}
+  virtual const SkPdfTrapNetworkAnnotationDictionary* asTrapNetworkAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfTrapNetworkAppearanceStreamDictionary* asTrapNetworkAppearanceStreamDictionary() {return NULL;}
+  virtual const SkPdfTrapNetworkAppearanceStreamDictionary* asTrapNetworkAppearanceStreamDictionary() const {return NULL;}
+
+  virtual SkPdfType0FunctionDictionary* asType0FunctionDictionary() {return NULL;}
+  virtual const SkPdfType0FunctionDictionary* asType0FunctionDictionary() const {return NULL;}
+
+  virtual SkPdfType10HalftoneDictionary* asType10HalftoneDictionary() {return NULL;}
+  virtual const SkPdfType10HalftoneDictionary* asType10HalftoneDictionary() const {return NULL;}
+
+  virtual SkPdfType16HalftoneDictionary* asType16HalftoneDictionary() {return NULL;}
+  virtual const SkPdfType16HalftoneDictionary* asType16HalftoneDictionary() const {return NULL;}
+
+  virtual SkPdfType1HalftoneDictionary* asType1HalftoneDictionary() {return NULL;}
+  virtual const SkPdfType1HalftoneDictionary* asType1HalftoneDictionary() const {return NULL;}
+
+  virtual SkPdfType1PatternDictionary* asType1PatternDictionary() {return NULL;}
+  virtual const SkPdfType1PatternDictionary* asType1PatternDictionary() const {return NULL;}
+
+  virtual SkPdfType2FunctionDictionary* asType2FunctionDictionary() {return NULL;}
+  virtual const SkPdfType2FunctionDictionary* asType2FunctionDictionary() const {return NULL;}
+
+  virtual SkPdfType2PatternDictionary* asType2PatternDictionary() {return NULL;}
+  virtual const SkPdfType2PatternDictionary* asType2PatternDictionary() const {return NULL;}
+
+  virtual SkPdfType3FunctionDictionary* asType3FunctionDictionary() {return NULL;}
+  virtual const SkPdfType3FunctionDictionary* asType3FunctionDictionary() const {return NULL;}
+
+  virtual SkPdfType5HalftoneDictionary* asType5HalftoneDictionary() {return NULL;}
+  virtual const SkPdfType5HalftoneDictionary* asType5HalftoneDictionary() const {return NULL;}
+
+  virtual SkPdfType6HalftoneDictionary* asType6HalftoneDictionary() {return NULL;}
+  virtual const SkPdfType6HalftoneDictionary* asType6HalftoneDictionary() const {return NULL;}
+
+  virtual SkPdfURIActionDictionary* asURIActionDictionary() {return NULL;}
+  virtual const SkPdfURIActionDictionary* asURIActionDictionary() const {return NULL;}
+
+  virtual SkPdfURIDictionary* asURIDictionary() {return NULL;}
+  virtual const SkPdfURIDictionary* asURIDictionary() const {return NULL;}
+
+  virtual SkPdfURLAliasDictionary* asURLAliasDictionary() {return NULL;}
+  virtual const SkPdfURLAliasDictionary* asURLAliasDictionary() const {return NULL;}
+
+  virtual SkPdfVariableTextFieldDictionary* asVariableTextFieldDictionary() {return NULL;}
+  virtual const SkPdfVariableTextFieldDictionary* asVariableTextFieldDictionary() const {return NULL;}
+
+  virtual SkPdfViewerPreferencesDictionary* asViewerPreferencesDictionary() {return NULL;}
+  virtual const SkPdfViewerPreferencesDictionary* asViewerPreferencesDictionary() const {return NULL;}
+
+  virtual SkPdfWebCaptureCommandDictionary* asWebCaptureCommandDictionary() {return NULL;}
+  virtual const SkPdfWebCaptureCommandDictionary* asWebCaptureCommandDictionary() const {return NULL;}
+
+  virtual SkPdfWebCaptureCommandSettingsDictionary* asWebCaptureCommandSettingsDictionary() {return NULL;}
+  virtual const SkPdfWebCaptureCommandSettingsDictionary* asWebCaptureCommandSettingsDictionary() const {return NULL;}
+
+  virtual SkPdfWebCaptureDictionary* asWebCaptureDictionary() {return NULL;}
+  virtual const SkPdfWebCaptureDictionary* asWebCaptureDictionary() const {return NULL;}
+
+  virtual SkPdfWebCaptureImageSetDictionary* asWebCaptureImageSetDictionary() {return NULL;}
+  virtual const SkPdfWebCaptureImageSetDictionary* asWebCaptureImageSetDictionary() const {return NULL;}
+
+  virtual SkPdfWebCaptureInformationDictionary* asWebCaptureInformationDictionary() {return NULL;}
+  virtual const SkPdfWebCaptureInformationDictionary* asWebCaptureInformationDictionary() const {return NULL;}
+
+  virtual SkPdfWebCapturePageSetDictionary* asWebCapturePageSetDictionary() {return NULL;}
+  virtual const SkPdfWebCapturePageSetDictionary* asWebCapturePageSetDictionary() const {return NULL;}
+
+  virtual SkPdfWidgetAnnotationDictionary* asWidgetAnnotationDictionary() {return NULL;}
+  virtual const SkPdfWidgetAnnotationDictionary* asWidgetAnnotationDictionary() const {return NULL;}
+
+  virtual SkPdfWindowsLaunchActionDictionary* asWindowsLaunchActionDictionary() {return NULL;}
+  virtual const SkPdfWindowsLaunchActionDictionary* asWindowsLaunchActionDictionary() const {return NULL;}
+
+  virtual SkPdfXObjectDictionary* asXObjectDictionary() {return NULL;}
+  virtual const SkPdfXObjectDictionary* asXObjectDictionary() const {return NULL;}
+
+  virtual SkPdfImageDictionary* asImageDictionary() {return NULL;}
+  virtual const SkPdfImageDictionary* asImageDictionary() const {return NULL;}
+
+  virtual SkPdfType1FormDictionary* asType1FormDictionary() {return NULL;}
+  virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return NULL;}
+
 public:
 private:
 public:
-  SkPdfCIDFontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfFontDictionary(podofoDoc, podofoObj) {}
+  SkPdfCIDFontDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfDictionary(podofoDoc, podofoObj) {}
 
-  SkPdfCIDFontDictionary(const SkPdfCIDFontDictionary& from) : SkPdfFontDictionary(from.fPodofoDoc, from.fPodofoObj) {}
+  SkPdfCIDFontDictionary(const SkPdfCIDFontDictionary& from) : SkPdfDictionary(from.fPodofoDoc, from.fPodofoObj) {}
 
   virtual bool valid() const {return true;}
 
@@ -84,7 +567,7 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontDescriptor", "", NULL));
   }
 
-  SkPdfDictionary* FontDescriptor() const;
+  SkPdfFontDescriptorDictionary* FontDescriptor() const;
 /** (Optional) The default width for glyphs in the CIDFont (see "Glyph Met-
  *  rics in CIDFonts" on page 340). Default value: 1000.
 **/
diff --git a/experimental/PdfViewer/autogen/SkPdfCIDSystemInfoDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfCIDSystemInfoDictionary_autogen.cpp
index 08d696e671..37223f18d3 100644
--- a/experimental/PdfViewer/autogen/SkPdfCIDSystemInfoDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfCIDSystemInfoDictionary_autogen.cpp
@@ -20,3 +20,4 @@ long SkPdfCIDSystemInfoDictionary::Supplement() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfCIDSystemInfoDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfCIDSystemInfoDictionary_autogen.h
index 9dfcb72191..67b93bd9e3 100644
--- a/experimental/PdfViewer/autogen/SkPdfCIDSystemInfoDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfCIDSystemInfoDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCMapDictionary* asCMapDictionary() {return NULL;}
   virtual const SkPdfCMapDictionary* asCMapDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfCMapDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfCMapDictionary_autogen.cpp
index 2b9723684e..203dca4058 100644
--- a/experimental/PdfViewer/autogen/SkPdfCMapDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfCMapDictionary_autogen.cpp
@@ -48,3 +48,4 @@ SkPdfStream* SkPdfCMapDictionary::getUseCMapAsStream() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfCMapDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfCMapDictionary_autogen.h
index 4f4538b1c1..eb8746084e 100644
--- a/experimental/PdfViewer/autogen/SkPdfCMapDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfCMapDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfCalgrayColorSpaceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfCalgrayColorSpaceDictionary_autogen.cpp
index 62525c2a7f..72e9cc7a8c 100644
--- a/experimental/PdfViewer/autogen/SkPdfCalgrayColorSpaceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfCalgrayColorSpaceDictionary_autogen.cpp
@@ -20,3 +20,4 @@ double SkPdfCalgrayColorSpaceDictionary::Gamma() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfCalgrayColorSpaceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfCalgrayColorSpaceDictionary_autogen.h
index 635ba2ec51..667d662691 100644
--- a/experimental/PdfViewer/autogen/SkPdfCalgrayColorSpaceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfCalgrayColorSpaceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfCalrgbColorSpaceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfCalrgbColorSpaceDictionary_autogen.cpp
index 9e8ba7945c..f2faeafc1a 100644
--- a/experimental/PdfViewer/autogen/SkPdfCalrgbColorSpaceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfCalrgbColorSpaceDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfCalrgbColorSpaceDictionary::Matrix() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfCalrgbColorSpaceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfCalrgbColorSpaceDictionary_autogen.h
index 500fad62c0..f1bef9cd2a 100644
--- a/experimental/PdfViewer/autogen/SkPdfCalrgbColorSpaceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfCalrgbColorSpaceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.cpp
index df497d9186..bbe7861065 100644
--- a/experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.cpp
@@ -160,3 +160,4 @@ SkPdfArray* SkPdfCatalogDictionary::OutputIntents() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.h
index f98e413ccd..2dbb086236 100644
--- a/experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfCcittfaxdecodeFilterDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfCcittfaxdecodeFilterDictionary_autogen.cpp
index b347c74a2c..a7da6c69e0 100644
--- a/experimental/PdfViewer/autogen/SkPdfCcittfaxdecodeFilterDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfCcittfaxdecodeFilterDictionary_autogen.cpp
@@ -55,3 +55,4 @@ long SkPdfCcittfaxdecodeFilterDictionary::DamagedRowsBeforeError() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfCcittfaxdecodeFilterDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfCcittfaxdecodeFilterDictionary_autogen.h
index a59447679c..54bbece469 100644
--- a/experimental/PdfViewer/autogen/SkPdfCcittfaxdecodeFilterDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfCcittfaxdecodeFilterDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfCheckboxFieldDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfCheckboxFieldDictionary_autogen.cpp
index d5f0567ea1..947fdf494c 100644
--- a/experimental/PdfViewer/autogen/SkPdfCheckboxFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfCheckboxFieldDictionary_autogen.cpp
@@ -6,3 +6,4 @@ std::string SkPdfCheckboxFieldDictionary::Opt() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfCheckboxFieldDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfCheckboxFieldDictionary_autogen.h
index 1509c97259..97a1cdc181 100644
--- a/experimental/PdfViewer/autogen/SkPdfCheckboxFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfCheckboxFieldDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfChoiceFieldDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfChoiceFieldDictionary_autogen.cpp
index 02a9a285af..39ba54c2ea 100644
--- a/experimental/PdfViewer/autogen/SkPdfChoiceFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfChoiceFieldDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfChoiceFieldDictionary::I() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfChoiceFieldDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfChoiceFieldDictionary_autogen.h
index 17d74bad4b..a2293c30f0 100644
--- a/experimental/PdfViewer/autogen/SkPdfChoiceFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfChoiceFieldDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfComponentsWithMetadataDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfComponentsWithMetadataDictionary_autogen.cpp
index 2d2e02cdd8..80b5cf3887 100644
--- a/experimental/PdfViewer/autogen/SkPdfComponentsWithMetadataDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfComponentsWithMetadataDictionary_autogen.cpp
@@ -6,3 +6,4 @@ SkPdfStream* SkPdfComponentsWithMetadataDictionary::Metadata() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfComponentsWithMetadataDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfComponentsWithMetadataDictionary_autogen.h
index 7d77ce760b..7d4dfcd5ef 100644
--- a/experimental/PdfViewer/autogen/SkPdfComponentsWithMetadataDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfComponentsWithMetadataDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfDctdecodeFilterDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfDctdecodeFilterDictionary_autogen.cpp
index d96121029e..66ff159527 100644
--- a/experimental/PdfViewer/autogen/SkPdfDctdecodeFilterDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfDctdecodeFilterDictionary_autogen.cpp
@@ -6,3 +6,4 @@ long SkPdfDctdecodeFilterDictionary::ColorTransform() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfDctdecodeFilterDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfDctdecodeFilterDictionary_autogen.h
index 71f1a83c11..2bb6136653 100644
--- a/experimental/PdfViewer/autogen/SkPdfDctdecodeFilterDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfDctdecodeFilterDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfDeviceNColorSpaceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfDeviceNColorSpaceDictionary_autogen.cpp
index f116c152c9..c41bc24d55 100644
--- a/experimental/PdfViewer/autogen/SkPdfDeviceNColorSpaceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfDeviceNColorSpaceDictionary_autogen.cpp
@@ -6,3 +6,4 @@ SkPdfDictionary* SkPdfDeviceNColorSpaceDictionary::Colorants() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfDeviceNColorSpaceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfDeviceNColorSpaceDictionary_autogen.h
index b1bd765b47..65259c7c33 100644
--- a/experimental/PdfViewer/autogen/SkPdfDeviceNColorSpaceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfDeviceNColorSpaceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfDictionary_autogen.cpp
index a4e325616f..ca5650795d 100644
--- a/experimental/PdfViewer/autogen/SkPdfDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfDictionary_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfDictionary_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfDocumentCatalogActionsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfDocumentCatalogActionsDictionary_autogen.cpp
index 07955b295f..78df9e3baa 100644
--- a/experimental/PdfViewer/autogen/SkPdfDocumentCatalogActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfDocumentCatalogActionsDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfDictionary* SkPdfDocumentCatalogActionsDictionary::DP() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfDocumentCatalogActionsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfDocumentCatalogActionsDictionary_autogen.h
index 201792fe99..7ac182e578 100644
--- a/experimental/PdfViewer/autogen/SkPdfDocumentCatalogActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfDocumentCatalogActionsDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfDocumentInformationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfDocumentInformationDictionary_autogen.cpp
index 6ee2c33c5d..1b0cb1c75e 100644
--- a/experimental/PdfViewer/autogen/SkPdfDocumentInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfDocumentInformationDictionary_autogen.cpp
@@ -62,3 +62,4 @@ std::string SkPdfDocumentInformationDictionary::Trapped() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfDocumentInformationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfDocumentInformationDictionary_autogen.h
index e4e80e06d4..fb0a712598 100644
--- a/experimental/PdfViewer/autogen/SkPdfDocumentInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfDocumentInformationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfEmbeddedFileParameterDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfEmbeddedFileParameterDictionary_autogen.cpp
index 452bf89275..86e0a2bfc0 100644
--- a/experimental/PdfViewer/autogen/SkPdfEmbeddedFileParameterDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfEmbeddedFileParameterDictionary_autogen.cpp
@@ -34,3 +34,4 @@ std::string SkPdfEmbeddedFileParameterDictionary::CheckSum() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfEmbeddedFileParameterDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfEmbeddedFileParameterDictionary_autogen.h
index 7248bfb5a1..00d60f8236 100644
--- a/experimental/PdfViewer/autogen/SkPdfEmbeddedFileParameterDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfEmbeddedFileParameterDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfEmbeddedFileStreamDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfEmbeddedFileStreamDictionary_autogen.cpp
index 59c1350eeb..1f3367fe3a 100644
--- a/experimental/PdfViewer/autogen/SkPdfEmbeddedFileStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfEmbeddedFileStreamDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfDictionary* SkPdfEmbeddedFileStreamDictionary::Params() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfEmbeddedFileStreamDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfEmbeddedFileStreamDictionary_autogen.h
index cd43e741b3..4053a07e53 100644
--- a/experimental/PdfViewer/autogen/SkPdfEmbeddedFileStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfEmbeddedFileStreamDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfEmbeddedFontStreamDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfEmbeddedFontStreamDictionary_autogen.cpp
index a849b195c5..8b01a5d9ef 100644
--- a/experimental/PdfViewer/autogen/SkPdfEmbeddedFontStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfEmbeddedFontStreamDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfStream* SkPdfEmbeddedFontStreamDictionary::Metadata() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfEmbeddedFontStreamDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfEmbeddedFontStreamDictionary_autogen.h
index 25e12d8545..31bdcccaeb 100644
--- a/experimental/PdfViewer/autogen/SkPdfEmbeddedFontStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfEmbeddedFontStreamDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfEncodingDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfEncodingDictionary_autogen.cpp
index cf90f7ca7e..c305d3b63c 100644
--- a/experimental/PdfViewer/autogen/SkPdfEncodingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfEncodingDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfEncodingDictionary::Differences() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfEncodingDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfEncodingDictionary_autogen.h
index 6ec291b743..c92cedd13a 100644
--- a/experimental/PdfViewer/autogen/SkPdfEncodingDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfEncodingDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.cpp
index ac88acee0c..3126cf0025 100644
--- a/experimental/PdfViewer/autogen/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.cpp
@@ -6,3 +6,4 @@ long SkPdfEncryptedEmbeddedFileStreamDictionary::EncryptionRevision() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h
index 2cad87b97b..3f44f8b526 100644
--- a/experimental/PdfViewer/autogen/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfEncryptionCommonDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfEncryptionCommonDictionary_autogen.cpp
index 548f91f7a1..a38f329f31 100644
--- a/experimental/PdfViewer/autogen/SkPdfEncryptionCommonDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfEncryptionCommonDictionary_autogen.cpp
@@ -20,3 +20,4 @@ long SkPdfEncryptionCommonDictionary::Length() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfEncryptionCommonDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfEncryptionCommonDictionary_autogen.h
index 4716986b5a..84a1dfd32f 100644
--- a/experimental/PdfViewer/autogen/SkPdfEncryptionCommonDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfEncryptionCommonDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfEnums_autogen.h b/experimental/PdfViewer/autogen/SkPdfEnums_autogen.h
index a4fcd3a506..3d6e6fa8e8 100644
--- a/experimental/PdfViewer/autogen/SkPdfEnums_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfEnums_autogen.h
@@ -22,6 +22,7 @@ enum SkPdfObjectType {
   kBoxColorInformationDictionary_SkPdfObjectType,
   kBoxStyleDictionary_SkPdfObjectType,
   kCIDFontDescriptorDictionary_SkPdfObjectType,
+  kCIDFontDictionary_SkPdfObjectType,
   kCIDSystemInfoDictionary_SkPdfObjectType,
   kCMapDictionary_SkPdfObjectType,
   kCalgrayColorSpaceDictionary_SkPdfObjectType,
@@ -55,7 +56,6 @@ enum SkPdfObjectType {
   kFileTrailerDictionary_SkPdfObjectType,
   kFontDescriptorDictionary_SkPdfObjectType,
   kFontDictionary_SkPdfObjectType,
-  kCIDFontDictionary_SkPdfObjectType,
   kType0FontDictionary_SkPdfObjectType,
   kType1FontDictionary_SkPdfObjectType,
   kMultiMasterFontDictionary_SkPdfObjectType,
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFCatalogDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFDFCatalogDictionary_autogen.cpp
index 35ae1d818a..e57079e30b 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFCatalogDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFDFCatalogDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfDictionary* SkPdfFDFCatalogDictionary::FDF() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFCatalogDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFDFCatalogDictionary_autogen.h
index 77f066f638..8476fc7dd0 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFCatalogDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFDFCatalogDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFDFDictionary_autogen.cpp
index d874ab8701..0f749e1da5 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFDFDictionary_autogen.cpp
@@ -76,3 +76,4 @@ SkPdfDictionary* SkPdfFDFDictionary::JavaScript() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFDFDictionary_autogen.h
index cd73ba969e..efbe0b9f26 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFDFDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFFieldDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFDFFieldDictionary_autogen.cpp
index 5ce89c04ac..a16545f9d9 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFDFFieldDictionary_autogen.cpp
@@ -104,3 +104,4 @@ SkPdfDictionary* SkPdfFDFFieldDictionary::AA() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFFieldDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFDFFieldDictionary_autogen.h
index bcdf0c5bf4..9372597576 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFDFFieldDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFFileAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFDFFileAnnotationDictionary_autogen.cpp
index 349f3dd4fd..f34d1d6256 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFFileAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFDFFileAnnotationDictionary_autogen.cpp
@@ -6,3 +6,4 @@ long SkPdfFDFFileAnnotationDictionary::Page() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFFileAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFDFFileAnnotationDictionary_autogen.h
index dab235e010..9a21216f31 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFFileAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFDFFileAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFNamedPageReferenceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFDFNamedPageReferenceDictionary_autogen.cpp
index 2e27caabec..9fdda2db0e 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFNamedPageReferenceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFDFNamedPageReferenceDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfFileSpec SkPdfFDFNamedPageReferenceDictionary::F() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return SkPdfFileSpec();
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFNamedPageReferenceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFDFNamedPageReferenceDictionary_autogen.h
index 6cdbe9397f..787689e709 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFNamedPageReferenceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFDFNamedPageReferenceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFPageDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFDFPageDictionary_autogen.cpp
index 181e5c6129..6e25ecbea8 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFPageDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFDFPageDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfDictionary* SkPdfFDFPageDictionary::Info() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFPageDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFDFPageDictionary_autogen.h
index 32d17196b7..0d36efb713 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFPageDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFDFPageDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFTemplateDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFDFTemplateDictionary_autogen.cpp
index 7b51c59237..9aa27b7e50 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFTemplateDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFDFTemplateDictionary_autogen.cpp
@@ -20,3 +20,4 @@ bool SkPdfFDFTemplateDictionary::Rename() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFTemplateDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFDFTemplateDictionary_autogen.h
index 3123a93967..ecf036f973 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFTemplateDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFDFTemplateDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFTrailerDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFDFTrailerDictionary_autogen.cpp
index 417cb0fd7e..f376306b08 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFTrailerDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFDFTrailerDictionary_autogen.cpp
@@ -6,3 +6,4 @@ SkPdfDictionary* SkPdfFDFTrailerDictionary::Root() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFDFTrailerDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFDFTrailerDictionary_autogen.h
index ca381e0e74..20366d737c 100644
--- a/experimental/PdfViewer/autogen/SkPdfFDFTrailerDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFDFTrailerDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFieldDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFieldDictionary_autogen.cpp
index a010123aca..94f3a2148d 100644
--- a/experimental/PdfViewer/autogen/SkPdfFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFieldDictionary_autogen.cpp
@@ -69,3 +69,4 @@ SkPdfDictionary* SkPdfFieldDictionary::AA() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFieldDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFieldDictionary_autogen.h
index 8333eba726..3a24b584cf 100644
--- a/experimental/PdfViewer/autogen/SkPdfFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFieldDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFileAttachmentAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFileAttachmentAnnotationDictionary_autogen.cpp
index c05a8e627d..fed0cf6bf8 100644
--- a/experimental/PdfViewer/autogen/SkPdfFileAttachmentAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFileAttachmentAnnotationDictionary_autogen.cpp
@@ -27,3 +27,4 @@ std::string SkPdfFileAttachmentAnnotationDictionary::Name() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFileAttachmentAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFileAttachmentAnnotationDictionary_autogen.h
index 99b60af3b8..9d62b20a7f 100644
--- a/experimental/PdfViewer/autogen/SkPdfFileAttachmentAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFileAttachmentAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFileSpecificationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFileSpecificationDictionary_autogen.cpp
index 05824174a8..e87539ee5c 100644
--- a/experimental/PdfViewer/autogen/SkPdfFileSpecificationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFileSpecificationDictionary_autogen.cpp
@@ -69,3 +69,4 @@ SkPdfDictionary* SkPdfFileSpecificationDictionary::RF() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFileSpecificationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFileSpecificationDictionary_autogen.h
index 494b0d6176..3a8e770cc5 100644
--- a/experimental/PdfViewer/autogen/SkPdfFileSpecificationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFileSpecificationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFileTrailerDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFileTrailerDictionary_autogen.cpp
index 98d8290ebf..7b82356cd3 100644
--- a/experimental/PdfViewer/autogen/SkPdfFileTrailerDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFileTrailerDictionary_autogen.cpp
@@ -41,3 +41,4 @@ SkPdfArray* SkPdfFileTrailerDictionary::ID() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFileTrailerDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFileTrailerDictionary_autogen.h
index 2cec23157e..684958e993 100644
--- a/experimental/PdfViewer/autogen/SkPdfFileTrailerDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFileTrailerDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFontDescriptorDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFontDescriptorDictionary_autogen.cpp
index 5e0bee2329..58a2a47ec4 100644
--- a/experimental/PdfViewer/autogen/SkPdfFontDescriptorDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFontDescriptorDictionary_autogen.cpp
@@ -132,3 +132,4 @@ std::string SkPdfFontDescriptorDictionary::CharSet() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFontDescriptorDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFontDescriptorDictionary_autogen.h
index 724c8facb0..44ef45cf46 100644
--- a/experimental/PdfViewer/autogen/SkPdfFontDescriptorDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFontDescriptorDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -160,9 +163,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFontDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFontDictionary_autogen.cpp
index b48d33ea76..759cbf5d96 100644
--- a/experimental/PdfViewer/autogen/SkPdfFontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFontDictionary_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfFontDictionary_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFontDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFontDictionary_autogen.h
index 818fc9851f..493a44062e 100644
--- a/experimental/PdfViewer/autogen/SkPdfFontDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFontDictionary_autogen.h
@@ -63,6 +63,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFormFieldActionsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFormFieldActionsDictionary_autogen.cpp
index b4f1f20767..7a5eb41e4f 100644
--- a/experimental/PdfViewer/autogen/SkPdfFormFieldActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFormFieldActionsDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfDictionary* SkPdfFormFieldActionsDictionary::C() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFormFieldActionsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFormFieldActionsDictionary_autogen.h
index 0b7573f44b..c1abb33c48 100644
--- a/experimental/PdfViewer/autogen/SkPdfFormFieldActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFormFieldActionsDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFreeTextAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFreeTextAnnotationDictionary_autogen.cpp
index 10d446e2e2..0a1929fd81 100644
--- a/experimental/PdfViewer/autogen/SkPdfFreeTextAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFreeTextAnnotationDictionary_autogen.cpp
@@ -27,3 +27,4 @@ long SkPdfFreeTextAnnotationDictionary::Q() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFreeTextAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFreeTextAnnotationDictionary_autogen.h
index ebbf92e78a..ef8ec7a773 100644
--- a/experimental/PdfViewer/autogen/SkPdfFreeTextAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFreeTextAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfFunctionCommonDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfFunctionCommonDictionary_autogen.cpp
index 201258f7d9..ac63bae38e 100644
--- a/experimental/PdfViewer/autogen/SkPdfFunctionCommonDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfFunctionCommonDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfFunctionCommonDictionary::Range() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfFunctionCommonDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfFunctionCommonDictionary_autogen.h
index f308a0c51b..1e592a0244 100644
--- a/experimental/PdfViewer/autogen/SkPdfFunctionCommonDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfFunctionCommonDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfGoToActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfGoToActionDictionary_autogen.cpp
index 58ea2cdfb6..2b3fbc3bd0 100644
--- a/experimental/PdfViewer/autogen/SkPdfGoToActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfGoToActionDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfGoToActionDictionary::getDAsArray() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfGoToActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfGoToActionDictionary_autogen.h
index 3f40dc3b0d..059604c3e8 100644
--- a/experimental/PdfViewer/autogen/SkPdfGoToActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfGoToActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfGraphicsStateDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfGraphicsStateDictionary_autogen.cpp
index be09a4171c..440588c09e 100644
--- a/experimental/PdfViewer/autogen/SkPdfGraphicsStateDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfGraphicsStateDictionary_autogen.cpp
@@ -258,3 +258,4 @@ bool SkPdfGraphicsStateDictionary::TK() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfGraphicsStateDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfGraphicsStateDictionary_autogen.h
index 63947dfe6f..eebc99b694 100644
--- a/experimental/PdfViewer/autogen/SkPdfGraphicsStateDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfGraphicsStateDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfGroupAttributesDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfGroupAttributesDictionary_autogen.cpp
index 750f985bbb..17d0354c48 100644
--- a/experimental/PdfViewer/autogen/SkPdfGroupAttributesDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfGroupAttributesDictionary_autogen.cpp
@@ -13,3 +13,4 @@ std::string SkPdfGroupAttributesDictionary::S() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfGroupAttributesDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfGroupAttributesDictionary_autogen.h
index e6305077a0..83df744f64 100644
--- a/experimental/PdfViewer/autogen/SkPdfGroupAttributesDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfGroupAttributesDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfHexString_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfHexString_autogen.cpp
index b709eff940..18d112d6b3 100644
--- a/experimental/PdfViewer/autogen/SkPdfHexString_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfHexString_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfHexString_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfHideActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfHideActionDictionary_autogen.cpp
index cb95ec8166..8c80d7a5f2 100644
--- a/experimental/PdfViewer/autogen/SkPdfHideActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfHideActionDictionary_autogen.cpp
@@ -34,3 +34,4 @@ bool SkPdfHideActionDictionary::H() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfHideActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfHideActionDictionary_autogen.h
index 125f3394ce..b5e5b4c3a7 100644
--- a/experimental/PdfViewer/autogen/SkPdfHideActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfHideActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfIccProfileStreamDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfIccProfileStreamDictionary_autogen.cpp
index 45e83af60c..4bffd7334f 100644
--- a/experimental/PdfViewer/autogen/SkPdfIccProfileStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfIccProfileStreamDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfStream* SkPdfIccProfileStreamDictionary::Metadata() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfIccProfileStreamDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfIccProfileStreamDictionary_autogen.h
index e163528454..192bfd21e0 100644
--- a/experimental/PdfViewer/autogen/SkPdfIccProfileStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfIccProfileStreamDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfIconFitDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfIconFitDictionary_autogen.cpp
index 71b6ca3a40..d271706ad5 100644
--- a/experimental/PdfViewer/autogen/SkPdfIconFitDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfIconFitDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfIconFitDictionary::A() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfIconFitDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfIconFitDictionary_autogen.h
index b9b49cb5fd..7c882faca5 100644
--- a/experimental/PdfViewer/autogen/SkPdfIconFitDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfIconFitDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfImageDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfImageDictionary_autogen.cpp
index 2a083a73a8..a2c5eef070 100644
--- a/experimental/PdfViewer/autogen/SkPdfImageDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfImageDictionary_autogen.cpp
@@ -139,3 +139,4 @@ SkPdfStream* SkPdfImageDictionary::Metadata() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfImportDataActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfImportDataActionDictionary_autogen.cpp
index 2a7a8605e6..0b1d026a1d 100644
--- a/experimental/PdfViewer/autogen/SkPdfImportDataActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfImportDataActionDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfFileSpec SkPdfImportDataActionDictionary::F() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return SkPdfFileSpec();
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfImportDataActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfImportDataActionDictionary_autogen.h
index 8c51cd2850..23649a93b4 100644
--- a/experimental/PdfViewer/autogen/SkPdfImportDataActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfImportDataActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfInkAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfInkAnnotationDictionary_autogen.cpp
index a8d97098fe..351d9ccd23 100644
--- a/experimental/PdfViewer/autogen/SkPdfInkAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfInkAnnotationDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfDictionary* SkPdfInkAnnotationDictionary::BS() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfInkAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfInkAnnotationDictionary_autogen.h
index 943846bf43..467576af87 100644
--- a/experimental/PdfViewer/autogen/SkPdfInkAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfInkAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfInlineLevelStructureElementsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfInlineLevelStructureElementsDictionary_autogen.cpp
index 6c43b4c365..495d7224aa 100644
--- a/experimental/PdfViewer/autogen/SkPdfInlineLevelStructureElementsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfInlineLevelStructureElementsDictionary_autogen.cpp
@@ -13,3 +13,4 @@ std::string SkPdfInlineLevelStructureElementsDictionary::getLineHeightAsName() c
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfInlineLevelStructureElementsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfInlineLevelStructureElementsDictionary_autogen.h
index 1fad1742f5..b6832a6516 100644
--- a/experimental/PdfViewer/autogen/SkPdfInlineLevelStructureElementsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfInlineLevelStructureElementsDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfInteger_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfInteger_autogen.cpp
index 059c69d948..a95fd0d30a 100644
--- a/experimental/PdfViewer/autogen/SkPdfInteger_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfInteger_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfInteger_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfInteger_autogen.h b/experimental/PdfViewer/autogen/SkPdfInteger_autogen.h
index 3717140c8e..7e410798d9 100644
--- a/experimental/PdfViewer/autogen/SkPdfInteger_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfInteger_autogen.h
@@ -72,6 +72,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -171,9 +174,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfInteractiveFormDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfInteractiveFormDictionary_autogen.cpp
index f7b04e002a..301c91d2a5 100644
--- a/experimental/PdfViewer/autogen/SkPdfInteractiveFormDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfInteractiveFormDictionary_autogen.cpp
@@ -48,3 +48,4 @@ long SkPdfInteractiveFormDictionary::Q() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfInteractiveFormDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfInteractiveFormDictionary_autogen.h
index 8720dceb80..f73b6640cc 100644
--- a/experimental/PdfViewer/autogen/SkPdfInteractiveFormDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfInteractiveFormDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfJavascriptActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfJavascriptActionDictionary_autogen.cpp
index 7e70b7efee..c31145f247 100644
--- a/experimental/PdfViewer/autogen/SkPdfJavascriptActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfJavascriptActionDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfStream* SkPdfJavascriptActionDictionary::getJSAsStream() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfJavascriptActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfJavascriptActionDictionary_autogen.h
index fa3a1aee9f..e0456b4a4d 100644
--- a/experimental/PdfViewer/autogen/SkPdfJavascriptActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfJavascriptActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfJavascriptDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfJavascriptDictionary_autogen.cpp
index 23be8bdb4c..8204e69df9 100644
--- a/experimental/PdfViewer/autogen/SkPdfJavascriptDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfJavascriptDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfArray* SkPdfJavascriptDictionary::Doc() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfJavascriptDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfJavascriptDictionary_autogen.h
index 42f3ba574a..3962e417ac 100644
--- a/experimental/PdfViewer/autogen/SkPdfJavascriptDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfJavascriptDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfJbig2DecodeFilterDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfJbig2DecodeFilterDictionary_autogen.cpp
index 8cd1eb8f8e..d86a9cfc9b 100644
--- a/experimental/PdfViewer/autogen/SkPdfJbig2DecodeFilterDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfJbig2DecodeFilterDictionary_autogen.cpp
@@ -6,3 +6,4 @@ SkPdfStream* SkPdfJbig2DecodeFilterDictionary::JBIG2Globals() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfJbig2DecodeFilterDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfJbig2DecodeFilterDictionary_autogen.h
index ecb6fc70f3..625bca2176 100644
--- a/experimental/PdfViewer/autogen/SkPdfJbig2DecodeFilterDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfJbig2DecodeFilterDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfLabColorSpaceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfLabColorSpaceDictionary_autogen.cpp
index 1c4b8ba616..ddc3a1905f 100644
--- a/experimental/PdfViewer/autogen/SkPdfLabColorSpaceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfLabColorSpaceDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfLabColorSpaceDictionary::Range() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfLabColorSpaceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfLabColorSpaceDictionary_autogen.h
index bc8dd7e585..5c29ebc380 100644
--- a/experimental/PdfViewer/autogen/SkPdfLabColorSpaceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfLabColorSpaceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfLaunchActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfLaunchActionDictionary_autogen.cpp
index 9dffe02eee..b643d15274 100644
--- a/experimental/PdfViewer/autogen/SkPdfLaunchActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfLaunchActionDictionary_autogen.cpp
@@ -41,3 +41,4 @@ bool SkPdfLaunchActionDictionary::NewWindow() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfLaunchActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfLaunchActionDictionary_autogen.h
index f3bc768834..4aba61a90e 100644
--- a/experimental/PdfViewer/autogen/SkPdfLaunchActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfLaunchActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfLineAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfLineAnnotationDictionary_autogen.cpp
index 79a32c45e5..d5c040a804 100644
--- a/experimental/PdfViewer/autogen/SkPdfLineAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfLineAnnotationDictionary_autogen.cpp
@@ -41,3 +41,4 @@ SkPdfArray* SkPdfLineAnnotationDictionary::IC() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfLineAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfLineAnnotationDictionary_autogen.h
index 0a0716be62..96a47529d3 100644
--- a/experimental/PdfViewer/autogen/SkPdfLineAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfLineAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfListAttributeDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfListAttributeDictionary_autogen.cpp
index 88e61373e5..8d6b29e138 100644
--- a/experimental/PdfViewer/autogen/SkPdfListAttributeDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfListAttributeDictionary_autogen.cpp
@@ -6,3 +6,4 @@ std::string SkPdfListAttributeDictionary::ListNumbering() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfListAttributeDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfListAttributeDictionary_autogen.h
index 7463e3b81a..3180daf0e8 100644
--- a/experimental/PdfViewer/autogen/SkPdfListAttributeDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfListAttributeDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.cpp
index 3fae8b1205..8b3541df96 100644
--- a/experimental/PdfViewer/autogen/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.cpp
@@ -34,3 +34,4 @@ long SkPdfLzwdecodeAndFlatedecodeFiltersDictionary::EarlyChange() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h
index 08f8e00f91..8182165a09 100644
--- a/experimental/PdfViewer/autogen/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMacOsFileInformationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMacOsFileInformationDictionary_autogen.cpp
index e8d283689b..d43e0e7b4b 100644
--- a/experimental/PdfViewer/autogen/SkPdfMacOsFileInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMacOsFileInformationDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfStream* SkPdfMacOsFileInformationDictionary::ResFork() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfMacOsFileInformationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfMacOsFileInformationDictionary_autogen.h
index f6b2eaab02..654429dad7 100644
--- a/experimental/PdfViewer/autogen/SkPdfMacOsFileInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfMacOsFileInformationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMarkInformationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMarkInformationDictionary_autogen.cpp
index 332f94cc9f..2a5c8ec33f 100644
--- a/experimental/PdfViewer/autogen/SkPdfMarkInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMarkInformationDictionary_autogen.cpp
@@ -6,3 +6,4 @@ bool SkPdfMarkInformationDictionary::Marked() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfMarkInformationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfMarkInformationDictionary_autogen.h
index 3a3a2b9b91..bbe18aa610 100644
--- a/experimental/PdfViewer/autogen/SkPdfMarkInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfMarkInformationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMarkedContentReferenceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMarkedContentReferenceDictionary_autogen.cpp
index f0c24bf3a7..0b8cf8a48e 100644
--- a/experimental/PdfViewer/autogen/SkPdfMarkedContentReferenceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMarkedContentReferenceDictionary_autogen.cpp
@@ -34,3 +34,4 @@ long SkPdfMarkedContentReferenceDictionary::MCID() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfMarkedContentReferenceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfMarkedContentReferenceDictionary_autogen.h
index 1e3522bf73..7b21ec4f8b 100644
--- a/experimental/PdfViewer/autogen/SkPdfMarkedContentReferenceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfMarkedContentReferenceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMarkupAnnotationsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMarkupAnnotationsDictionary_autogen.cpp
index 7ac0b3537e..440c92a5b8 100644
--- a/experimental/PdfViewer/autogen/SkPdfMarkupAnnotationsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMarkupAnnotationsDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfMarkupAnnotationsDictionary::QuadPoints() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfMarkupAnnotationsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfMarkupAnnotationsDictionary_autogen.h
index 747ac240d4..2831f52145 100644
--- a/experimental/PdfViewer/autogen/SkPdfMarkupAnnotationsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfMarkupAnnotationsDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMetadataStreamDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMetadataStreamDictionary_autogen.cpp
index cc68bc1dd6..6ce1677e33 100644
--- a/experimental/PdfViewer/autogen/SkPdfMetadataStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMetadataStreamDictionary_autogen.cpp
@@ -13,3 +13,4 @@ std::string SkPdfMetadataStreamDictionary::Subtype() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfMetadataStreamDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfMetadataStreamDictionary_autogen.h
index 2724d10644..6d83c535f6 100644
--- a/experimental/PdfViewer/autogen/SkPdfMetadataStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfMetadataStreamDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMovieActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMovieActionDictionary_autogen.cpp
index e8067ff5e6..9211e45038 100644
--- a/experimental/PdfViewer/autogen/SkPdfMovieActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMovieActionDictionary_autogen.cpp
@@ -27,3 +27,4 @@ std::string SkPdfMovieActionDictionary::Operation() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfMovieActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfMovieActionDictionary_autogen.h
index 41348bcdc2..5e5df5d606 100644
--- a/experimental/PdfViewer/autogen/SkPdfMovieActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfMovieActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMovieActivationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMovieActivationDictionary_autogen.cpp
index 305ef732d9..1d327a5537 100644
--- a/experimental/PdfViewer/autogen/SkPdfMovieActivationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMovieActivationDictionary_autogen.cpp
@@ -62,3 +62,4 @@ SkPdfArray* SkPdfMovieActivationDictionary::FWPosition() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfMovieActivationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfMovieActivationDictionary_autogen.h
index b3702db070..37ee564825 100644
--- a/experimental/PdfViewer/autogen/SkPdfMovieActivationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfMovieActivationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMovieAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMovieAnnotationDictionary_autogen.cpp
index d8ff5b8d07..d2e375e8b1 100644
--- a/experimental/PdfViewer/autogen/SkPdfMovieAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMovieAnnotationDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfDictionary* SkPdfMovieAnnotationDictionary::getAAsDictionary() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfMovieAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfMovieAnnotationDictionary_autogen.h
index 5f0218e2f1..5908de418e 100644
--- a/experimental/PdfViewer/autogen/SkPdfMovieAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfMovieAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMovieDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMovieDictionary_autogen.cpp
index e2d748bb21..8f3ba01e48 100644
--- a/experimental/PdfViewer/autogen/SkPdfMovieDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMovieDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfStream* SkPdfMovieDictionary::getPosterAsStream() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfMovieDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfMovieDictionary_autogen.h
index 2fe0d5b825..7e99a5d13e 100644
--- a/experimental/PdfViewer/autogen/SkPdfMovieDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfMovieDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfMultiMasterFontDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfMultiMasterFontDictionary_autogen.cpp
index d386d90729..7cc1b8f3ab 100644
--- a/experimental/PdfViewer/autogen/SkPdfMultiMasterFontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfMultiMasterFontDictionary_autogen.cpp
@@ -6,3 +6,4 @@ std::string SkPdfMultiMasterFontDictionary::Subtype() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfNameDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfNameDictionary_autogen.cpp
index 107257f1f8..8cbdd456fd 100644
--- a/experimental/PdfViewer/autogen/SkPdfNameDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfNameDictionary_autogen.cpp
@@ -111,3 +111,4 @@ SkPdfTree* SkPdfNameDictionary::getEmbeddedFilesAsTree() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfNameDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfNameDictionary_autogen.h
index 45afd1ffbb..e8becf3f2c 100644
--- a/experimental/PdfViewer/autogen/SkPdfNameDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfNameDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfNameTreeNodeDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfNameTreeNodeDictionary_autogen.cpp
index f59338e9f5..e67744005c 100644
--- a/experimental/PdfViewer/autogen/SkPdfNameTreeNodeDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfNameTreeNodeDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfNameTreeNodeDictionary::Limits() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfNameTreeNodeDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfNameTreeNodeDictionary_autogen.h
index e92e29326a..6f3ffcfd86 100644
--- a/experimental/PdfViewer/autogen/SkPdfNameTreeNodeDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfNameTreeNodeDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfName_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfName_autogen.cpp
index ebed12dc74..d986d32aa6 100644
--- a/experimental/PdfViewer/autogen/SkPdfName_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfName_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfName_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfName_autogen.h b/experimental/PdfViewer/autogen/SkPdfName_autogen.h
index e3be4a0fba..9bf67618f4 100644
--- a/experimental/PdfViewer/autogen/SkPdfName_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfName_autogen.h
@@ -72,6 +72,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -171,9 +174,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfNamedActionsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfNamedActionsDictionary_autogen.cpp
index b091c68928..b2b83f00de 100644
--- a/experimental/PdfViewer/autogen/SkPdfNamedActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfNamedActionsDictionary_autogen.cpp
@@ -13,3 +13,4 @@ std::string SkPdfNamedActionsDictionary::N() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfNamedActionsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfNamedActionsDictionary_autogen.h
index 2f18b397f2..50ca85f250 100644
--- a/experimental/PdfViewer/autogen/SkPdfNamedActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfNamedActionsDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfNull_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfNull_autogen.cpp
index 2a5aad3963..1e65ded97b 100644
--- a/experimental/PdfViewer/autogen/SkPdfNull_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfNull_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfNull_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfNull_autogen.h b/experimental/PdfViewer/autogen/SkPdfNull_autogen.h
index 9b54eeeaf8..374c1091cc 100644
--- a/experimental/PdfViewer/autogen/SkPdfNull_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfNull_autogen.h
@@ -72,6 +72,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -171,9 +174,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfNumberTreeNodeDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfNumberTreeNodeDictionary_autogen.cpp
index e876b5be80..002b2bf9fe 100644
--- a/experimental/PdfViewer/autogen/SkPdfNumberTreeNodeDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfNumberTreeNodeDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfNumberTreeNodeDictionary::Limits() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfNumberTreeNodeDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfNumberTreeNodeDictionary_autogen.h
index 596744a4d0..ab4e1361da 100644
--- a/experimental/PdfViewer/autogen/SkPdfNumberTreeNodeDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfNumberTreeNodeDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfNumber_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfNumber_autogen.cpp
index 6ae9cd55e6..f342fff6d9 100644
--- a/experimental/PdfViewer/autogen/SkPdfNumber_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfNumber_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfNumber_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfObjectReferenceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfObjectReferenceDictionary_autogen.cpp
index 412a62d83e..684aeba15b 100644
--- a/experimental/PdfViewer/autogen/SkPdfObjectReferenceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfObjectReferenceDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfObject* SkPdfObjectReferenceDictionary::Obj() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfObjectReferenceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfObjectReferenceDictionary_autogen.h
index ea4bc36e7c..f22a72b7a4 100644
--- a/experimental/PdfViewer/autogen/SkPdfObjectReferenceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfObjectReferenceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfObject_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfObject_autogen.cpp
index 8d59fcab63..f1eb09b8b8 100644
--- a/experimental/PdfViewer/autogen/SkPdfObject_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfObject_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfObject_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfObject_autogen.h b/experimental/PdfViewer/autogen/SkPdfObject_autogen.h
index 83cd5caa48..61ce1ac5dc 100644
--- a/experimental/PdfViewer/autogen/SkPdfObject_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfObject_autogen.h
@@ -70,6 +70,9 @@ public:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -169,9 +172,6 @@ public:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfOpiVersionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfOpiVersionDictionary_autogen.cpp
index 678be2c35e..d02be22a3a 100644
--- a/experimental/PdfViewer/autogen/SkPdfOpiVersionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfOpiVersionDictionary_autogen.cpp
@@ -6,3 +6,4 @@ SkPdfDictionary* SkPdfOpiVersionDictionary::version_number() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfOpiVersionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfOpiVersionDictionary_autogen.h
index 9318fab93d..89c5f951cc 100644
--- a/experimental/PdfViewer/autogen/SkPdfOpiVersionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfOpiVersionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfOutlineDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfOutlineDictionary_autogen.cpp
index 25c0bfcfc9..6869d9f393 100644
--- a/experimental/PdfViewer/autogen/SkPdfOutlineDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfOutlineDictionary_autogen.cpp
@@ -27,3 +27,4 @@ long SkPdfOutlineDictionary::Count() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfOutlineDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfOutlineDictionary_autogen.h
index f7163a1e6f..c63275be14 100644
--- a/experimental/PdfViewer/autogen/SkPdfOutlineDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfOutlineDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfOutlineItemDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfOutlineItemDictionary_autogen.cpp
index 9ea1ebf05b..05f5ef8958 100644
--- a/experimental/PdfViewer/autogen/SkPdfOutlineItemDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfOutlineItemDictionary_autogen.cpp
@@ -97,3 +97,4 @@ long SkPdfOutlineItemDictionary::F() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfOutlineItemDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfOutlineItemDictionary_autogen.h
index 7ca070ac24..bfbc1f44e1 100644
--- a/experimental/PdfViewer/autogen/SkPdfOutlineItemDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfOutlineItemDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPDF_XOutputIntentDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPDF_XOutputIntentDictionary_autogen.cpp
index b4d38211a6..1d7e0957a1 100644
--- a/experimental/PdfViewer/autogen/SkPdfPDF_XOutputIntentDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPDF_XOutputIntentDictionary_autogen.cpp
@@ -48,3 +48,4 @@ SkPdfStream* SkPdfPDF_XOutputIntentDictionary::DestOutputProfile() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPDF_XOutputIntentDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPDF_XOutputIntentDictionary_autogen.h
index 1d90217b46..588b2f0bbe 100644
--- a/experimental/PdfViewer/autogen/SkPdfPDF_XOutputIntentDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPDF_XOutputIntentDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPSXobjectDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPSXobjectDictionary_autogen.cpp
index 4c83734048..85b680233e 100644
--- a/experimental/PdfViewer/autogen/SkPdfPSXobjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPSXobjectDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfStream* SkPdfPSXobjectDictionary::Level1() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPSXobjectDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPSXobjectDictionary_autogen.h
index d091a0fa61..56adf52f55 100644
--- a/experimental/PdfViewer/autogen/SkPdfPSXobjectDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPSXobjectDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPageLabelDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPageLabelDictionary_autogen.cpp
index 2d9039c644..171b2b5090 100644
--- a/experimental/PdfViewer/autogen/SkPdfPageLabelDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPageLabelDictionary_autogen.cpp
@@ -27,3 +27,4 @@ long SkPdfPageLabelDictionary::St() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPageLabelDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPageLabelDictionary_autogen.h
index 09126615a0..48767f9d4e 100644
--- a/experimental/PdfViewer/autogen/SkPdfPageLabelDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPageLabelDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPageObjectActionsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPageObjectActionsDictionary_autogen.cpp
index 4021735ef7..e724a8397d 100644
--- a/experimental/PdfViewer/autogen/SkPdfPageObjectActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPageObjectActionsDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfDictionary* SkPdfPageObjectActionsDictionary::C() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPageObjectActionsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPageObjectActionsDictionary_autogen.h
index 84bb4f9ba2..583a1832c5 100644
--- a/experimental/PdfViewer/autogen/SkPdfPageObjectActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPageObjectActionsDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPageObjectDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPageObjectDictionary_autogen.cpp
index c206de92aa..573fb41fa1 100644
--- a/experimental/PdfViewer/autogen/SkPdfPageObjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPageObjectDictionary_autogen.cpp
@@ -181,3 +181,4 @@ SkPdfDictionary* SkPdfPageObjectDictionary::SeparationInfo() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPageObjectDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPageObjectDictionary_autogen.h
index 287f8c4e14..bda1886e5c 100644
--- a/experimental/PdfViewer/autogen/SkPdfPageObjectDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPageObjectDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPagePieceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPagePieceDictionary_autogen.h
index 2e6b8120d5..1fb52f790f 100644
--- a/experimental/PdfViewer/autogen/SkPdfPagePieceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPagePieceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPageTreeNodeDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPageTreeNodeDictionary_autogen.cpp
index a4202440c8..61035977a0 100644
--- a/experimental/PdfViewer/autogen/SkPdfPageTreeNodeDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPageTreeNodeDictionary_autogen.cpp
@@ -27,3 +27,4 @@ long SkPdfPageTreeNodeDictionary::Count() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPageTreeNodeDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPageTreeNodeDictionary_autogen.h
index 8d370ebbc3..5a27c4cdfc 100644
--- a/experimental/PdfViewer/autogen/SkPdfPageTreeNodeDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPageTreeNodeDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPodofoMapper_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPodofoMapper_autogen.cpp
index e89a63581d..cb8c8cdd75 100644
--- a/experimental/PdfViewer/autogen/SkPdfPodofoMapper_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPodofoMapper_autogen.cpp
@@ -153,6 +153,7 @@ bool mapDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj,
   if (mapBoxColorInformationDictionary(podofoDoc, podofoObj, (SkPdfBoxColorInformationDictionary**)out)) return true;
   if (mapBoxStyleDictionary(podofoDoc, podofoObj, (SkPdfBoxStyleDictionary**)out)) return true;
   if (mapCIDFontDescriptorDictionary(podofoDoc, podofoObj, (SkPdfCIDFontDescriptorDictionary**)out)) return true;
+  if (mapCIDFontDictionary(podofoDoc, podofoObj, (SkPdfCIDFontDictionary**)out)) return true;
   if (mapCIDSystemInfoDictionary(podofoDoc, podofoObj, (SkPdfCIDSystemInfoDictionary**)out)) return true;
   if (mapCMapDictionary(podofoDoc, podofoObj, (SkPdfCMapDictionary**)out)) return true;
   if (mapCalgrayColorSpaceDictionary(podofoDoc, podofoObj, (SkPdfCalgrayColorSpaceDictionary**)out)) return true;
@@ -328,7 +329,6 @@ bool mapFontDictionary(const SkPdfObject& in, SkPdfFontDictionary** out) {
 bool mapFontDictionary(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj, SkPdfFontDictionary** out) {
   if (!isFontDictionary(podofoDoc, podofoObj)) return false;
 
-  if (mapCIDFontDictionary(podofoDoc, podofoObj, (SkPdfCIDFontDictionary**)out)) return true;
   if (mapType0FontDictionary(podofoDoc, podofoObj, (SkPdfType0FontDictionary**)out)) return true;
   if (mapType1FontDictionary(podofoDoc, podofoObj, (SkPdfType1FontDictionary**)out)) return true;
 
@@ -5403,3 +5403,4 @@ bool MultiMasterFontDictionaryFromDictionary(const PdfMemDocument* pdfDoc, const
   if (abr == NULL || *abr == '\0') return false;
   return MultiMasterFontDictionaryFromDictionary(pdfDoc, dict, abr, data);
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPopUpAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPopUpAnnotationDictionary_autogen.cpp
index e5dacb3a43..35f68a0d58 100644
--- a/experimental/PdfViewer/autogen/SkPdfPopUpAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPopUpAnnotationDictionary_autogen.cpp
@@ -27,3 +27,4 @@ bool SkPdfPopUpAnnotationDictionary::Open() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPopUpAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPopUpAnnotationDictionary_autogen.h
index b3dc29351a..40793b6278 100644
--- a/experimental/PdfViewer/autogen/SkPdfPopUpAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPopUpAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPrinterMarkAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPrinterMarkAnnotationDictionary_autogen.cpp
index abf8ad4974..8607e1111f 100644
--- a/experimental/PdfViewer/autogen/SkPdfPrinterMarkAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPrinterMarkAnnotationDictionary_autogen.cpp
@@ -13,3 +13,4 @@ std::string SkPdfPrinterMarkAnnotationDictionary::MN() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPrinterMarkAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPrinterMarkAnnotationDictionary_autogen.h
index c6f8af3a3a..2614ea32af 100644
--- a/experimental/PdfViewer/autogen/SkPdfPrinterMarkAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPrinterMarkAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfPrinterMarkFormDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfPrinterMarkFormDictionary_autogen.cpp
index 688439e11e..3d7c3f669d 100644
--- a/experimental/PdfViewer/autogen/SkPdfPrinterMarkFormDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfPrinterMarkFormDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfDictionary* SkPdfPrinterMarkFormDictionary::Colorants() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfPrinterMarkFormDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfPrinterMarkFormDictionary_autogen.h
index 3c2124b5ed..fcc3341d2c 100644
--- a/experimental/PdfViewer/autogen/SkPdfPrinterMarkFormDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfPrinterMarkFormDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfRadioButtonFieldDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfRadioButtonFieldDictionary_autogen.cpp
index 289971128a..ac178fc356 100644
--- a/experimental/PdfViewer/autogen/SkPdfRadioButtonFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfRadioButtonFieldDictionary_autogen.cpp
@@ -6,3 +6,4 @@ SkPdfArray* SkPdfRadioButtonFieldDictionary::Opt() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfRadioButtonFieldDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfRadioButtonFieldDictionary_autogen.h
index 67fda2e7de..289c7ce88e 100644
--- a/experimental/PdfViewer/autogen/SkPdfRadioButtonFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfRadioButtonFieldDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfReferenceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfReferenceDictionary_autogen.cpp
index 64300512b3..e901c3e082 100644
--- a/experimental/PdfViewer/autogen/SkPdfReferenceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfReferenceDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfReferenceDictionary::ID() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfReferenceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfReferenceDictionary_autogen.h
index 3a0253c667..7062c29621 100644
--- a/experimental/PdfViewer/autogen/SkPdfReferenceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfReferenceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfReference_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfReference_autogen.cpp
index 550bb9b34c..f78ef63d7a 100644
--- a/experimental/PdfViewer/autogen/SkPdfReference_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfReference_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfReference_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfReference_autogen.h b/experimental/PdfViewer/autogen/SkPdfReference_autogen.h
index 01d38c8478..c953a6b550 100644
--- a/experimental/PdfViewer/autogen/SkPdfReference_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfReference_autogen.h
@@ -72,6 +72,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -171,9 +174,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfRemoteGoToActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfRemoteGoToActionDictionary_autogen.cpp
index 096dad02bf..b867053781 100644
--- a/experimental/PdfViewer/autogen/SkPdfRemoteGoToActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfRemoteGoToActionDictionary_autogen.cpp
@@ -41,3 +41,4 @@ bool SkPdfRemoteGoToActionDictionary::NewWindow() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfRemoteGoToActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfRemoteGoToActionDictionary_autogen.h
index 9ae32cacca..f3b69f542f 100644
--- a/experimental/PdfViewer/autogen/SkPdfRemoteGoToActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfRemoteGoToActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfResetFormActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfResetFormActionDictionary_autogen.cpp
index 27d1941d91..78a0eb46a8 100644
--- a/experimental/PdfViewer/autogen/SkPdfResetFormActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfResetFormActionDictionary_autogen.cpp
@@ -20,3 +20,4 @@ long SkPdfResetFormActionDictionary::Flags() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfResetFormActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfResetFormActionDictionary_autogen.h
index 206fa20f5c..df35047a10 100644
--- a/experimental/PdfViewer/autogen/SkPdfResetFormActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfResetFormActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfResourceDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfResourceDictionary_autogen.cpp
index 588568484f..5f4e0457e2 100644
--- a/experimental/PdfViewer/autogen/SkPdfResourceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfResourceDictionary_autogen.cpp
@@ -55,3 +55,4 @@ SkPdfDictionary* SkPdfResourceDictionary::Properties() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfResourceDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfResourceDictionary_autogen.h
index a339701539..8f4562be0f 100644
--- a/experimental/PdfViewer/autogen/SkPdfResourceDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfResourceDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfRubberStampAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfRubberStampAnnotationDictionary_autogen.cpp
index 6d3b11e687..6636d987a5 100644
--- a/experimental/PdfViewer/autogen/SkPdfRubberStampAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfRubberStampAnnotationDictionary_autogen.cpp
@@ -20,3 +20,4 @@ std::string SkPdfRubberStampAnnotationDictionary::Name() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfRubberStampAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfRubberStampAnnotationDictionary_autogen.h
index b810ebcdf9..ff598b6fc7 100644
--- a/experimental/PdfViewer/autogen/SkPdfRubberStampAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfRubberStampAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSeparationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSeparationDictionary_autogen.cpp
index c291fa7ac6..533e5d5931 100644
--- a/experimental/PdfViewer/autogen/SkPdfSeparationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSeparationDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfSeparationDictionary::ColorSpace() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSeparationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfSeparationDictionary_autogen.h
index d4a2c3e454..b295443c00 100644
--- a/experimental/PdfViewer/autogen/SkPdfSeparationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSeparationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfShadingDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfShadingDictionary_autogen.cpp
index 0659d49b0b..61b986ad5b 100644
--- a/experimental/PdfViewer/autogen/SkPdfShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfShadingDictionary_autogen.cpp
@@ -41,3 +41,4 @@ bool SkPdfShadingDictionary::AntiAlias() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfShadingDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfShadingDictionary_autogen.h
index 2009666258..4e95b5012e 100644
--- a/experimental/PdfViewer/autogen/SkPdfShadingDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfShadingDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSignatureDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSignatureDictionary_autogen.cpp
index 8c164a2b55..924cb9a0e9 100644
--- a/experimental/PdfViewer/autogen/SkPdfSignatureDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSignatureDictionary_autogen.cpp
@@ -62,3 +62,4 @@ std::string SkPdfSignatureDictionary::Reason() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSignatureDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfSignatureDictionary_autogen.h
index e365ef6204..9c23371553 100644
--- a/experimental/PdfViewer/autogen/SkPdfSignatureDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSignatureDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSoftMaskDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSoftMaskDictionary_autogen.cpp
index 64ab6acaa0..b6a7e48c05 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoftMaskDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSoftMaskDictionary_autogen.cpp
@@ -41,3 +41,4 @@ std::string SkPdfSoftMaskDictionary::getTRAsName() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSoftMaskDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfSoftMaskDictionary_autogen.h
index 735a359214..ecf584a6f3 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoftMaskDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSoftMaskDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSoftMaskImageDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSoftMaskImageDictionary_autogen.cpp
index d82cbb198e..c2fb208345 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoftMaskImageDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSoftMaskImageDictionary_autogen.cpp
@@ -6,3 +6,4 @@ SkPdfArray* SkPdfSoftMaskImageDictionary::Matte() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSoftMaskImageDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfSoftMaskImageDictionary_autogen.h
index 259a46b39a..8e64564ea8 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoftMaskImageDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSoftMaskImageDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSoundActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSoundActionDictionary_autogen.cpp
index 03ea8d004f..e98c8a0cb8 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoundActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSoundActionDictionary_autogen.cpp
@@ -41,3 +41,4 @@ bool SkPdfSoundActionDictionary::Mix() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSoundActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfSoundActionDictionary_autogen.h
index f300de4b47..fe35905191 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoundActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSoundActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSoundAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSoundAnnotationDictionary_autogen.cpp
index 44bfca7e90..f9ad2bc3f0 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoundAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSoundAnnotationDictionary_autogen.cpp
@@ -27,3 +27,4 @@ std::string SkPdfSoundAnnotationDictionary::Name() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSoundAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfSoundAnnotationDictionary_autogen.h
index 6e37c8790c..ee0e49e887 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoundAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSoundAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSoundObjectDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSoundObjectDictionary_autogen.cpp
index b3e3258dbe..f05bf2266e 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoundObjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSoundObjectDictionary_autogen.cpp
@@ -48,3 +48,4 @@ SkPdfObject* SkPdfSoundObjectDictionary::CP() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSoundObjectDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfSoundObjectDictionary_autogen.h
index 34a40b3154..c885dd0e17 100644
--- a/experimental/PdfViewer/autogen/SkPdfSoundObjectDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSoundObjectDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSourceInformationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSourceInformationDictionary_autogen.cpp
index 9188c14faa..6bf902e370 100644
--- a/experimental/PdfViewer/autogen/SkPdfSourceInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSourceInformationDictionary_autogen.cpp
@@ -41,3 +41,4 @@ SkPdfDictionary* SkPdfSourceInformationDictionary::C() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSourceInformationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfSourceInformationDictionary_autogen.h
index 83cfb9aaf4..39b2a9ef31 100644
--- a/experimental/PdfViewer/autogen/SkPdfSourceInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSourceInformationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSquareOrCircleAnnotation_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSquareOrCircleAnnotation_autogen.cpp
index 2d2f9037a8..cdf2f68044 100644
--- a/experimental/PdfViewer/autogen/SkPdfSquareOrCircleAnnotation_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSquareOrCircleAnnotation_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfSquareOrCircleAnnotation::IC() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSquareOrCircleAnnotation_autogen.h b/experimental/PdfViewer/autogen/SkPdfSquareOrCircleAnnotation_autogen.h
index ce9864f76c..59e3fe3ed8 100644
--- a/experimental/PdfViewer/autogen/SkPdfSquareOrCircleAnnotation_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSquareOrCircleAnnotation_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfStandardSecurityHandlerDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfStandardSecurityHandlerDictionary_autogen.cpp
index 6716ed84f6..d8adbcfe9a 100644
--- a/experimental/PdfViewer/autogen/SkPdfStandardSecurityHandlerDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfStandardSecurityHandlerDictionary_autogen.cpp
@@ -27,3 +27,4 @@ long SkPdfStandardSecurityHandlerDictionary::P() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfStandardSecurityHandlerDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfStandardSecurityHandlerDictionary_autogen.h
index 079580ca09..4900a8af54 100644
--- a/experimental/PdfViewer/autogen/SkPdfStandardSecurityHandlerDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfStandardSecurityHandlerDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfStandardStructureDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfStandardStructureDictionary_autogen.cpp
index 500748bf61..23829b5e23 100644
--- a/experimental/PdfViewer/autogen/SkPdfStandardStructureDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfStandardStructureDictionary_autogen.cpp
@@ -13,3 +13,4 @@ std::string SkPdfStandardStructureDictionary::WritingMode() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfStandardStructureDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfStandardStructureDictionary_autogen.h
index 281ff19867..b9e7568412 100644
--- a/experimental/PdfViewer/autogen/SkPdfStandardStructureDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfStandardStructureDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfStreamCommonDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfStreamCommonDictionary_autogen.cpp
index a3cc647f2a..5b4b8fb402 100644
--- a/experimental/PdfViewer/autogen/SkPdfStreamCommonDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfStreamCommonDictionary_autogen.cpp
@@ -69,3 +69,4 @@ SkPdfArray* SkPdfStreamCommonDictionary::getFDecodeParmsAsArray() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfStreamCommonDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfStreamCommonDictionary_autogen.h
index fddbb6f601..3339db8d31 100644
--- a/experimental/PdfViewer/autogen/SkPdfStreamCommonDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfStreamCommonDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfStream_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfStream_autogen.cpp
index f4b68b68ce..b1fdd270bb 100644
--- a/experimental/PdfViewer/autogen/SkPdfStream_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfStream_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfStream_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfStream_autogen.h b/experimental/PdfViewer/autogen/SkPdfStream_autogen.h
index 911db8ded2..0f50efb52e 100644
--- a/experimental/PdfViewer/autogen/SkPdfStream_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfStream_autogen.h
@@ -72,6 +72,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -171,9 +174,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfString_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfString_autogen.cpp
index 796d636700..a967633139 100644
--- a/experimental/PdfViewer/autogen/SkPdfString_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfString_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfString_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfString_autogen.h b/experimental/PdfViewer/autogen/SkPdfString_autogen.h
index e14199b232..9e6d2e3775 100644
--- a/experimental/PdfViewer/autogen/SkPdfString_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfString_autogen.h
@@ -72,6 +72,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -171,9 +174,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfStructureElementAccessDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfStructureElementAccessDictionary_autogen.cpp
index 145fdee707..7db9df26bf 100644
--- a/experimental/PdfViewer/autogen/SkPdfStructureElementAccessDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfStructureElementAccessDictionary_autogen.cpp
@@ -13,3 +13,4 @@ long SkPdfStructureElementAccessDictionary::StructParents() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfStructureElementAccessDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfStructureElementAccessDictionary_autogen.h
index fb868a5261..27e2eabbbd 100644
--- a/experimental/PdfViewer/autogen/SkPdfStructureElementAccessDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfStructureElementAccessDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfStructureElementDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfStructureElementDictionary_autogen.cpp
index 700c49046a..0126024ca7 100644
--- a/experimental/PdfViewer/autogen/SkPdfStructureElementDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfStructureElementDictionary_autogen.cpp
@@ -97,3 +97,4 @@ std::string SkPdfStructureElementDictionary::ActualText() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfStructureElementDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfStructureElementDictionary_autogen.h
index f666dd4442..284ff200c7 100644
--- a/experimental/PdfViewer/autogen/SkPdfStructureElementDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfStructureElementDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfStructureTreeRootDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfStructureTreeRootDictionary_autogen.cpp
index 08d6af307f..b6c9442512 100644
--- a/experimental/PdfViewer/autogen/SkPdfStructureTreeRootDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfStructureTreeRootDictionary_autogen.cpp
@@ -69,3 +69,4 @@ SkPdfDictionary* SkPdfStructureTreeRootDictionary::ClassMap() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfStructureTreeRootDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfStructureTreeRootDictionary_autogen.h
index f722733f6b..6189461ab7 100644
--- a/experimental/PdfViewer/autogen/SkPdfStructureTreeRootDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfStructureTreeRootDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfSubmitFormActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfSubmitFormActionDictionary_autogen.cpp
index e269184745..0aa92a8d2d 100644
--- a/experimental/PdfViewer/autogen/SkPdfSubmitFormActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfSubmitFormActionDictionary_autogen.cpp
@@ -27,3 +27,4 @@ long SkPdfSubmitFormActionDictionary::Flags() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfSubmitFormActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfSubmitFormActionDictionary_autogen.h
index 3a7d6a66f9..c996c9a2dc 100644
--- a/experimental/PdfViewer/autogen/SkPdfSubmitFormActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfSubmitFormActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfTableAttributesDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfTableAttributesDictionary_autogen.cpp
index cb780e563b..dbdb373a40 100644
--- a/experimental/PdfViewer/autogen/SkPdfTableAttributesDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfTableAttributesDictionary_autogen.cpp
@@ -13,3 +13,4 @@ long SkPdfTableAttributesDictionary::ColSpan() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfTableAttributesDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfTableAttributesDictionary_autogen.h
index a73508bf80..fccab6259a 100644
--- a/experimental/PdfViewer/autogen/SkPdfTableAttributesDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfTableAttributesDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfTextAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfTextAnnotationDictionary_autogen.cpp
index 28150515ab..6b493a6a19 100644
--- a/experimental/PdfViewer/autogen/SkPdfTextAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfTextAnnotationDictionary_autogen.cpp
@@ -27,3 +27,4 @@ std::string SkPdfTextAnnotationDictionary::Name() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfTextAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfTextAnnotationDictionary_autogen.h
index f16442316d..93f6763391 100644
--- a/experimental/PdfViewer/autogen/SkPdfTextAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfTextAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfTextFieldDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfTextFieldDictionary_autogen.cpp
index dcb54675c5..ca3187cfdd 100644
--- a/experimental/PdfViewer/autogen/SkPdfTextFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfTextFieldDictionary_autogen.cpp
@@ -6,3 +6,4 @@ long SkPdfTextFieldDictionary::MaxLen() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfTextFieldDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfTextFieldDictionary_autogen.h
index 30a7e415f5..897ef7e706 100644
--- a/experimental/PdfViewer/autogen/SkPdfTextFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfTextFieldDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfThreadActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfThreadActionDictionary_autogen.cpp
index 681c298c20..8544c8c8cc 100644
--- a/experimental/PdfViewer/autogen/SkPdfThreadActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfThreadActionDictionary_autogen.cpp
@@ -48,3 +48,4 @@ long SkPdfThreadActionDictionary::getBAsInteger() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfThreadActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfThreadActionDictionary_autogen.h
index 5b5a813a7c..9630c339d5 100644
--- a/experimental/PdfViewer/autogen/SkPdfThreadActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfThreadActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfThreadDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfThreadDictionary_autogen.cpp
index 656c1f6fcd..d3e75f8b84 100644
--- a/experimental/PdfViewer/autogen/SkPdfThreadDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfThreadDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfDictionary* SkPdfThreadDictionary::I() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfThreadDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfThreadDictionary_autogen.h
index afb181326d..20601c8d61 100644
--- a/experimental/PdfViewer/autogen/SkPdfThreadDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfThreadDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfTransitionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfTransitionDictionary_autogen.cpp
index 38229fac43..dcd16e5b3d 100644
--- a/experimental/PdfViewer/autogen/SkPdfTransitionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfTransitionDictionary_autogen.cpp
@@ -41,3 +41,4 @@ double SkPdfTransitionDictionary::Di() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfTransitionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfTransitionDictionary_autogen.h
index e3fa5b532c..ca5bd9aa16 100644
--- a/experimental/PdfViewer/autogen/SkPdfTransitionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfTransitionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfTransparencyGroupDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfTransparencyGroupDictionary_autogen.cpp
index 4c4be918d4..cb81161098 100644
--- a/experimental/PdfViewer/autogen/SkPdfTransparencyGroupDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfTransparencyGroupDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfTransparencyGroupDictionary::getCSAsArray() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfTransparencyGroupDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfTransparencyGroupDictionary_autogen.h
index 8424b4a9d3..f5e3125da6 100644
--- a/experimental/PdfViewer/autogen/SkPdfTransparencyGroupDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfTransparencyGroupDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfTrapNetworkAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfTrapNetworkAnnotationDictionary_autogen.cpp
index 96c4c052c3..e59e974dfb 100644
--- a/experimental/PdfViewer/autogen/SkPdfTrapNetworkAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfTrapNetworkAnnotationDictionary_autogen.cpp
@@ -41,3 +41,4 @@ SkPdfArray* SkPdfTrapNetworkAnnotationDictionary::FontFauxing() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfTrapNetworkAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfTrapNetworkAnnotationDictionary_autogen.h
index 79f3cbe0db..2eb1c9fe0b 100644
--- a/experimental/PdfViewer/autogen/SkPdfTrapNetworkAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfTrapNetworkAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.cpp
index 5dd50ae3fa..729d96c28c 100644
--- a/experimental/PdfViewer/autogen/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.cpp
@@ -27,3 +27,4 @@ std::string SkPdfTrapNetworkAppearanceStreamDictionary::TrapStyles() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h
index 5b4c745c78..efc4dde953 100644
--- a/experimental/PdfViewer/autogen/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfTrueTypeFontDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfTrueTypeFontDictionary_autogen.cpp
index bf94eeeece..1929a9eecb 100644
--- a/experimental/PdfViewer/autogen/SkPdfTrueTypeFontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfTrueTypeFontDictionary_autogen.cpp
@@ -6,3 +6,4 @@ std::string SkPdfTrueTypeFontDictionary::Subtype() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType0FontDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType0FontDictionary_autogen.cpp
index 4383cac7c1..472b9036a3 100644
--- a/experimental/PdfViewer/autogen/SkPdfType0FontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType0FontDictionary_autogen.cpp
@@ -48,3 +48,4 @@ SkPdfStream* SkPdfType0FontDictionary::ToUnicode() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType0FontDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType0FontDictionary_autogen.h
index 4cbcd63a8a..8091312b17 100644
--- a/experimental/PdfViewer/autogen/SkPdfType0FontDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType0FontDictionary_autogen.h
@@ -16,9 +16,6 @@ public:
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return this;}
 
 private:
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;}
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType0FunctionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType0FunctionDictionary_autogen.cpp
index 9beae24805..c28bbc3e41 100644
--- a/experimental/PdfViewer/autogen/SkPdfType0FunctionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType0FunctionDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfArray* SkPdfType0FunctionDictionary::Decode() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType0FunctionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType0FunctionDictionary_autogen.h
index f14ec5387c..7cd818face 100644
--- a/experimental/PdfViewer/autogen/SkPdfType0FunctionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType0FunctionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType10HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType10HalftoneDictionary_autogen.cpp
index 523f408e68..3ac7e419af 100644
--- a/experimental/PdfViewer/autogen/SkPdfType10HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType10HalftoneDictionary_autogen.cpp
@@ -48,3 +48,4 @@ std::string SkPdfType10HalftoneDictionary::getTransferFunctionAsName() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType10HalftoneDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType10HalftoneDictionary_autogen.h
index c993e0fc74..16076c1854 100644
--- a/experimental/PdfViewer/autogen/SkPdfType10HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType10HalftoneDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType16HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType16HalftoneDictionary_autogen.cpp
index 0855975ca0..2cc41801f4 100644
--- a/experimental/PdfViewer/autogen/SkPdfType16HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType16HalftoneDictionary_autogen.cpp
@@ -62,3 +62,4 @@ std::string SkPdfType16HalftoneDictionary::getTransferFunctionAsName() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType16HalftoneDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType16HalftoneDictionary_autogen.h
index c62b2e5948..72b316be06 100644
--- a/experimental/PdfViewer/autogen/SkPdfType16HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType16HalftoneDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType1FontDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType1FontDictionary_autogen.cpp
index 98e17cf5cd..a3e3f920c5 100644
--- a/experimental/PdfViewer/autogen/SkPdfType1FontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType1FontDictionary_autogen.cpp
@@ -49,9 +49,9 @@ SkPdfArray* SkPdfType1FontDictionary::Widths() const {
   return NULL;
 }
 
-SkPdfDictionary* SkPdfType1FontDictionary::FontDescriptor() const {
-  SkPdfDictionary* ret;
-  if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontDescriptor", "", &ret)) return ret;
+SkPdfFontDescriptorDictionary* SkPdfType1FontDictionary::FontDescriptor() const {
+  SkPdfFontDescriptorDictionary* ret;
+  if (FontDescriptorDictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontDescriptor", "", &ret)) return ret;
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
@@ -76,3 +76,4 @@ SkPdfStream* SkPdfType1FontDictionary::ToUnicode() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType1FontDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType1FontDictionary_autogen.h
index 371acc78ff..502620bef0 100644
--- a/experimental/PdfViewer/autogen/SkPdfType1FontDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType1FontDictionary_autogen.h
@@ -16,9 +16,6 @@ public:
   virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return this;}
 
 private:
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
@@ -114,7 +111,7 @@ public:
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "FontDescriptor", "", NULL));
   }
 
-  SkPdfDictionary* FontDescriptor() const;
+  SkPdfFontDescriptorDictionary* FontDescriptor() const;
 /** (Optional) A specification of the font's character encoding, if different from
  *  its built-in encoding. The value of Encoding may be either the name of a pre-
  *  defined encoding (MacRomanEncoding, MacExpertEncoding, or WinAnsi-
diff --git a/experimental/PdfViewer/autogen/SkPdfType1FormDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType1FormDictionary_autogen.cpp
index d8ecb0ecf4..dd2736c94b 100644
--- a/experimental/PdfViewer/autogen/SkPdfType1FormDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType1FormDictionary_autogen.cpp
@@ -104,3 +104,4 @@ SkPdfDictionary* SkPdfType1FormDictionary::OPI() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType1HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType1HalftoneDictionary_autogen.cpp
index bbb1b50929..dc756bdbe0 100644
--- a/experimental/PdfViewer/autogen/SkPdfType1HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType1HalftoneDictionary_autogen.cpp
@@ -69,3 +69,4 @@ std::string SkPdfType1HalftoneDictionary::getTransferFunctionAsName() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType1HalftoneDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType1HalftoneDictionary_autogen.h
index b70d0cfabf..19efb859b9 100644
--- a/experimental/PdfViewer/autogen/SkPdfType1HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType1HalftoneDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType1PatternDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType1PatternDictionary_autogen.cpp
index 4ffeda7640..f2ac93a9b4 100644
--- a/experimental/PdfViewer/autogen/SkPdfType1PatternDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType1PatternDictionary_autogen.cpp
@@ -20,3 +20,4 @@ long SkPdfType1PatternDictionary::PaintType() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType1PatternDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType1PatternDictionary_autogen.h
index 458933962b..a9c9a54da9 100644
--- a/experimental/PdfViewer/autogen/SkPdfType1PatternDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType1PatternDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType1ShadingDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType1ShadingDictionary_autogen.cpp
index 99ab0bd6dc..be4929d636 100644
--- a/experimental/PdfViewer/autogen/SkPdfType1ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType1ShadingDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfFunction SkPdfType1ShadingDictionary::Function() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return SkPdfFunction();
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType2FunctionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType2FunctionDictionary_autogen.cpp
index e66f474d70..c57e0f86be 100644
--- a/experimental/PdfViewer/autogen/SkPdfType2FunctionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType2FunctionDictionary_autogen.cpp
@@ -20,3 +20,4 @@ double SkPdfType2FunctionDictionary::N() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType2FunctionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType2FunctionDictionary_autogen.h
index 549db11c6e..6359a5913f 100644
--- a/experimental/PdfViewer/autogen/SkPdfType2FunctionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType2FunctionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType2PatternDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType2PatternDictionary_autogen.cpp
index 4dab45794a..7f0976fe8c 100644
--- a/experimental/PdfViewer/autogen/SkPdfType2PatternDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType2PatternDictionary_autogen.cpp
@@ -41,3 +41,4 @@ SkPdfDictionary* SkPdfType2PatternDictionary::ExtGState() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType2PatternDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType2PatternDictionary_autogen.h
index d97b721975..bef782fab8 100644
--- a/experimental/PdfViewer/autogen/SkPdfType2PatternDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType2PatternDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType2ShadingDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType2ShadingDictionary_autogen.cpp
index d0a949929f..b0069d0d7d 100644
--- a/experimental/PdfViewer/autogen/SkPdfType2ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType2ShadingDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfType2ShadingDictionary::Extend() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType3FontDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType3FontDictionary_autogen.cpp
index bedaf58c78..7b413e338d 100644
--- a/experimental/PdfViewer/autogen/SkPdfType3FontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType3FontDictionary_autogen.cpp
@@ -90,3 +90,4 @@ SkPdfStream* SkPdfType3FontDictionary::ToUnicode() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType3FunctionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType3FunctionDictionary_autogen.cpp
index 5fae87756f..6449c31218 100644
--- a/experimental/PdfViewer/autogen/SkPdfType3FunctionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType3FunctionDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfType3FunctionDictionary::Encode() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType3FunctionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType3FunctionDictionary_autogen.h
index 38451fb3b6..a45c9c25b7 100644
--- a/experimental/PdfViewer/autogen/SkPdfType3FunctionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType3FunctionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType3ShadingDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType3ShadingDictionary_autogen.cpp
index 44ca17a925..042cc8f114 100644
--- a/experimental/PdfViewer/autogen/SkPdfType3ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType3ShadingDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfArray* SkPdfType3ShadingDictionary::Extend() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType4ShadingDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType4ShadingDictionary_autogen.cpp
index 574a450bb0..671856e418 100644
--- a/experimental/PdfViewer/autogen/SkPdfType4ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType4ShadingDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfFunction SkPdfType4ShadingDictionary::Function() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return SkPdfFunction();
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType5HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType5HalftoneDictionary_autogen.cpp
index 2fabeb4dbf..0d999dc5a6 100644
--- a/experimental/PdfViewer/autogen/SkPdfType5HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType5HalftoneDictionary_autogen.cpp
@@ -50,3 +50,4 @@ SkPdfStream* SkPdfType5HalftoneDictionary::getDefaultAsStream() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType5HalftoneDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType5HalftoneDictionary_autogen.h
index 0179af3281..18e931dbf8 100644
--- a/experimental/PdfViewer/autogen/SkPdfType5HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType5HalftoneDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType5ShadingDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType5ShadingDictionary_autogen.cpp
index 1245c81a54..4ec82d1a76 100644
--- a/experimental/PdfViewer/autogen/SkPdfType5ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType5ShadingDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfFunction SkPdfType5ShadingDictionary::Function() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return SkPdfFunction();
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType6HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType6HalftoneDictionary_autogen.cpp
index da73d3145f..8f9ecd48b8 100644
--- a/experimental/PdfViewer/autogen/SkPdfType6HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType6HalftoneDictionary_autogen.cpp
@@ -48,3 +48,4 @@ std::string SkPdfType6HalftoneDictionary::getTransferFunctionAsName() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfType6HalftoneDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfType6HalftoneDictionary_autogen.h
index 9c682489c6..55216ec56c 100644
--- a/experimental/PdfViewer/autogen/SkPdfType6HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfType6HalftoneDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfType6ShadingDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfType6ShadingDictionary_autogen.cpp
index 5081788b56..c7fa09e90f 100644
--- a/experimental/PdfViewer/autogen/SkPdfType6ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfType6ShadingDictionary_autogen.cpp
@@ -34,3 +34,4 @@ SkPdfFunction SkPdfType6ShadingDictionary::Function() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return SkPdfFunction();
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfURIActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfURIActionDictionary_autogen.cpp
index 07fd5fa230..e2bf8cfd28 100644
--- a/experimental/PdfViewer/autogen/SkPdfURIActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfURIActionDictionary_autogen.cpp
@@ -20,3 +20,4 @@ bool SkPdfURIActionDictionary::IsMap() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return false;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfURIActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfURIActionDictionary_autogen.h
index 212969ec03..d0deca68d4 100644
--- a/experimental/PdfViewer/autogen/SkPdfURIActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfURIActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfURIDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfURIDictionary_autogen.cpp
index 0b65913b27..1c10e0b8c2 100644
--- a/experimental/PdfViewer/autogen/SkPdfURIDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfURIDictionary_autogen.cpp
@@ -6,3 +6,4 @@ std::string SkPdfURIDictionary::Base() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfURIDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfURIDictionary_autogen.h
index be21237679..09aedce194 100644
--- a/experimental/PdfViewer/autogen/SkPdfURIDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfURIDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfURLAliasDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfURLAliasDictionary_autogen.cpp
index 14f4b2dbd4..736849917a 100644
--- a/experimental/PdfViewer/autogen/SkPdfURLAliasDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfURLAliasDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfArray* SkPdfURLAliasDictionary::C() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfURLAliasDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfURLAliasDictionary_autogen.h
index 93ad7f6c54..a50cd2c696 100644
--- a/experimental/PdfViewer/autogen/SkPdfURLAliasDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfURLAliasDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfVariableTextFieldDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfVariableTextFieldDictionary_autogen.cpp
index fc97f9b9a2..e927f3c217 100644
--- a/experimental/PdfViewer/autogen/SkPdfVariableTextFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfVariableTextFieldDictionary_autogen.cpp
@@ -20,3 +20,4 @@ long SkPdfVariableTextFieldDictionary::Q() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return 0;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfVariableTextFieldDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfVariableTextFieldDictionary_autogen.h
index 29e54a42fa..5db4aa933d 100644
--- a/experimental/PdfViewer/autogen/SkPdfVariableTextFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfVariableTextFieldDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfViewerPreferencesDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfViewerPreferencesDictionary_autogen.cpp
index 33a35c5807..dac44df2ff 100644
--- a/experimental/PdfViewer/autogen/SkPdfViewerPreferencesDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfViewerPreferencesDictionary_autogen.cpp
@@ -83,3 +83,4 @@ std::string SkPdfViewerPreferencesDictionary::PrintClip() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfViewerPreferencesDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfViewerPreferencesDictionary_autogen.h
index 0f6a3274ae..879c856a18 100644
--- a/experimental/PdfViewer/autogen/SkPdfViewerPreferencesDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfViewerPreferencesDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandDictionary_autogen.cpp
index 800af54d04..f09a7b1137 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandDictionary_autogen.cpp
@@ -55,3 +55,4 @@ SkPdfDictionary* SkPdfWebCaptureCommandDictionary::S() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandDictionary_autogen.h
index acb84c033a..ddc562c26c 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandSettingsDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandSettingsDictionary_autogen.cpp
index c277520083..f0790e64a7 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandSettingsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandSettingsDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfDictionary* SkPdfWebCaptureCommandSettingsDictionary::C() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandSettingsDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandSettingsDictionary_autogen.h
index ecbff5cafa..db17f721ac 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandSettingsDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureCommandSettingsDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.cpp
index 21b1b3e608..0892588364 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.cpp
@@ -55,3 +55,4 @@ SkPdfDate SkPdfWebCaptureDictionary::TS() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return SkPdfDate();
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.h
index c87963e192..b62459b825 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureImageSetDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfWebCaptureImageSetDictionary_autogen.cpp
index 26e59816be..db2c429d49 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureImageSetDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureImageSetDictionary_autogen.cpp
@@ -20,3 +20,4 @@ SkPdfArray* SkPdfWebCaptureImageSetDictionary::getRAsArray() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureImageSetDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfWebCaptureImageSetDictionary_autogen.h
index ee23a8ebc7..45594fcb65 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureImageSetDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureImageSetDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureInformationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfWebCaptureInformationDictionary_autogen.cpp
index e3f8e119c0..dec583d615 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureInformationDictionary_autogen.cpp
@@ -13,3 +13,4 @@ SkPdfArray* SkPdfWebCaptureInformationDictionary::C() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCaptureInformationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfWebCaptureInformationDictionary_autogen.h
index c94f93fafd..8681f886e8 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCaptureInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfWebCaptureInformationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCapturePageSetDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfWebCapturePageSetDictionary_autogen.cpp
index f180e1f4a6..ba6b1445fa 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCapturePageSetDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfWebCapturePageSetDictionary_autogen.cpp
@@ -20,3 +20,4 @@ std::string SkPdfWebCapturePageSetDictionary::TID() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfWebCapturePageSetDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfWebCapturePageSetDictionary_autogen.h
index f5fc3279d2..77b7c03f23 100644
--- a/experimental/PdfViewer/autogen/SkPdfWebCapturePageSetDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfWebCapturePageSetDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfWidgetAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfWidgetAnnotationDictionary_autogen.cpp
index aaa3f2d3b7..db8bbed653 100644
--- a/experimental/PdfViewer/autogen/SkPdfWidgetAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfWidgetAnnotationDictionary_autogen.cpp
@@ -27,3 +27,4 @@ SkPdfDictionary* SkPdfWidgetAnnotationDictionary::MK() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return NULL;
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfWidgetAnnotationDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfWidgetAnnotationDictionary_autogen.h
index 0a4d360606..c1e408fccc 100644
--- a/experimental/PdfViewer/autogen/SkPdfWidgetAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfWidgetAnnotationDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfWindowsLaunchActionDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfWindowsLaunchActionDictionary_autogen.cpp
index c92b28bc83..838e2be2fd 100644
--- a/experimental/PdfViewer/autogen/SkPdfWindowsLaunchActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfWindowsLaunchActionDictionary_autogen.cpp
@@ -27,3 +27,4 @@ std::string SkPdfWindowsLaunchActionDictionary::P() const {
   // TODO(edisonn): warn about missing required field, assert for known good pdfs
   return "";
 }
+
diff --git a/experimental/PdfViewer/autogen/SkPdfWindowsLaunchActionDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfWindowsLaunchActionDictionary_autogen.h
index b3fe9e1a76..2675b0248d 100644
--- a/experimental/PdfViewer/autogen/SkPdfWindowsLaunchActionDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfWindowsLaunchActionDictionary_autogen.h
@@ -64,6 +64,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -163,9 +166,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/SkPdfXObjectDictionary_autogen.cpp b/experimental/PdfViewer/autogen/SkPdfXObjectDictionary_autogen.cpp
index a41416d7a0..ef58c4f81e 100644
--- a/experimental/PdfViewer/autogen/SkPdfXObjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/autogen/SkPdfXObjectDictionary_autogen.cpp
@@ -1 +1,2 @@
 #include "SkPdfXObjectDictionary_autogen.h"
+
diff --git a/experimental/PdfViewer/autogen/SkPdfXObjectDictionary_autogen.h b/experimental/PdfViewer/autogen/SkPdfXObjectDictionary_autogen.h
index 888bee5b89..9b8d0ff8d7 100644
--- a/experimental/PdfViewer/autogen/SkPdfXObjectDictionary_autogen.h
+++ b/experimental/PdfViewer/autogen/SkPdfXObjectDictionary_autogen.h
@@ -63,6 +63,9 @@ private:
   virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return NULL;}
   virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return NULL;}
 
+  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
+  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
+
   virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return NULL;}
   virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return NULL;}
 
@@ -162,9 +165,6 @@ private:
   virtual SkPdfFontDictionary* asFontDictionary() {return NULL;}
   virtual const SkPdfFontDictionary* asFontDictionary() const {return NULL;}
 
-  virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;}
-  virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;}
-
   virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;}
   virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;}
 
diff --git a/experimental/PdfViewer/autogen/pdfspec_autogen.py b/experimental/PdfViewer/autogen/pdfspec_autogen.py
index c5a419d1e4..974d97a983 100644
--- a/experimental/PdfViewer/autogen/pdfspec_autogen.py
+++ b/experimental/PdfViewer/autogen/pdfspec_autogen.py
@@ -1772,7 +1772,7 @@ def buildPdfSpec(pdfspec):
       .optional()\
           .field('FontDescriptor')\
           .name('FontDescriptor')\
-          .type('dictionary')\
+          .type('FontDescriptorDictionary')\
           .comment('(Required except for the standard 14 fonts; must be an indirect reference) A font\ndescriptor describing the font\'s metrics other than its glyph widths (see Sec-\ntion 5.7, "Font Descriptors").\n   Note: For the standard 14 fonts, the entries FirstChar, LastChar, Widths, and\n   FontDescriptor must either all be present or all absent. Ordinarily, they are ab-\n   sent; specifying them enables a standard font to be overridden (see "Standard\n   Type 1 Fonts," below).')\
           .done().done()\
       .optional()\
@@ -1907,7 +1907,7 @@ def buildPdfSpec(pdfspec):
           .done().done()\
       .done()
 
-  pdfspec.addClass('CIDFontDictionary', 'FontDictionary', 'Entries in a CIDFont dictionary')\
+  pdfspec.addClass('CIDFontDictionary', 'Dictionary', 'Entries in a CIDFont dictionary')\
       .required('NULL')\
           .field('Type')\
           .name('Type')\
@@ -1936,7 +1936,7 @@ def buildPdfSpec(pdfspec):
       .optional()\
           .field('FontDescriptor')\
           .name('FontDescriptor')\
-          .type('dictionary')\
+          .type('FontDescriptorDictionary')\
           .comment('(Required; must be an indirect reference) A font descriptor describing the\nCIDFont\'s default metrics other than its glyph widths (see Section 5.7,\n"Font Descriptors").')\
           .done().done()\
       .optional()\
diff --git a/experimental/PdfViewer/generate_code.py b/experimental/PdfViewer/generate_code.py
index 0028cf33bc..0802c5e5a2 100644
--- a/experimental/PdfViewer/generate_code.py
+++ b/experimental/PdfViewer/generate_code.py
@@ -62,7 +62,10 @@ class PdfField:
   def type(self, types):
     # TODO (edisonn): if simple type, use it, otherwise set it to Dictionary, and set a mask for valid types, like array or name
     types = types.strip()
-    types = types.replace('or', ' ')
+    types = types.replace(' or ', ' ')
+    types = types.replace(' or,', ' ')
+    types = types.replace(',or ', ' ')
+    types = types.replace(',or,', ' ')
     types = types.replace(',', ' ')
     types = types.replace('text', ' ') # TODO(edisonn): what is the difference between 'text string' and 'string'?
     types = types.replace('file specification', 'file_specification')
diff --git a/experimental/PdfViewer/spec2def.py b/experimental/PdfViewer/spec2def.py
index bbb58302a2..b53e25106e 100644
--- a/experimental/PdfViewer/spec2def.py
+++ b/experimental/PdfViewer/spec2def.py
@@ -105,7 +105,7 @@ tableToClassName = {
 'TABLE 5.9': ['Type3FontDictionary', 'Entries in a Type 3 font dictionary', 'Type1FontDictionary', {'Subtype': '[datatypes.PdfName(\'Type3\')]'}],
 'TABLE 5.11': ['EncodingDictionary', 'Entries in an encoding dictionary'],
 'TABLE 5.12': ['CIDSystemInfoDictionary', 'Entries in a CIDSystemInfo dictionary'],
-'TABLE 5.13': ['CIDFontDictionary', 'Entries in a CIDFont dictionary', 'FontDictionary', {'Subtype': '[datatypes.PdfName(\'CIDFontType0\'), datatypes.PdfName(\'CIDFontType2\')]'}],
+'TABLE 5.13': ['CIDFontDictionary', 'Entries in a CIDFont dictionary', '', {'Subtype': '[datatypes.PdfName(\'CIDFontType0\'), datatypes.PdfName(\'CIDFontType2\')]'}],
 'TABLE 5.16': ['CMapDictionary', 'Additional entries in a CMap dictionary'],
 'TABLE 5.17': ['Type0FontDictionary', 'Entries in a Type 0 font dictionary', 'FontDictionary', {'Subtype': '[datatypes.PdfName(\'Type0\')]'}],
 'TABLE 5.18': ['FontDescriptorDictionary', 'Entries common to all font descriptors', '', {'Type': '[datatypes.PdfName(\'FontDescriptor\')]'}],
-- 
cgit v1.2.3