diff options
183 files changed, 994 insertions, 2093 deletions
diff --git a/experimental/PdfViewer/SkPdfALinkAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfALinkAnnotationDictionary_autogen.h index 1e96386a57..73cf622c60 100644 --- a/experimental/PdfViewer/SkPdfALinkAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfALinkAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfALinkAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryALinkAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryALinkAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kALinkAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kALinkAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfALinkAnnotationDictionary* asALinkAnnotationDictionary() {return this;} virtual const SkPdfALinkAnnotationDictionary* asALinkAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfActionDictionary_autogen.h index 64e6584296..8f2dcfa6a1 100644 --- a/experimental/PdfViewer/SkPdfActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfActionDictionary* asActionDictionary() {return this;} virtual const SkPdfActionDictionary* asActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfAlternateImageDictionary_autogen.h b/experimental/PdfViewer/SkPdfAlternateImageDictionary_autogen.h index 80b21e1b1f..abeaee4ce3 100644 --- a/experimental/PdfViewer/SkPdfAlternateImageDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAlternateImageDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfAlternateImageDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryAlternateImageDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryAlternateImageDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kAlternateImageDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kAlternateImageDictionary_SkPdfObjectType + 1);} public: virtual SkPdfAlternateImageDictionary* asAlternateImageDictionary() {return this;} virtual const SkPdfAlternateImageDictionary* asAlternateImageDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfAnnotationActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfAnnotationActionsDictionary_autogen.h index 1b494778b2..b825524506 100644 --- a/experimental/PdfViewer/SkPdfAnnotationActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAnnotationActionsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfAnnotationActionsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryAnnotationActionsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryAnnotationActionsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kAnnotationActionsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kAnnotationActionsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfAnnotationActionsDictionary* asAnnotationActionsDictionary() {return this;} virtual const SkPdfAnnotationActionsDictionary* asAnnotationActionsDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfAnnotationDictionary_autogen.h index 49170e3b89..3e01542ff1 100644 --- a/experimental/PdfViewer/SkPdfAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfAnnotationDictionary* asAnnotationDictionary() {return this;} virtual const SkPdfAnnotationDictionary* asAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfAppearanceCharacteristicsDictionary_autogen.h b/experimental/PdfViewer/SkPdfAppearanceCharacteristicsDictionary_autogen.h index 954f106c89..e4ee8a1f4f 100644 --- a/experimental/PdfViewer/SkPdfAppearanceCharacteristicsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAppearanceCharacteristicsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfAppearanceCharacteristicsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryAppearanceCharacteristicsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryAppearanceCharacteristicsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kAppearanceCharacteristicsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kAppearanceCharacteristicsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfAppearanceCharacteristicsDictionary* asAppearanceCharacteristicsDictionary() {return this;} virtual const SkPdfAppearanceCharacteristicsDictionary* asAppearanceCharacteristicsDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfAppearanceDictionary_autogen.h b/experimental/PdfViewer/SkPdfAppearanceDictionary_autogen.h index b9e00858d7..8b82405336 100644 --- a/experimental/PdfViewer/SkPdfAppearanceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAppearanceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfAppearanceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryAppearanceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryAppearanceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kAppearanceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kAppearanceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfAppearanceDictionary* asAppearanceDictionary() {return this;} virtual const SkPdfAppearanceDictionary* asAppearanceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfApplicationDataDictionary_autogen.h b/experimental/PdfViewer/SkPdfApplicationDataDictionary_autogen.h index 298c9d501e..d7f3c8af23 100644 --- a/experimental/PdfViewer/SkPdfApplicationDataDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfApplicationDataDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfApplicationDataDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryApplicationDataDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryApplicationDataDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kApplicationDataDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kApplicationDataDictionary_SkPdfObjectType + 1);} public: virtual SkPdfApplicationDataDictionary* asApplicationDataDictionary() {return this;} virtual const SkPdfApplicationDataDictionary* asApplicationDataDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfArray_autogen.h b/experimental/PdfViewer/SkPdfArray_autogen.h index 861d877c87..2256f33b2c 100644 --- a/experimental/PdfViewer/SkPdfArray_autogen.h +++ b/experimental/PdfViewer/SkPdfArray_autogen.h @@ -7,8 +7,8 @@ class SkPdfArray : public SkPdfObject { public: - virtual SkPdfObjectType getType() const { return kObjectArray_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectArray_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kArray_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kArray_SkPdfObjectType + 1);} public: virtual SkPdfArray* asArray() {return this;} virtual const SkPdfArray* asArray() const {return this;} @@ -521,27 +521,27 @@ private: virtual SkPdfType1FormDictionary* asType1FormDictionary() {return NULL;} virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return NULL;} - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - virtual SkPdfInteger* asInteger() {return NULL;} virtual const SkPdfInteger* asInteger() const {return NULL;} + virtual SkPdfNumber* asNumber() {return NULL;} + virtual const SkPdfNumber* asNumber() const {return NULL;} + virtual SkPdfName* asName() {return NULL;} virtual const SkPdfName* asName() const {return NULL;} virtual SkPdfNull* asNull() {return NULL;} virtual const SkPdfNull* asNull() const {return NULL;} - virtual SkPdfNumber* asNumber() {return NULL;} - virtual const SkPdfNumber* asNumber() const {return NULL;} - virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} + virtual SkPdfHexString* asHexString() {return NULL;} + virtual const SkPdfHexString* asHexString() const {return NULL;} + public: const int size() const {return fPodofoObj->GetArray().GetSize();} const SkPdfObject operator[](int i) const {return SkPdfObject(fPodofoDoc, &fPodofoObj->GetArray()[i]);} diff --git a/experimental/PdfViewer/SkPdfArtifactsDictionary_autogen.h b/experimental/PdfViewer/SkPdfArtifactsDictionary_autogen.h index ff8e279cac..c5a580bc06 100644 --- a/experimental/PdfViewer/SkPdfArtifactsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfArtifactsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfArtifactsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryArtifactsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryArtifactsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kArtifactsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kArtifactsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfArtifactsDictionary* asArtifactsDictionary() {return this;} virtual const SkPdfArtifactsDictionary* asArtifactsDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfAttributeObjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfAttributeObjectDictionary_autogen.h index 6cdfabc99b..5433c3cf96 100644 --- a/experimental/PdfViewer/SkPdfAttributeObjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfAttributeObjectDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfAttributeObjectDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryAttributeObjectDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryAttributeObjectDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kAttributeObjectDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kAttributeObjectDictionary_SkPdfObjectType + 1);} public: virtual SkPdfAttributeObjectDictionary* asAttributeObjectDictionary() {return this;} virtual const SkPdfAttributeObjectDictionary* asAttributeObjectDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfBeadDictionary_autogen.h b/experimental/PdfViewer/SkPdfBeadDictionary_autogen.h index 95d191c6b6..92f5f05f63 100644 --- a/experimental/PdfViewer/SkPdfBeadDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBeadDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfBeadDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryBeadDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryBeadDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kBeadDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kBeadDictionary_SkPdfObjectType + 1);} public: virtual SkPdfBeadDictionary* asBeadDictionary() {return this;} virtual const SkPdfBeadDictionary* asBeadDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h b/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h index 67f7d3eff9..d795a62e75 100644 --- a/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfBlockLevelStructureElementsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryBlockLevelStructureElementsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryBlockLevelStructureElementsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kBlockLevelStructureElementsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kBlockLevelStructureElementsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfBlockLevelStructureElementsDictionary* asBlockLevelStructureElementsDictionary() {return this;} virtual const SkPdfBlockLevelStructureElementsDictionary* asBlockLevelStructureElementsDictionary() const {return this;} @@ -573,7 +573,7 @@ public: bool isWidthANumber() const { SkPdfObject* ret = NULL; if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Width", "", &ret)) return false; - return ret->podofo()->GetDataType() == ePdfDataType_Real; + return ret->podofo()->GetDataType() == ePdfDataType_Real || ret->podofo()->GetDataType() == ePdfDataType_Number; } double getWidthAsNumber() const { @@ -599,7 +599,7 @@ public: bool isHeightANumber() const { SkPdfObject* ret = NULL; if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Height", "", &ret)) return false; - return ret->podofo()->GetDataType() == ePdfDataType_Real; + return ret->podofo()->GetDataType() == ePdfDataType_Real || ret->podofo()->GetDataType() == ePdfDataType_Number; } double getHeightAsNumber() const { diff --git a/experimental/PdfViewer/SkPdfBoolean_autogen.h b/experimental/PdfViewer/SkPdfBoolean_autogen.h index 00870ca85e..d422501a68 100644 --- a/experimental/PdfViewer/SkPdfBoolean_autogen.h +++ b/experimental/PdfViewer/SkPdfBoolean_autogen.h @@ -7,8 +7,8 @@ class SkPdfBoolean : public SkPdfObject { public: - virtual SkPdfObjectType getType() const { return kObjectBoolean_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectBoolean_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kBoolean_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kBoolean_SkPdfObjectType + 1);} public: virtual SkPdfBoolean* asBoolean() {return this;} virtual const SkPdfBoolean* asBoolean() const {return this;} @@ -521,27 +521,27 @@ private: virtual SkPdfType1FormDictionary* asType1FormDictionary() {return NULL;} virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return NULL;} - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - virtual SkPdfInteger* asInteger() {return NULL;} virtual const SkPdfInteger* asInteger() const {return NULL;} + virtual SkPdfNumber* asNumber() {return NULL;} + virtual const SkPdfNumber* asNumber() const {return NULL;} + virtual SkPdfName* asName() {return NULL;} virtual const SkPdfName* asName() const {return NULL;} virtual SkPdfNull* asNull() {return NULL;} virtual const SkPdfNull* asNull() const {return NULL;} - virtual SkPdfNumber* asNumber() {return NULL;} - virtual const SkPdfNumber* asNumber() const {return NULL;} - virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} + virtual SkPdfHexString* asHexString() {return NULL;} + virtual const SkPdfHexString* asHexString() const {return NULL;} + public: bool value() const {return fPodofoObj->GetBool();} private: diff --git a/experimental/PdfViewer/SkPdfBorderStyleDictionary_autogen.h b/experimental/PdfViewer/SkPdfBorderStyleDictionary_autogen.h index 8b06772e82..df04cb9323 100644 --- a/experimental/PdfViewer/SkPdfBorderStyleDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBorderStyleDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfBorderStyleDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryBorderStyleDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryBorderStyleDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kBorderStyleDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kBorderStyleDictionary_SkPdfObjectType + 1);} public: virtual SkPdfBorderStyleDictionary* asBorderStyleDictionary() {return this;} virtual const SkPdfBorderStyleDictionary* asBorderStyleDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfBoxColorInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfBoxColorInformationDictionary_autogen.h index 61ee7518d9..f889a38aec 100644 --- a/experimental/PdfViewer/SkPdfBoxColorInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBoxColorInformationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfBoxColorInformationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryBoxColorInformationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryBoxColorInformationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kBoxColorInformationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kBoxColorInformationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfBoxColorInformationDictionary* asBoxColorInformationDictionary() {return this;} virtual const SkPdfBoxColorInformationDictionary* asBoxColorInformationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfBoxStyleDictionary_autogen.h b/experimental/PdfViewer/SkPdfBoxStyleDictionary_autogen.h index bc905590b2..a962aac70b 100644 --- a/experimental/PdfViewer/SkPdfBoxStyleDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfBoxStyleDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfBoxStyleDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryBoxStyleDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryBoxStyleDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kBoxStyleDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kBoxStyleDictionary_SkPdfObjectType + 1);} public: virtual SkPdfBoxStyleDictionary* asBoxStyleDictionary() {return this;} virtual const SkPdfBoxStyleDictionary* asBoxStyleDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfCIDFontDescriptorDictionary_autogen.h b/experimental/PdfViewer/SkPdfCIDFontDescriptorDictionary_autogen.h index fbd09bf205..a19c7f2092 100644 --- a/experimental/PdfViewer/SkPdfCIDFontDescriptorDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCIDFontDescriptorDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfCIDFontDescriptorDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryCIDFontDescriptorDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryCIDFontDescriptorDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kCIDFontDescriptorDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCIDFontDescriptorDictionary_SkPdfObjectType + 1);} public: virtual SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() {return this;} virtual const SkPdfCIDFontDescriptorDictionary* asCIDFontDescriptorDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfCIDFontDictionary_autogen.h b/experimental/PdfViewer/SkPdfCIDFontDictionary_autogen.h index 9195c03042..fc81ad456f 100644 --- a/experimental/PdfViewer/SkPdfCIDFontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCIDFontDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfCIDFontDictionary : public SkPdfFontDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFontDictionaryCIDFontDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFontDictionaryCIDFontDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kCIDFontDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCIDFontDictionary_SkPdfObjectType + 1);} public: virtual SkPdfCIDFontDictionary* asCIDFontDictionary() {return this;} virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfCIDSystemInfoDictionary_autogen.h b/experimental/PdfViewer/SkPdfCIDSystemInfoDictionary_autogen.h index 4bb8a9cf9e..00f2620beb 100644 --- a/experimental/PdfViewer/SkPdfCIDSystemInfoDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCIDSystemInfoDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfCIDSystemInfoDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryCIDSystemInfoDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryCIDSystemInfoDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kCIDSystemInfoDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCIDSystemInfoDictionary_SkPdfObjectType + 1);} public: virtual SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() {return this;} virtual const SkPdfCIDSystemInfoDictionary* asCIDSystemInfoDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfCMapDictionary_autogen.h b/experimental/PdfViewer/SkPdfCMapDictionary_autogen.h index 90ad04292c..c2a91e028a 100644 --- a/experimental/PdfViewer/SkPdfCMapDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCMapDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfCMapDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryCMapDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryCMapDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kCMapDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCMapDictionary_SkPdfObjectType + 1);} public: virtual SkPdfCMapDictionary* asCMapDictionary() {return this;} virtual const SkPdfCMapDictionary* asCMapDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfCalgrayColorSpaceDictionary_autogen.h b/experimental/PdfViewer/SkPdfCalgrayColorSpaceDictionary_autogen.h index bdde63e34b..5f38cc3dc8 100644 --- a/experimental/PdfViewer/SkPdfCalgrayColorSpaceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCalgrayColorSpaceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfCalgrayColorSpaceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryCalgrayColorSpaceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryCalgrayColorSpaceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kCalgrayColorSpaceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCalgrayColorSpaceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfCalgrayColorSpaceDictionary* asCalgrayColorSpaceDictionary() {return this;} virtual const SkPdfCalgrayColorSpaceDictionary* asCalgrayColorSpaceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfCalrgbColorSpaceDictionary_autogen.h b/experimental/PdfViewer/SkPdfCalrgbColorSpaceDictionary_autogen.h index c3d69c8f69..285171dd67 100644 --- a/experimental/PdfViewer/SkPdfCalrgbColorSpaceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCalrgbColorSpaceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfCalrgbColorSpaceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryCalrgbColorSpaceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryCalrgbColorSpaceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kCalrgbColorSpaceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCalrgbColorSpaceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfCalrgbColorSpaceDictionary* asCalrgbColorSpaceDictionary() {return this;} virtual const SkPdfCalrgbColorSpaceDictionary* asCalrgbColorSpaceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfCatalogDictionary_autogen.h b/experimental/PdfViewer/SkPdfCatalogDictionary_autogen.h index 6167cdb89b..a9b1a3d864 100644 --- a/experimental/PdfViewer/SkPdfCatalogDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCatalogDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfCatalogDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryCatalogDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryCatalogDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kCatalogDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCatalogDictionary_SkPdfObjectType + 1);} public: virtual SkPdfCatalogDictionary* asCatalogDictionary() {return this;} virtual const SkPdfCatalogDictionary* asCatalogDictionary() const {return this;} @@ -545,7 +545,7 @@ public: bool isPageLabelsANumber() const { SkPdfObject* ret = NULL; if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "PageLabels", "", &ret)) return false; - return ret->podofo()->GetDataType() == ePdfDataType_Real; + return ret->podofo()->GetDataType() == ePdfDataType_Real || ret->podofo()->GetDataType() == ePdfDataType_Number; } double getPageLabelsAsNumber() const { diff --git a/experimental/PdfViewer/SkPdfCcittfaxdecodeFilterDictionary_autogen.h b/experimental/PdfViewer/SkPdfCcittfaxdecodeFilterDictionary_autogen.h index 654874b1e5..f15c416bd3 100644 --- a/experimental/PdfViewer/SkPdfCcittfaxdecodeFilterDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCcittfaxdecodeFilterDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfCcittfaxdecodeFilterDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryCcittfaxdecodeFilterDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryCcittfaxdecodeFilterDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kCcittfaxdecodeFilterDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCcittfaxdecodeFilterDictionary_SkPdfObjectType + 1);} public: virtual SkPdfCcittfaxdecodeFilterDictionary* asCcittfaxdecodeFilterDictionary() {return this;} virtual const SkPdfCcittfaxdecodeFilterDictionary* asCcittfaxdecodeFilterDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfCheckboxFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfCheckboxFieldDictionary_autogen.h index 4b98d83f69..8db794b163 100644 --- a/experimental/PdfViewer/SkPdfCheckboxFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfCheckboxFieldDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfCheckboxFieldDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryCheckboxFieldDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryCheckboxFieldDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kCheckboxFieldDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kCheckboxFieldDictionary_SkPdfObjectType + 1);} public: virtual SkPdfCheckboxFieldDictionary* asCheckboxFieldDictionary() {return this;} virtual const SkPdfCheckboxFieldDictionary* asCheckboxFieldDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfChoiceFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfChoiceFieldDictionary_autogen.h index 0b1dc277e2..db22be5a1b 100644 --- a/experimental/PdfViewer/SkPdfChoiceFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfChoiceFieldDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfChoiceFieldDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryChoiceFieldDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryChoiceFieldDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kChoiceFieldDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kChoiceFieldDictionary_SkPdfObjectType + 1);} public: virtual SkPdfChoiceFieldDictionary* asChoiceFieldDictionary() {return this;} virtual const SkPdfChoiceFieldDictionary* asChoiceFieldDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfComponentsWithMetadataDictionary_autogen.h b/experimental/PdfViewer/SkPdfComponentsWithMetadataDictionary_autogen.h index b0823d4782..f433cde7e0 100644 --- a/experimental/PdfViewer/SkPdfComponentsWithMetadataDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfComponentsWithMetadataDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfComponentsWithMetadataDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryComponentsWithMetadataDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryComponentsWithMetadataDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kComponentsWithMetadataDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kComponentsWithMetadataDictionary_SkPdfObjectType + 1);} public: virtual SkPdfComponentsWithMetadataDictionary* asComponentsWithMetadataDictionary() {return this;} virtual const SkPdfComponentsWithMetadataDictionary* asComponentsWithMetadataDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfDctdecodeFilterDictionary_autogen.h b/experimental/PdfViewer/SkPdfDctdecodeFilterDictionary_autogen.h index 3e02e05ae6..f444ad6f75 100644 --- a/experimental/PdfViewer/SkPdfDctdecodeFilterDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDctdecodeFilterDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfDctdecodeFilterDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryDctdecodeFilterDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryDctdecodeFilterDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kDctdecodeFilterDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kDctdecodeFilterDictionary_SkPdfObjectType + 1);} public: virtual SkPdfDctdecodeFilterDictionary* asDctdecodeFilterDictionary() {return this;} virtual const SkPdfDctdecodeFilterDictionary* asDctdecodeFilterDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfDeviceNColorSpaceDictionary_autogen.h b/experimental/PdfViewer/SkPdfDeviceNColorSpaceDictionary_autogen.h index e46d150aed..bf2d3dc33e 100644 --- a/experimental/PdfViewer/SkPdfDeviceNColorSpaceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDeviceNColorSpaceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfDeviceNColorSpaceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryDeviceNColorSpaceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryDeviceNColorSpaceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kDeviceNColorSpaceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kDeviceNColorSpaceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfDeviceNColorSpaceDictionary* asDeviceNColorSpaceDictionary() {return this;} virtual const SkPdfDeviceNColorSpaceDictionary* asDeviceNColorSpaceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfDictionary_autogen.h b/experimental/PdfViewer/SkPdfDictionary_autogen.h index 3dee42a044..0fda48dd4b 100644 --- a/experimental/PdfViewer/SkPdfDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfDictionary : public SkPdfObject { public: - virtual SkPdfObjectType getType() const { return kObjectDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return kObjectDictionary__End_SkPdfObjectType;} + virtual SkPdfObjectType getType() const { return kDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return kDictionary__End_SkPdfObjectType;} public: virtual SkPdfDictionary* asDictionary() {return this;} virtual const SkPdfDictionary* asDictionary() const {return this;} @@ -20,28 +20,30 @@ private: virtual SkPdfBoolean* asBoolean() {return NULL;} virtual const SkPdfBoolean* asBoolean() const {return NULL;} - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - virtual SkPdfInteger* asInteger() {return NULL;} virtual const SkPdfInteger* asInteger() const {return NULL;} + virtual SkPdfNumber* asNumber() {return NULL;} + virtual const SkPdfNumber* asNumber() const {return NULL;} + virtual SkPdfName* asName() {return NULL;} virtual const SkPdfName* asName() const {return NULL;} virtual SkPdfNull* asNull() {return NULL;} virtual const SkPdfNull* asNull() const {return NULL;} - virtual SkPdfNumber* asNumber() {return NULL;} - virtual const SkPdfNumber* asNumber() const {return NULL;} - virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} + virtual SkPdfHexString* asHexString() {return NULL;} + virtual const SkPdfHexString* asHexString() const {return NULL;} + public: + const SkPdfObject get(const char* dictionaryKeyName) const {return SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));} + SkPdfObject get(const char* dictionaryKeyName) {return SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));} private: public: SkPdfDictionary(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfObject(podofoDoc, podofoObj) {} diff --git a/experimental/PdfViewer/SkPdfDocumentCatalogActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfDocumentCatalogActionsDictionary_autogen.h index e96940e078..0a02f88946 100644 --- a/experimental/PdfViewer/SkPdfDocumentCatalogActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDocumentCatalogActionsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfDocumentCatalogActionsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryDocumentCatalogActionsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryDocumentCatalogActionsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kDocumentCatalogActionsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kDocumentCatalogActionsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfDocumentCatalogActionsDictionary* asDocumentCatalogActionsDictionary() {return this;} virtual const SkPdfDocumentCatalogActionsDictionary* asDocumentCatalogActionsDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfDocumentInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfDocumentInformationDictionary_autogen.h index 3f86772913..c9cd146bbf 100644 --- a/experimental/PdfViewer/SkPdfDocumentInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfDocumentInformationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfDocumentInformationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryDocumentInformationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryDocumentInformationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kDocumentInformationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kDocumentInformationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfDocumentInformationDictionary* asDocumentInformationDictionary() {return this;} virtual const SkPdfDocumentInformationDictionary* asDocumentInformationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfEmbeddedFileParameterDictionary_autogen.h b/experimental/PdfViewer/SkPdfEmbeddedFileParameterDictionary_autogen.h index 31c215ddd5..58202bee9c 100644 --- a/experimental/PdfViewer/SkPdfEmbeddedFileParameterDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEmbeddedFileParameterDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfEmbeddedFileParameterDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryEmbeddedFileParameterDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryEmbeddedFileParameterDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kEmbeddedFileParameterDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kEmbeddedFileParameterDictionary_SkPdfObjectType + 1);} public: virtual SkPdfEmbeddedFileParameterDictionary* asEmbeddedFileParameterDictionary() {return this;} virtual const SkPdfEmbeddedFileParameterDictionary* asEmbeddedFileParameterDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfEmbeddedFileStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfEmbeddedFileStreamDictionary_autogen.h index 2318733ac7..6682e10062 100644 --- a/experimental/PdfViewer/SkPdfEmbeddedFileStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEmbeddedFileStreamDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfEmbeddedFileStreamDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryEmbeddedFileStreamDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryEmbeddedFileStreamDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kEmbeddedFileStreamDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kEmbeddedFileStreamDictionary_SkPdfObjectType + 1);} public: virtual SkPdfEmbeddedFileStreamDictionary* asEmbeddedFileStreamDictionary() {return this;} virtual const SkPdfEmbeddedFileStreamDictionary* asEmbeddedFileStreamDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfEmbeddedFontStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfEmbeddedFontStreamDictionary_autogen.h index 20dc1da16c..65eec117df 100644 --- a/experimental/PdfViewer/SkPdfEmbeddedFontStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEmbeddedFontStreamDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfEmbeddedFontStreamDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryEmbeddedFontStreamDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryEmbeddedFontStreamDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kEmbeddedFontStreamDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kEmbeddedFontStreamDictionary_SkPdfObjectType + 1);} public: virtual SkPdfEmbeddedFontStreamDictionary* asEmbeddedFontStreamDictionary() {return this;} virtual const SkPdfEmbeddedFontStreamDictionary* asEmbeddedFontStreamDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfEncodingDictionary_autogen.h b/experimental/PdfViewer/SkPdfEncodingDictionary_autogen.h index 62e1bf196e..0177d1a851 100644 --- a/experimental/PdfViewer/SkPdfEncodingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEncodingDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfEncodingDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryEncodingDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryEncodingDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kEncodingDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kEncodingDictionary_SkPdfObjectType + 1);} public: virtual SkPdfEncodingDictionary* asEncodingDictionary() {return this;} virtual const SkPdfEncodingDictionary* asEncodingDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h index ab56041e31..8fbd252764 100644 --- a/experimental/PdfViewer/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfEncryptedEmbeddedFileStreamDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryEncryptedEmbeddedFileStreamDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryEncryptedEmbeddedFileStreamDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kEncryptedEmbeddedFileStreamDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kEncryptedEmbeddedFileStreamDictionary_SkPdfObjectType + 1);} public: virtual SkPdfEncryptedEmbeddedFileStreamDictionary* asEncryptedEmbeddedFileStreamDictionary() {return this;} virtual const SkPdfEncryptedEmbeddedFileStreamDictionary* asEncryptedEmbeddedFileStreamDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfEncryptionCommonDictionary_autogen.h b/experimental/PdfViewer/SkPdfEncryptionCommonDictionary_autogen.h index f0421ff800..997bd668f5 100644 --- a/experimental/PdfViewer/SkPdfEncryptionCommonDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfEncryptionCommonDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfEncryptionCommonDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryEncryptionCommonDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryEncryptionCommonDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kEncryptionCommonDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kEncryptionCommonDictionary_SkPdfObjectType + 1);} public: virtual SkPdfEncryptionCommonDictionary* asEncryptionCommonDictionary() {return this;} virtual const SkPdfEncryptionCommonDictionary* asEncryptionCommonDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfEnums_autogen.h b/experimental/PdfViewer/SkPdfEnums_autogen.h index 732f057933..8c196421bd 100644 --- a/experimental/PdfViewer/SkPdfEnums_autogen.h +++ b/experimental/PdfViewer/SkPdfEnums_autogen.h @@ -3,188 +3,190 @@ enum SkPdfObjectType { kObject_SkPdfObjectType, - kObjectArray_SkPdfObjectType, - kObjectBoolean_SkPdfObjectType, - kObjectDictionary_SkPdfObjectType, - kObjectDictionaryALinkAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryActionDictionary_SkPdfObjectType, - kObjectDictionaryAlternateImageDictionary_SkPdfObjectType, - kObjectDictionaryAnnotationActionsDictionary_SkPdfObjectType, - kObjectDictionaryAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryAppearanceCharacteristicsDictionary_SkPdfObjectType, - kObjectDictionaryAppearanceDictionary_SkPdfObjectType, - kObjectDictionaryApplicationDataDictionary_SkPdfObjectType, - kObjectDictionaryArtifactsDictionary_SkPdfObjectType, - kObjectDictionaryAttributeObjectDictionary_SkPdfObjectType, - kObjectDictionaryBeadDictionary_SkPdfObjectType, - kObjectDictionaryBlockLevelStructureElementsDictionary_SkPdfObjectType, - kObjectDictionaryBorderStyleDictionary_SkPdfObjectType, - kObjectDictionaryBoxColorInformationDictionary_SkPdfObjectType, - kObjectDictionaryBoxStyleDictionary_SkPdfObjectType, - kObjectDictionaryCIDFontDescriptorDictionary_SkPdfObjectType, - kObjectDictionaryCIDSystemInfoDictionary_SkPdfObjectType, - kObjectDictionaryCMapDictionary_SkPdfObjectType, - kObjectDictionaryCalgrayColorSpaceDictionary_SkPdfObjectType, - kObjectDictionaryCalrgbColorSpaceDictionary_SkPdfObjectType, - kObjectDictionaryCatalogDictionary_SkPdfObjectType, - kObjectDictionaryCcittfaxdecodeFilterDictionary_SkPdfObjectType, - kObjectDictionaryCheckboxFieldDictionary_SkPdfObjectType, - kObjectDictionaryChoiceFieldDictionary_SkPdfObjectType, - kObjectDictionaryComponentsWithMetadataDictionary_SkPdfObjectType, - kObjectDictionaryDctdecodeFilterDictionary_SkPdfObjectType, - kObjectDictionaryDeviceNColorSpaceDictionary_SkPdfObjectType, - kObjectDictionaryDocumentCatalogActionsDictionary_SkPdfObjectType, - kObjectDictionaryDocumentInformationDictionary_SkPdfObjectType, - kObjectDictionaryEmbeddedFileParameterDictionary_SkPdfObjectType, - kObjectDictionaryEmbeddedFileStreamDictionary_SkPdfObjectType, - kObjectDictionaryEmbeddedFontStreamDictionary_SkPdfObjectType, - kObjectDictionaryEncodingDictionary_SkPdfObjectType, - kObjectDictionaryEncryptedEmbeddedFileStreamDictionary_SkPdfObjectType, - kObjectDictionaryEncryptionCommonDictionary_SkPdfObjectType, - kObjectDictionaryFDFCatalogDictionary_SkPdfObjectType, - kObjectDictionaryFDFDictionary_SkPdfObjectType, - kObjectDictionaryFDFFieldDictionary_SkPdfObjectType, - kObjectDictionaryFDFFileAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryFDFNamedPageReferenceDictionary_SkPdfObjectType, - kObjectDictionaryFDFPageDictionary_SkPdfObjectType, - kObjectDictionaryFDFTemplateDictionary_SkPdfObjectType, - kObjectDictionaryFDFTrailerDictionary_SkPdfObjectType, - kObjectDictionaryFieldDictionary_SkPdfObjectType, - kObjectDictionaryFileAttachmentAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryFileSpecificationDictionary_SkPdfObjectType, - kObjectDictionaryFileTrailerDictionary_SkPdfObjectType, - kObjectDictionaryFontDescriptorDictionary_SkPdfObjectType, - kObjectDictionaryFontDictionary_SkPdfObjectType, - kObjectDictionaryFontDictionaryCIDFontDictionary_SkPdfObjectType, - kObjectDictionaryFontDictionaryTrueTypeFontDictionary_SkPdfObjectType, - kObjectDictionaryFontDictionaryType0FontDictionary_SkPdfObjectType, - kObjectDictionaryFontDictionaryType1FontDictionary_SkPdfObjectType, - kObjectDictionaryFontDictionaryType1FontDictionaryMultiMasterFontDictionary_SkPdfObjectType, - kObjectDictionaryFontDictionaryType1FontDictionary__End_SkPdfObjectType, - kObjectDictionaryFontDictionaryType3FontDictionary_SkPdfObjectType, - kObjectDictionaryFontDictionary__End_SkPdfObjectType, - kObjectDictionaryFormFieldActionsDictionary_SkPdfObjectType, - kObjectDictionaryFreeTextAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryFunctionCommonDictionary_SkPdfObjectType, - kObjectDictionaryGoToActionDictionary_SkPdfObjectType, - kObjectDictionaryGraphicsStateDictionary_SkPdfObjectType, - kObjectDictionaryGroupAttributesDictionary_SkPdfObjectType, - kObjectDictionaryHideActionDictionary_SkPdfObjectType, - kObjectDictionaryIccProfileStreamDictionary_SkPdfObjectType, - kObjectDictionaryIconFitDictionary_SkPdfObjectType, - kObjectDictionaryImportDataActionDictionary_SkPdfObjectType, - kObjectDictionaryInkAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryInlineLevelStructureElementsDictionary_SkPdfObjectType, - kObjectDictionaryInteractiveFormDictionary_SkPdfObjectType, - kObjectDictionaryJavascriptActionDictionary_SkPdfObjectType, - kObjectDictionaryJavascriptDictionary_SkPdfObjectType, - kObjectDictionaryJbig2DecodeFilterDictionary_SkPdfObjectType, - kObjectDictionaryLabColorSpaceDictionary_SkPdfObjectType, - kObjectDictionaryLaunchActionDictionary_SkPdfObjectType, - kObjectDictionaryLineAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryListAttributeDictionary_SkPdfObjectType, - kObjectDictionaryLzwdecodeAndFlatedecodeFiltersDictionary_SkPdfObjectType, - kObjectDictionaryMacOsFileInformationDictionary_SkPdfObjectType, - kObjectDictionaryMarkInformationDictionary_SkPdfObjectType, - kObjectDictionaryMarkedContentReferenceDictionary_SkPdfObjectType, - kObjectDictionaryMarkupAnnotationsDictionary_SkPdfObjectType, - kObjectDictionaryMetadataStreamDictionary_SkPdfObjectType, - kObjectDictionaryMovieActionDictionary_SkPdfObjectType, - kObjectDictionaryMovieActivationDictionary_SkPdfObjectType, - kObjectDictionaryMovieAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryMovieDictionary_SkPdfObjectType, - kObjectDictionaryNameDictionary_SkPdfObjectType, - kObjectDictionaryNameTreeNodeDictionary_SkPdfObjectType, - kObjectDictionaryNamedActionsDictionary_SkPdfObjectType, - kObjectDictionaryNumberTreeNodeDictionary_SkPdfObjectType, - kObjectDictionaryObjectReferenceDictionary_SkPdfObjectType, - kObjectDictionaryOpiVersionDictionary_SkPdfObjectType, - kObjectDictionaryOutlineDictionary_SkPdfObjectType, - kObjectDictionaryOutlineItemDictionary_SkPdfObjectType, - kObjectDictionaryPDF_XOutputIntentDictionary_SkPdfObjectType, - kObjectDictionaryPSXobjectDictionary_SkPdfObjectType, - kObjectDictionaryPageLabelDictionary_SkPdfObjectType, - kObjectDictionaryPageObjectActionsDictionary_SkPdfObjectType, - kObjectDictionaryPageObjectDictionary_SkPdfObjectType, - kObjectDictionaryPagePieceDictionary_SkPdfObjectType, - kObjectDictionaryPageTreeNodeDictionary_SkPdfObjectType, - kObjectDictionaryPopUpAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryPrinterMarkAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryPrinterMarkFormDictionary_SkPdfObjectType, - kObjectDictionaryRadioButtonFieldDictionary_SkPdfObjectType, - kObjectDictionaryReferenceDictionary_SkPdfObjectType, - kObjectDictionaryRemoteGoToActionDictionary_SkPdfObjectType, - kObjectDictionaryResetFormActionDictionary_SkPdfObjectType, - kObjectDictionaryResourceDictionary_SkPdfObjectType, - kObjectDictionaryRubberStampAnnotationDictionary_SkPdfObjectType, - kObjectDictionarySeparationDictionary_SkPdfObjectType, - kObjectDictionaryShadingDictionary_SkPdfObjectType, - kObjectDictionaryShadingDictionaryType1ShadingDictionary_SkPdfObjectType, - kObjectDictionaryShadingDictionaryType2ShadingDictionary_SkPdfObjectType, - kObjectDictionaryShadingDictionaryType3ShadingDictionary_SkPdfObjectType, - kObjectDictionaryShadingDictionaryType4ShadingDictionary_SkPdfObjectType, - kObjectDictionaryShadingDictionaryType5ShadingDictionary_SkPdfObjectType, - kObjectDictionaryShadingDictionaryType6ShadingDictionary_SkPdfObjectType, - kObjectDictionaryShadingDictionary__End_SkPdfObjectType, - kObjectDictionarySignatureDictionary_SkPdfObjectType, - kObjectDictionarySoftMaskDictionary_SkPdfObjectType, - kObjectDictionarySoftMaskImageDictionary_SkPdfObjectType, - kObjectDictionarySoundActionDictionary_SkPdfObjectType, - kObjectDictionarySoundAnnotationDictionary_SkPdfObjectType, - kObjectDictionarySoundObjectDictionary_SkPdfObjectType, - kObjectDictionarySourceInformationDictionary_SkPdfObjectType, - kObjectDictionarySquareOrCircleAnnotation_SkPdfObjectType, - kObjectDictionaryStandardSecurityHandlerDictionary_SkPdfObjectType, - kObjectDictionaryStandardStructureDictionary_SkPdfObjectType, - kObjectDictionaryStreamCommonDictionary_SkPdfObjectType, - kObjectDictionaryStructureElementAccessDictionary_SkPdfObjectType, - kObjectDictionaryStructureElementDictionary_SkPdfObjectType, - kObjectDictionaryStructureTreeRootDictionary_SkPdfObjectType, - kObjectDictionarySubmitFormActionDictionary_SkPdfObjectType, - kObjectDictionaryTableAttributesDictionary_SkPdfObjectType, - kObjectDictionaryTextAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryTextFieldDictionary_SkPdfObjectType, - kObjectDictionaryThreadActionDictionary_SkPdfObjectType, - kObjectDictionaryThreadDictionary_SkPdfObjectType, - kObjectDictionaryTransitionDictionary_SkPdfObjectType, - kObjectDictionaryTransparencyGroupDictionary_SkPdfObjectType, - kObjectDictionaryTrapNetworkAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryTrapNetworkAppearanceStreamDictionary_SkPdfObjectType, - kObjectDictionaryType0FunctionDictionary_SkPdfObjectType, - kObjectDictionaryType10HalftoneDictionary_SkPdfObjectType, - kObjectDictionaryType16HalftoneDictionary_SkPdfObjectType, - kObjectDictionaryType1HalftoneDictionary_SkPdfObjectType, - kObjectDictionaryType1PatternDictionary_SkPdfObjectType, - kObjectDictionaryType2FunctionDictionary_SkPdfObjectType, - kObjectDictionaryType2PatternDictionary_SkPdfObjectType, - kObjectDictionaryType3FunctionDictionary_SkPdfObjectType, - kObjectDictionaryType5HalftoneDictionary_SkPdfObjectType, - kObjectDictionaryType6HalftoneDictionary_SkPdfObjectType, - kObjectDictionaryURIActionDictionary_SkPdfObjectType, - kObjectDictionaryURIDictionary_SkPdfObjectType, - kObjectDictionaryURLAliasDictionary_SkPdfObjectType, - kObjectDictionaryVariableTextFieldDictionary_SkPdfObjectType, - kObjectDictionaryViewerPreferencesDictionary_SkPdfObjectType, - kObjectDictionaryWebCaptureCommandDictionary_SkPdfObjectType, - kObjectDictionaryWebCaptureCommandSettingsDictionary_SkPdfObjectType, - kObjectDictionaryWebCaptureDictionary_SkPdfObjectType, - kObjectDictionaryWebCaptureImageSetDictionary_SkPdfObjectType, - kObjectDictionaryWebCaptureInformationDictionary_SkPdfObjectType, - kObjectDictionaryWebCapturePageSetDictionary_SkPdfObjectType, - kObjectDictionaryWidgetAnnotationDictionary_SkPdfObjectType, - kObjectDictionaryWindowsLaunchActionDictionary_SkPdfObjectType, - kObjectDictionaryXObjectDictionary_SkPdfObjectType, - kObjectDictionaryXObjectDictionaryImageDictionary_SkPdfObjectType, - kObjectDictionaryXObjectDictionaryType1FormDictionary_SkPdfObjectType, - kObjectDictionaryXObjectDictionary__End_SkPdfObjectType, - kObjectDictionary__End_SkPdfObjectType, - kObjectHexString_SkPdfObjectType, - kObjectInteger_SkPdfObjectType, - kObjectName_SkPdfObjectType, - kObjectNull_SkPdfObjectType, - kObjectNumber_SkPdfObjectType, - kObjectReference_SkPdfObjectType, - kObjectString_SkPdfObjectType, + kArray_SkPdfObjectType, + kBoolean_SkPdfObjectType, + kDictionary_SkPdfObjectType, + kALinkAnnotationDictionary_SkPdfObjectType, + kActionDictionary_SkPdfObjectType, + kAlternateImageDictionary_SkPdfObjectType, + kAnnotationActionsDictionary_SkPdfObjectType, + kAnnotationDictionary_SkPdfObjectType, + kAppearanceCharacteristicsDictionary_SkPdfObjectType, + kAppearanceDictionary_SkPdfObjectType, + kApplicationDataDictionary_SkPdfObjectType, + kArtifactsDictionary_SkPdfObjectType, + kAttributeObjectDictionary_SkPdfObjectType, + kBeadDictionary_SkPdfObjectType, + kBlockLevelStructureElementsDictionary_SkPdfObjectType, + kBorderStyleDictionary_SkPdfObjectType, + kBoxColorInformationDictionary_SkPdfObjectType, + kBoxStyleDictionary_SkPdfObjectType, + kCIDFontDescriptorDictionary_SkPdfObjectType, + kCIDSystemInfoDictionary_SkPdfObjectType, + kCMapDictionary_SkPdfObjectType, + kCalgrayColorSpaceDictionary_SkPdfObjectType, + kCalrgbColorSpaceDictionary_SkPdfObjectType, + kCatalogDictionary_SkPdfObjectType, + kCcittfaxdecodeFilterDictionary_SkPdfObjectType, + kCheckboxFieldDictionary_SkPdfObjectType, + kChoiceFieldDictionary_SkPdfObjectType, + kComponentsWithMetadataDictionary_SkPdfObjectType, + kDctdecodeFilterDictionary_SkPdfObjectType, + kDeviceNColorSpaceDictionary_SkPdfObjectType, + kDocumentCatalogActionsDictionary_SkPdfObjectType, + kDocumentInformationDictionary_SkPdfObjectType, + kEmbeddedFileParameterDictionary_SkPdfObjectType, + kEmbeddedFileStreamDictionary_SkPdfObjectType, + kEmbeddedFontStreamDictionary_SkPdfObjectType, + kEncodingDictionary_SkPdfObjectType, + kEncryptedEmbeddedFileStreamDictionary_SkPdfObjectType, + kEncryptionCommonDictionary_SkPdfObjectType, + kFDFCatalogDictionary_SkPdfObjectType, + kFDFDictionary_SkPdfObjectType, + kFDFFieldDictionary_SkPdfObjectType, + kFDFFileAnnotationDictionary_SkPdfObjectType, + kFDFNamedPageReferenceDictionary_SkPdfObjectType, + kFDFPageDictionary_SkPdfObjectType, + kFDFTemplateDictionary_SkPdfObjectType, + kFDFTrailerDictionary_SkPdfObjectType, + kFieldDictionary_SkPdfObjectType, + kFileAttachmentAnnotationDictionary_SkPdfObjectType, + kFileSpecificationDictionary_SkPdfObjectType, + kFileTrailerDictionary_SkPdfObjectType, + kFontDescriptorDictionary_SkPdfObjectType, + kFontDictionary_SkPdfObjectType, + kCIDFontDictionary_SkPdfObjectType, + kTrueTypeFontDictionary_SkPdfObjectType, + kType0FontDictionary_SkPdfObjectType, + kType1FontDictionary_SkPdfObjectType, + kMultiMasterFontDictionary_SkPdfObjectType, + kType1FontDictionary__End_SkPdfObjectType, + kType3FontDictionary_SkPdfObjectType, + kFontDictionary__End_SkPdfObjectType, + kFormFieldActionsDictionary_SkPdfObjectType, + kFreeTextAnnotationDictionary_SkPdfObjectType, + kFunctionCommonDictionary_SkPdfObjectType, + kGoToActionDictionary_SkPdfObjectType, + kGraphicsStateDictionary_SkPdfObjectType, + kGroupAttributesDictionary_SkPdfObjectType, + kHideActionDictionary_SkPdfObjectType, + kIccProfileStreamDictionary_SkPdfObjectType, + kIconFitDictionary_SkPdfObjectType, + kImportDataActionDictionary_SkPdfObjectType, + kInkAnnotationDictionary_SkPdfObjectType, + kInlineLevelStructureElementsDictionary_SkPdfObjectType, + kInteractiveFormDictionary_SkPdfObjectType, + kJavascriptActionDictionary_SkPdfObjectType, + kJavascriptDictionary_SkPdfObjectType, + kJbig2DecodeFilterDictionary_SkPdfObjectType, + kLabColorSpaceDictionary_SkPdfObjectType, + kLaunchActionDictionary_SkPdfObjectType, + kLineAnnotationDictionary_SkPdfObjectType, + kListAttributeDictionary_SkPdfObjectType, + kLzwdecodeAndFlatedecodeFiltersDictionary_SkPdfObjectType, + kMacOsFileInformationDictionary_SkPdfObjectType, + kMarkInformationDictionary_SkPdfObjectType, + kMarkedContentReferenceDictionary_SkPdfObjectType, + kMarkupAnnotationsDictionary_SkPdfObjectType, + kMetadataStreamDictionary_SkPdfObjectType, + kMovieActionDictionary_SkPdfObjectType, + kMovieActivationDictionary_SkPdfObjectType, + kMovieAnnotationDictionary_SkPdfObjectType, + kMovieDictionary_SkPdfObjectType, + kNameDictionary_SkPdfObjectType, + kNameTreeNodeDictionary_SkPdfObjectType, + kNamedActionsDictionary_SkPdfObjectType, + kNumberTreeNodeDictionary_SkPdfObjectType, + kObjectReferenceDictionary_SkPdfObjectType, + kOpiVersionDictionary_SkPdfObjectType, + kOutlineDictionary_SkPdfObjectType, + kOutlineItemDictionary_SkPdfObjectType, + kPDF_XOutputIntentDictionary_SkPdfObjectType, + kPSXobjectDictionary_SkPdfObjectType, + kPageLabelDictionary_SkPdfObjectType, + kPageObjectActionsDictionary_SkPdfObjectType, + kPageObjectDictionary_SkPdfObjectType, + kPagePieceDictionary_SkPdfObjectType, + kPageTreeNodeDictionary_SkPdfObjectType, + kPopUpAnnotationDictionary_SkPdfObjectType, + kPrinterMarkAnnotationDictionary_SkPdfObjectType, + kPrinterMarkFormDictionary_SkPdfObjectType, + kRadioButtonFieldDictionary_SkPdfObjectType, + kReferenceDictionary_SkPdfObjectType, + kRemoteGoToActionDictionary_SkPdfObjectType, + kResetFormActionDictionary_SkPdfObjectType, + kResourceDictionary_SkPdfObjectType, + kRubberStampAnnotationDictionary_SkPdfObjectType, + kSeparationDictionary_SkPdfObjectType, + kShadingDictionary_SkPdfObjectType, + kType1ShadingDictionary_SkPdfObjectType, + kType2ShadingDictionary_SkPdfObjectType, + kType3ShadingDictionary_SkPdfObjectType, + kType4ShadingDictionary_SkPdfObjectType, + kType5ShadingDictionary_SkPdfObjectType, + kType6ShadingDictionary_SkPdfObjectType, + kShadingDictionary__End_SkPdfObjectType, + kSignatureDictionary_SkPdfObjectType, + kSoftMaskDictionary_SkPdfObjectType, + kSoftMaskImageDictionary_SkPdfObjectType, + kSoundActionDictionary_SkPdfObjectType, + kSoundAnnotationDictionary_SkPdfObjectType, + kSoundObjectDictionary_SkPdfObjectType, + kSourceInformationDictionary_SkPdfObjectType, + kSquareOrCircleAnnotation_SkPdfObjectType, + kStandardSecurityHandlerDictionary_SkPdfObjectType, + kStandardStructureDictionary_SkPdfObjectType, + kStreamCommonDictionary_SkPdfObjectType, + kStructureElementAccessDictionary_SkPdfObjectType, + kStructureElementDictionary_SkPdfObjectType, + kStructureTreeRootDictionary_SkPdfObjectType, + kSubmitFormActionDictionary_SkPdfObjectType, + kTableAttributesDictionary_SkPdfObjectType, + kTextAnnotationDictionary_SkPdfObjectType, + kTextFieldDictionary_SkPdfObjectType, + kThreadActionDictionary_SkPdfObjectType, + kThreadDictionary_SkPdfObjectType, + kTransitionDictionary_SkPdfObjectType, + kTransparencyGroupDictionary_SkPdfObjectType, + kTrapNetworkAnnotationDictionary_SkPdfObjectType, + kTrapNetworkAppearanceStreamDictionary_SkPdfObjectType, + kType0FunctionDictionary_SkPdfObjectType, + kType10HalftoneDictionary_SkPdfObjectType, + kType16HalftoneDictionary_SkPdfObjectType, + kType1HalftoneDictionary_SkPdfObjectType, + kType1PatternDictionary_SkPdfObjectType, + kType2FunctionDictionary_SkPdfObjectType, + kType2PatternDictionary_SkPdfObjectType, + kType3FunctionDictionary_SkPdfObjectType, + kType5HalftoneDictionary_SkPdfObjectType, + kType6HalftoneDictionary_SkPdfObjectType, + kURIActionDictionary_SkPdfObjectType, + kURIDictionary_SkPdfObjectType, + kURLAliasDictionary_SkPdfObjectType, + kVariableTextFieldDictionary_SkPdfObjectType, + kViewerPreferencesDictionary_SkPdfObjectType, + kWebCaptureCommandDictionary_SkPdfObjectType, + kWebCaptureCommandSettingsDictionary_SkPdfObjectType, + kWebCaptureDictionary_SkPdfObjectType, + kWebCaptureImageSetDictionary_SkPdfObjectType, + kWebCaptureInformationDictionary_SkPdfObjectType, + kWebCapturePageSetDictionary_SkPdfObjectType, + kWidgetAnnotationDictionary_SkPdfObjectType, + kWindowsLaunchActionDictionary_SkPdfObjectType, + kXObjectDictionary_SkPdfObjectType, + kImageDictionary_SkPdfObjectType, + kType1FormDictionary_SkPdfObjectType, + kXObjectDictionary__End_SkPdfObjectType, + kDictionary__End_SkPdfObjectType, + kInteger_SkPdfObjectType, + kNumber_SkPdfObjectType, + kInteger__End_SkPdfObjectType, + kName_SkPdfObjectType, + kNull_SkPdfObjectType, + kReference_SkPdfObjectType, + kString_SkPdfObjectType, + kHexString_SkPdfObjectType, + kString__End_SkPdfObjectType, kObject__End_SkPdfObjectType, }; diff --git a/experimental/PdfViewer/SkPdfFDFCatalogDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFCatalogDictionary_autogen.h index 6848476520..b46859dff2 100644 --- a/experimental/PdfViewer/SkPdfFDFCatalogDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFCatalogDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFDFCatalogDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFDFCatalogDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFDFCatalogDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFDFCatalogDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFDFCatalogDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFDFCatalogDictionary* asFDFCatalogDictionary() {return this;} virtual const SkPdfFDFCatalogDictionary* asFDFCatalogDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFDFDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFDictionary_autogen.h index 76b18f72be..818889cde4 100644 --- a/experimental/PdfViewer/SkPdfFDFDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFDFDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFDFDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFDFDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFDFDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFDFDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFDFDictionary* asFDFDictionary() {return this;} virtual const SkPdfFDFDictionary* asFDFDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFDFFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFFieldDictionary_autogen.h index 4dfdf179c0..b4c0304736 100644 --- a/experimental/PdfViewer/SkPdfFDFFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFFieldDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFDFFieldDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFDFFieldDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFDFFieldDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFDFFieldDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFDFFieldDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFDFFieldDictionary* asFDFFieldDictionary() {return this;} virtual const SkPdfFDFFieldDictionary* asFDFFieldDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFDFFileAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFFileAnnotationDictionary_autogen.h index 2b086c7873..2511f969d9 100644 --- a/experimental/PdfViewer/SkPdfFDFFileAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFFileAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFDFFileAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFDFFileAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFDFFileAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFDFFileAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFDFFileAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFDFFileAnnotationDictionary* asFDFFileAnnotationDictionary() {return this;} virtual const SkPdfFDFFileAnnotationDictionary* asFDFFileAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFDFNamedPageReferenceDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFNamedPageReferenceDictionary_autogen.h index 91e34a0e28..b4ba87d718 100644 --- a/experimental/PdfViewer/SkPdfFDFNamedPageReferenceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFNamedPageReferenceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFDFNamedPageReferenceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFDFNamedPageReferenceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFDFNamedPageReferenceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFDFNamedPageReferenceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFDFNamedPageReferenceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFDFNamedPageReferenceDictionary* asFDFNamedPageReferenceDictionary() {return this;} virtual const SkPdfFDFNamedPageReferenceDictionary* asFDFNamedPageReferenceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFDFPageDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFPageDictionary_autogen.h index b39f62fa75..33daa802bd 100644 --- a/experimental/PdfViewer/SkPdfFDFPageDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFPageDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFDFPageDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFDFPageDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFDFPageDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFDFPageDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFDFPageDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFDFPageDictionary* asFDFPageDictionary() {return this;} virtual const SkPdfFDFPageDictionary* asFDFPageDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFDFTemplateDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFTemplateDictionary_autogen.h index c3437a7b01..7ba01b3797 100644 --- a/experimental/PdfViewer/SkPdfFDFTemplateDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFTemplateDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFDFTemplateDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFDFTemplateDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFDFTemplateDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFDFTemplateDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFDFTemplateDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFDFTemplateDictionary* asFDFTemplateDictionary() {return this;} virtual const SkPdfFDFTemplateDictionary* asFDFTemplateDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFDFTrailerDictionary_autogen.h b/experimental/PdfViewer/SkPdfFDFTrailerDictionary_autogen.h index 47ce18d020..3c29abe8f5 100644 --- a/experimental/PdfViewer/SkPdfFDFTrailerDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFDFTrailerDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFDFTrailerDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFDFTrailerDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFDFTrailerDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFDFTrailerDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFDFTrailerDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFDFTrailerDictionary* asFDFTrailerDictionary() {return this;} virtual const SkPdfFDFTrailerDictionary* asFDFTrailerDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfFieldDictionary_autogen.h index 641dae5639..5b8770af11 100644 --- a/experimental/PdfViewer/SkPdfFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFieldDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFieldDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFieldDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFieldDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFieldDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFieldDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFieldDictionary* asFieldDictionary() {return this;} virtual const SkPdfFieldDictionary* asFieldDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFileAttachmentAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfFileAttachmentAnnotationDictionary_autogen.h index b9c565381b..d484cc3fdf 100644 --- a/experimental/PdfViewer/SkPdfFileAttachmentAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFileAttachmentAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFileAttachmentAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFileAttachmentAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFileAttachmentAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFileAttachmentAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFileAttachmentAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFileAttachmentAnnotationDictionary* asFileAttachmentAnnotationDictionary() {return this;} virtual const SkPdfFileAttachmentAnnotationDictionary* asFileAttachmentAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFileSpecificationDictionary_autogen.h b/experimental/PdfViewer/SkPdfFileSpecificationDictionary_autogen.h index 553e79ea1c..eb78f5e843 100644 --- a/experimental/PdfViewer/SkPdfFileSpecificationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFileSpecificationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFileSpecificationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFileSpecificationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFileSpecificationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFileSpecificationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFileSpecificationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFileSpecificationDictionary* asFileSpecificationDictionary() {return this;} virtual const SkPdfFileSpecificationDictionary* asFileSpecificationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFileTrailerDictionary_autogen.h b/experimental/PdfViewer/SkPdfFileTrailerDictionary_autogen.h index 5a311846b6..1bfc2838ae 100644 --- a/experimental/PdfViewer/SkPdfFileTrailerDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFileTrailerDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFileTrailerDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFileTrailerDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFileTrailerDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFileTrailerDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFileTrailerDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFileTrailerDictionary* asFileTrailerDictionary() {return this;} virtual const SkPdfFileTrailerDictionary* asFileTrailerDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFontDescriptorDictionary_autogen.h b/experimental/PdfViewer/SkPdfFontDescriptorDictionary_autogen.h index 7cc7e18d33..64662b9691 100644 --- a/experimental/PdfViewer/SkPdfFontDescriptorDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFontDescriptorDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFontDescriptorDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFontDescriptorDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFontDescriptorDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFontDescriptorDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFontDescriptorDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFontDescriptorDictionary* asFontDescriptorDictionary() {return this;} virtual const SkPdfFontDescriptorDictionary* asFontDescriptorDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFontDictionary_autogen.h b/experimental/PdfViewer/SkPdfFontDictionary_autogen.h index 0c077533e3..a288a1f769 100644 --- a/experimental/PdfViewer/SkPdfFontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFontDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFontDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFontDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return kObjectDictionaryFontDictionary__End_SkPdfObjectType;} + virtual SkPdfObjectType getType() const { return kFontDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return kFontDictionary__End_SkPdfObjectType;} public: virtual SkPdfFontDictionary* asFontDictionary() {return this;} virtual const SkPdfFontDictionary* asFontDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFormFieldActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfFormFieldActionsDictionary_autogen.h index 8777bb5c3f..0b78bf7178 100644 --- a/experimental/PdfViewer/SkPdfFormFieldActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFormFieldActionsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFormFieldActionsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFormFieldActionsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFormFieldActionsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFormFieldActionsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFormFieldActionsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return this;} virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFreeTextAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfFreeTextAnnotationDictionary_autogen.h index 2bf7461fd7..d91fddb414 100644 --- a/experimental/PdfViewer/SkPdfFreeTextAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFreeTextAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFreeTextAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFreeTextAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFreeTextAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFreeTextAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFreeTextAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFreeTextAnnotationDictionary* asFreeTextAnnotationDictionary() {return this;} virtual const SkPdfFreeTextAnnotationDictionary* asFreeTextAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfFunctionCommonDictionary_autogen.h b/experimental/PdfViewer/SkPdfFunctionCommonDictionary_autogen.h index ec2cc44ca6..88c3eefd6d 100644 --- a/experimental/PdfViewer/SkPdfFunctionCommonDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfFunctionCommonDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfFunctionCommonDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFunctionCommonDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFunctionCommonDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kFunctionCommonDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kFunctionCommonDictionary_SkPdfObjectType + 1);} public: virtual SkPdfFunctionCommonDictionary* asFunctionCommonDictionary() {return this;} virtual const SkPdfFunctionCommonDictionary* asFunctionCommonDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfGoToActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfGoToActionDictionary_autogen.h index a0b15bbd55..62782a6171 100644 --- a/experimental/PdfViewer/SkPdfGoToActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfGoToActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfGoToActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryGoToActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryGoToActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kGoToActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kGoToActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfGoToActionDictionary* asGoToActionDictionary() {return this;} virtual const SkPdfGoToActionDictionary* asGoToActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfGraphicsStateDictionary_autogen.h b/experimental/PdfViewer/SkPdfGraphicsStateDictionary_autogen.h index be27b6df24..22da3fb9ca 100644 --- a/experimental/PdfViewer/SkPdfGraphicsStateDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfGraphicsStateDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfGraphicsStateDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryGraphicsStateDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryGraphicsStateDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kGraphicsStateDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kGraphicsStateDictionary_SkPdfObjectType + 1);} public: virtual SkPdfGraphicsStateDictionary* asGraphicsStateDictionary() {return this;} virtual const SkPdfGraphicsStateDictionary* asGraphicsStateDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfGroupAttributesDictionary_autogen.h b/experimental/PdfViewer/SkPdfGroupAttributesDictionary_autogen.h index 1e9020f8f7..b306a0de78 100644 --- a/experimental/PdfViewer/SkPdfGroupAttributesDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfGroupAttributesDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfGroupAttributesDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryGroupAttributesDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryGroupAttributesDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kGroupAttributesDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kGroupAttributesDictionary_SkPdfObjectType + 1);} public: virtual SkPdfGroupAttributesDictionary* asGroupAttributesDictionary() {return this;} virtual const SkPdfGroupAttributesDictionary* asGroupAttributesDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfHexString_autogen.h b/experimental/PdfViewer/SkPdfHexString_autogen.h index 7975ec8771..5792941300 100644 --- a/experimental/PdfViewer/SkPdfHexString_autogen.h +++ b/experimental/PdfViewer/SkPdfHexString_autogen.h @@ -3,550 +3,22 @@ #include "SkPdfEnums_autogen.h" #include "SkPdfArray_autogen.h" -#include "SkPdfObject_autogen.h" +#include "SkPdfString_autogen.h" -class SkPdfHexString : public SkPdfObject { +class SkPdfHexString : public SkPdfString { public: - virtual SkPdfObjectType getType() const { return kObjectHexString_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectHexString_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kHexString_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kHexString_SkPdfObjectType + 1);} public: virtual SkPdfHexString* asHexString() {return this;} virtual const SkPdfHexString* asHexString() const {return this;} private: - virtual SkPdfArray* asArray() {return NULL;} - virtual const SkPdfArray* asArray() const {return NULL;} - - virtual SkPdfBoolean* asBoolean() {return NULL;} - virtual const SkPdfBoolean* asBoolean() const {return NULL;} - - virtual SkPdfDictionary* asDictionary() {return NULL;} - virtual const SkPdfDictionary* asDictionary() const {return NULL;} - - 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 SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} - virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} - virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} - - virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} - virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} - - virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} - virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} - - virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} - virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} - - 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;} - - virtual SkPdfInteger* asInteger() {return NULL;} - virtual const SkPdfInteger* asInteger() const {return NULL;} - - virtual SkPdfName* asName() {return NULL;} - virtual const SkPdfName* asName() const {return NULL;} - - virtual SkPdfNull* asNull() {return NULL;} - virtual const SkPdfNull* asNull() const {return NULL;} - - virtual SkPdfNumber* asNumber() {return NULL;} - virtual const SkPdfNumber* asNumber() const {return NULL;} - - virtual SkPdfReference* asReference() {return NULL;} - virtual const SkPdfReference* asReference() const {return NULL;} - - virtual SkPdfString* asString() {return NULL;} - virtual const SkPdfString* asString() const {return NULL;} - public: const std::string& value() const {return fPodofoObj->GetString().GetStringUtf8();} private: public: - SkPdfHexString(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfObject(podofoDoc, podofoObj) {} + SkPdfHexString(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfString(podofoDoc, podofoObj) {} virtual bool valid() const {return true;} diff --git a/experimental/PdfViewer/SkPdfHideActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfHideActionDictionary_autogen.h index 8459a578f5..8c5d1c9bfe 100644 --- a/experimental/PdfViewer/SkPdfHideActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfHideActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfHideActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryHideActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryHideActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kHideActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kHideActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfHideActionDictionary* asHideActionDictionary() {return this;} virtual const SkPdfHideActionDictionary* asHideActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfIccProfileStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfIccProfileStreamDictionary_autogen.h index 9a66ebe5fb..0adceda5a1 100644 --- a/experimental/PdfViewer/SkPdfIccProfileStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfIccProfileStreamDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfIccProfileStreamDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryIccProfileStreamDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryIccProfileStreamDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kIccProfileStreamDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kIccProfileStreamDictionary_SkPdfObjectType + 1);} public: virtual SkPdfIccProfileStreamDictionary* asIccProfileStreamDictionary() {return this;} virtual const SkPdfIccProfileStreamDictionary* asIccProfileStreamDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfIconFitDictionary_autogen.h b/experimental/PdfViewer/SkPdfIconFitDictionary_autogen.h index aa7df7f457..af3d4b7e3f 100644 --- a/experimental/PdfViewer/SkPdfIconFitDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfIconFitDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfIconFitDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryIconFitDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryIconFitDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kIconFitDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kIconFitDictionary_SkPdfObjectType + 1);} public: virtual SkPdfIconFitDictionary* asIconFitDictionary() {return this;} virtual const SkPdfIconFitDictionary* asIconFitDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfImageDictionary_autogen.h b/experimental/PdfViewer/SkPdfImageDictionary_autogen.h index c1ca910749..07a3973a44 100644 --- a/experimental/PdfViewer/SkPdfImageDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfImageDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfImageDictionary : public SkPdfXObjectDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryXObjectDictionaryImageDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryXObjectDictionaryImageDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kImageDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kImageDictionary_SkPdfObjectType + 1);} public: virtual SkPdfImageDictionary* asImageDictionary() {return this;} virtual const SkPdfImageDictionary* asImageDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfImportDataActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfImportDataActionDictionary_autogen.h index 6cda9aed7d..f4d465b984 100644 --- a/experimental/PdfViewer/SkPdfImportDataActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfImportDataActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfImportDataActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryImportDataActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryImportDataActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kImportDataActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kImportDataActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfImportDataActionDictionary* asImportDataActionDictionary() {return this;} virtual const SkPdfImportDataActionDictionary* asImportDataActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfInkAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfInkAnnotationDictionary_autogen.h index 34dd4ad367..d6941e9266 100644 --- a/experimental/PdfViewer/SkPdfInkAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfInkAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfInkAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryInkAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryInkAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kInkAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kInkAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfInkAnnotationDictionary* asInkAnnotationDictionary() {return this;} virtual const SkPdfInkAnnotationDictionary* asInkAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfInlineLevelStructureElementsDictionary_autogen.h b/experimental/PdfViewer/SkPdfInlineLevelStructureElementsDictionary_autogen.h index 469208cc2c..b593beba18 100644 --- a/experimental/PdfViewer/SkPdfInlineLevelStructureElementsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfInlineLevelStructureElementsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfInlineLevelStructureElementsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryInlineLevelStructureElementsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryInlineLevelStructureElementsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kInlineLevelStructureElementsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kInlineLevelStructureElementsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfInlineLevelStructureElementsDictionary* asInlineLevelStructureElementsDictionary() {return this;} virtual const SkPdfInlineLevelStructureElementsDictionary* asInlineLevelStructureElementsDictionary() const {return this;} @@ -524,7 +524,7 @@ public: bool isLineHeightANumber() const { SkPdfObject* ret = NULL; if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "LineHeight", "", &ret)) return false; - return ret->podofo()->GetDataType() == ePdfDataType_Real; + return ret->podofo()->GetDataType() == ePdfDataType_Real || ret->podofo()->GetDataType() == ePdfDataType_Number; } double getLineHeightAsNumber() const { diff --git a/experimental/PdfViewer/SkPdfInteger_autogen.h b/experimental/PdfViewer/SkPdfInteger_autogen.h index 18813f8b25..7ccfa90031 100644 --- a/experimental/PdfViewer/SkPdfInteger_autogen.h +++ b/experimental/PdfViewer/SkPdfInteger_autogen.h @@ -7,8 +7,8 @@ class SkPdfInteger : public SkPdfObject { public: - virtual SkPdfObjectType getType() const { return kObjectInteger_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectInteger_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kInteger_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return kInteger__End_SkPdfObjectType;} public: virtual SkPdfInteger* asInteger() {return this;} virtual const SkPdfInteger* asInteger() const {return this;} @@ -524,24 +524,21 @@ private: virtual SkPdfType1FormDictionary* asType1FormDictionary() {return NULL;} virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return NULL;} - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - virtual SkPdfName* asName() {return NULL;} virtual const SkPdfName* asName() const {return NULL;} virtual SkPdfNull* asNull() {return NULL;} virtual const SkPdfNull* asNull() const {return NULL;} - virtual SkPdfNumber* asNumber() {return NULL;} - virtual const SkPdfNumber* asNumber() const {return NULL;} - virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} + virtual SkPdfHexString* asHexString() {return NULL;} + virtual const SkPdfHexString* asHexString() const {return NULL;} + public: long value() const {return fPodofoObj->GetNumber();} private: diff --git a/experimental/PdfViewer/SkPdfInteractiveFormDictionary_autogen.h b/experimental/PdfViewer/SkPdfInteractiveFormDictionary_autogen.h index 8ffecd8f7c..c9bdb58a35 100644 --- a/experimental/PdfViewer/SkPdfInteractiveFormDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfInteractiveFormDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfInteractiveFormDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryInteractiveFormDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryInteractiveFormDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kInteractiveFormDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kInteractiveFormDictionary_SkPdfObjectType + 1);} public: virtual SkPdfInteractiveFormDictionary* asInteractiveFormDictionary() {return this;} virtual const SkPdfInteractiveFormDictionary* asInteractiveFormDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfJavascriptActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfJavascriptActionDictionary_autogen.h index 5c6a7600ee..b711bf976a 100644 --- a/experimental/PdfViewer/SkPdfJavascriptActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfJavascriptActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfJavascriptActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryJavascriptActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryJavascriptActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kJavascriptActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kJavascriptActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfJavascriptActionDictionary* asJavascriptActionDictionary() {return this;} virtual const SkPdfJavascriptActionDictionary* asJavascriptActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfJavascriptDictionary_autogen.h b/experimental/PdfViewer/SkPdfJavascriptDictionary_autogen.h index c0e63881da..1660a05407 100644 --- a/experimental/PdfViewer/SkPdfJavascriptDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfJavascriptDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfJavascriptDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryJavascriptDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryJavascriptDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kJavascriptDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kJavascriptDictionary_SkPdfObjectType + 1);} public: virtual SkPdfJavascriptDictionary* asJavascriptDictionary() {return this;} virtual const SkPdfJavascriptDictionary* asJavascriptDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfJbig2DecodeFilterDictionary_autogen.h b/experimental/PdfViewer/SkPdfJbig2DecodeFilterDictionary_autogen.h index 288842c334..8cc72db275 100644 --- a/experimental/PdfViewer/SkPdfJbig2DecodeFilterDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfJbig2DecodeFilterDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfJbig2DecodeFilterDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryJbig2DecodeFilterDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryJbig2DecodeFilterDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kJbig2DecodeFilterDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kJbig2DecodeFilterDictionary_SkPdfObjectType + 1);} public: virtual SkPdfJbig2DecodeFilterDictionary* asJbig2DecodeFilterDictionary() {return this;} virtual const SkPdfJbig2DecodeFilterDictionary* asJbig2DecodeFilterDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfLabColorSpaceDictionary_autogen.h b/experimental/PdfViewer/SkPdfLabColorSpaceDictionary_autogen.h index aeb97d40b7..eaebf5c151 100644 --- a/experimental/PdfViewer/SkPdfLabColorSpaceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfLabColorSpaceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfLabColorSpaceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryLabColorSpaceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryLabColorSpaceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kLabColorSpaceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kLabColorSpaceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfLabColorSpaceDictionary* asLabColorSpaceDictionary() {return this;} virtual const SkPdfLabColorSpaceDictionary* asLabColorSpaceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfLaunchActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfLaunchActionDictionary_autogen.h index e4d47765fc..9128695673 100644 --- a/experimental/PdfViewer/SkPdfLaunchActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfLaunchActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfLaunchActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryLaunchActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryLaunchActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kLaunchActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kLaunchActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfLaunchActionDictionary* asLaunchActionDictionary() {return this;} virtual const SkPdfLaunchActionDictionary* asLaunchActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfLineAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfLineAnnotationDictionary_autogen.h index 9c0cb273d4..4c8595d042 100644 --- a/experimental/PdfViewer/SkPdfLineAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfLineAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfLineAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryLineAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryLineAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kLineAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kLineAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfLineAnnotationDictionary* asLineAnnotationDictionary() {return this;} virtual const SkPdfLineAnnotationDictionary* asLineAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfListAttributeDictionary_autogen.h b/experimental/PdfViewer/SkPdfListAttributeDictionary_autogen.h index 65689fab8d..e793fb7675 100644 --- a/experimental/PdfViewer/SkPdfListAttributeDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfListAttributeDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfListAttributeDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryListAttributeDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryListAttributeDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kListAttributeDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kListAttributeDictionary_SkPdfObjectType + 1);} public: virtual SkPdfListAttributeDictionary* asListAttributeDictionary() {return this;} virtual const SkPdfListAttributeDictionary* asListAttributeDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h b/experimental/PdfViewer/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h index cac000b108..587f0c0c51 100644 --- a/experimental/PdfViewer/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfLzwdecodeAndFlatedecodeFiltersDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryLzwdecodeAndFlatedecodeFiltersDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryLzwdecodeAndFlatedecodeFiltersDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kLzwdecodeAndFlatedecodeFiltersDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kLzwdecodeAndFlatedecodeFiltersDictionary_SkPdfObjectType + 1);} public: virtual SkPdfLzwdecodeAndFlatedecodeFiltersDictionary* asLzwdecodeAndFlatedecodeFiltersDictionary() {return this;} virtual const SkPdfLzwdecodeAndFlatedecodeFiltersDictionary* asLzwdecodeAndFlatedecodeFiltersDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMacOsFileInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfMacOsFileInformationDictionary_autogen.h index 79e5f40ede..6b7d13f6a4 100644 --- a/experimental/PdfViewer/SkPdfMacOsFileInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMacOsFileInformationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMacOsFileInformationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryMacOsFileInformationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryMacOsFileInformationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMacOsFileInformationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMacOsFileInformationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMacOsFileInformationDictionary* asMacOsFileInformationDictionary() {return this;} virtual const SkPdfMacOsFileInformationDictionary* asMacOsFileInformationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMarkInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfMarkInformationDictionary_autogen.h index 0e4488e728..6d5805d442 100644 --- a/experimental/PdfViewer/SkPdfMarkInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMarkInformationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMarkInformationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryMarkInformationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryMarkInformationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMarkInformationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMarkInformationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMarkInformationDictionary* asMarkInformationDictionary() {return this;} virtual const SkPdfMarkInformationDictionary* asMarkInformationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMarkedContentReferenceDictionary_autogen.h b/experimental/PdfViewer/SkPdfMarkedContentReferenceDictionary_autogen.h index 375e906b0c..5ab745bbc5 100644 --- a/experimental/PdfViewer/SkPdfMarkedContentReferenceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMarkedContentReferenceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMarkedContentReferenceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryMarkedContentReferenceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryMarkedContentReferenceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMarkedContentReferenceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMarkedContentReferenceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMarkedContentReferenceDictionary* asMarkedContentReferenceDictionary() {return this;} virtual const SkPdfMarkedContentReferenceDictionary* asMarkedContentReferenceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMarkupAnnotationsDictionary_autogen.h b/experimental/PdfViewer/SkPdfMarkupAnnotationsDictionary_autogen.h index dbf203225a..588891c419 100644 --- a/experimental/PdfViewer/SkPdfMarkupAnnotationsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMarkupAnnotationsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMarkupAnnotationsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryMarkupAnnotationsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryMarkupAnnotationsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMarkupAnnotationsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMarkupAnnotationsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMarkupAnnotationsDictionary* asMarkupAnnotationsDictionary() {return this;} virtual const SkPdfMarkupAnnotationsDictionary* asMarkupAnnotationsDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMetadataStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfMetadataStreamDictionary_autogen.h index d4dcbfd050..22a366298c 100644 --- a/experimental/PdfViewer/SkPdfMetadataStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMetadataStreamDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMetadataStreamDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryMetadataStreamDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryMetadataStreamDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMetadataStreamDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMetadataStreamDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMetadataStreamDictionary* asMetadataStreamDictionary() {return this;} virtual const SkPdfMetadataStreamDictionary* asMetadataStreamDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMovieActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfMovieActionDictionary_autogen.h index d5db718998..396cf1e160 100644 --- a/experimental/PdfViewer/SkPdfMovieActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMovieActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMovieActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryMovieActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryMovieActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMovieActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMovieActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMovieActionDictionary* asMovieActionDictionary() {return this;} virtual const SkPdfMovieActionDictionary* asMovieActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMovieActivationDictionary_autogen.h b/experimental/PdfViewer/SkPdfMovieActivationDictionary_autogen.h index 38b53ee42a..f07cc1a142 100644 --- a/experimental/PdfViewer/SkPdfMovieActivationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMovieActivationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMovieActivationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryMovieActivationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryMovieActivationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMovieActivationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMovieActivationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMovieActivationDictionary* asMovieActivationDictionary() {return this;} virtual const SkPdfMovieActivationDictionary* asMovieActivationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMovieAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfMovieAnnotationDictionary_autogen.h index 4a861dc3c2..012ed62123 100644 --- a/experimental/PdfViewer/SkPdfMovieAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMovieAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMovieAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryMovieAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryMovieAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMovieAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMovieAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMovieAnnotationDictionary* asMovieAnnotationDictionary() {return this;} virtual const SkPdfMovieAnnotationDictionary* asMovieAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMovieDictionary_autogen.h b/experimental/PdfViewer/SkPdfMovieDictionary_autogen.h index 7e0325dc87..a1a6135521 100644 --- a/experimental/PdfViewer/SkPdfMovieDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMovieDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMovieDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryMovieDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryMovieDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMovieDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMovieDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMovieDictionary* asMovieDictionary() {return this;} virtual const SkPdfMovieDictionary* asMovieDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfMultiMasterFontDictionary_autogen.h b/experimental/PdfViewer/SkPdfMultiMasterFontDictionary_autogen.h index 09de14cd5d..609e1586b4 100644 --- a/experimental/PdfViewer/SkPdfMultiMasterFontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfMultiMasterFontDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfMultiMasterFontDictionary : public SkPdfType1FontDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFontDictionaryType1FontDictionaryMultiMasterFontDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFontDictionaryType1FontDictionaryMultiMasterFontDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kMultiMasterFontDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kMultiMasterFontDictionary_SkPdfObjectType + 1);} public: virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return this;} virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfNameDictionary_autogen.h b/experimental/PdfViewer/SkPdfNameDictionary_autogen.h index 9f86776219..43d4ae28de 100644 --- a/experimental/PdfViewer/SkPdfNameDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfNameDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfNameDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryNameDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryNameDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kNameDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kNameDictionary_SkPdfObjectType + 1);} public: virtual SkPdfNameDictionary* asNameDictionary() {return this;} virtual const SkPdfNameDictionary* asNameDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfNameTreeNodeDictionary_autogen.h b/experimental/PdfViewer/SkPdfNameTreeNodeDictionary_autogen.h index 073c7df91c..1b412aa204 100644 --- a/experimental/PdfViewer/SkPdfNameTreeNodeDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfNameTreeNodeDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfNameTreeNodeDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryNameTreeNodeDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryNameTreeNodeDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kNameTreeNodeDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kNameTreeNodeDictionary_SkPdfObjectType + 1);} public: virtual SkPdfNameTreeNodeDictionary* asNameTreeNodeDictionary() {return this;} virtual const SkPdfNameTreeNodeDictionary* asNameTreeNodeDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfName_autogen.h b/experimental/PdfViewer/SkPdfName_autogen.h index 0133f4e2c1..66dac804d1 100644 --- a/experimental/PdfViewer/SkPdfName_autogen.h +++ b/experimental/PdfViewer/SkPdfName_autogen.h @@ -7,8 +7,8 @@ class SkPdfName : public SkPdfObject { public: - virtual SkPdfObjectType getType() const { return kObjectName_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectName_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kName_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kName_SkPdfObjectType + 1);} public: virtual SkPdfName* asName() {return this;} virtual const SkPdfName* asName() const {return this;} @@ -524,24 +524,24 @@ private: virtual SkPdfType1FormDictionary* asType1FormDictionary() {return NULL;} virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return NULL;} - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - virtual SkPdfInteger* asInteger() {return NULL;} virtual const SkPdfInteger* asInteger() const {return NULL;} - virtual SkPdfNull* asNull() {return NULL;} - virtual const SkPdfNull* asNull() const {return NULL;} - virtual SkPdfNumber* asNumber() {return NULL;} virtual const SkPdfNumber* asNumber() const {return NULL;} + virtual SkPdfNull* asNull() {return NULL;} + virtual const SkPdfNull* asNull() const {return NULL;} + virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} + virtual SkPdfHexString* asHexString() {return NULL;} + virtual const SkPdfHexString* asHexString() const {return NULL;} + public: const std::string& value() const {return fPodofoObj->GetName().GetName();} private: diff --git a/experimental/PdfViewer/SkPdfNamedActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfNamedActionsDictionary_autogen.h index 7ed80a9c25..73dd877444 100644 --- a/experimental/PdfViewer/SkPdfNamedActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfNamedActionsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfNamedActionsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryNamedActionsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryNamedActionsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kNamedActionsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kNamedActionsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfNamedActionsDictionary* asNamedActionsDictionary() {return this;} virtual const SkPdfNamedActionsDictionary* asNamedActionsDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfNull_autogen.h b/experimental/PdfViewer/SkPdfNull_autogen.h index 053661486f..d0e11a318a 100644 --- a/experimental/PdfViewer/SkPdfNull_autogen.h +++ b/experimental/PdfViewer/SkPdfNull_autogen.h @@ -7,8 +7,8 @@ class SkPdfNull : public SkPdfObject { public: - virtual SkPdfObjectType getType() const { return kObjectNull_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectNull_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kNull_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kNull_SkPdfObjectType + 1);} public: virtual SkPdfNull* asNull() {return this;} virtual const SkPdfNull* asNull() const {return this;} @@ -524,24 +524,24 @@ private: virtual SkPdfType1FormDictionary* asType1FormDictionary() {return NULL;} virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return NULL;} - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - virtual SkPdfInteger* asInteger() {return NULL;} virtual const SkPdfInteger* asInteger() const {return NULL;} - virtual SkPdfName* asName() {return NULL;} - virtual const SkPdfName* asName() const {return NULL;} - virtual SkPdfNumber* asNumber() {return NULL;} virtual const SkPdfNumber* asNumber() const {return NULL;} + virtual SkPdfName* asName() {return NULL;} + virtual const SkPdfName* asName() const {return NULL;} + virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} + virtual SkPdfHexString* asHexString() {return NULL;} + virtual const SkPdfHexString* asHexString() const {return NULL;} + public: private: public: diff --git a/experimental/PdfViewer/SkPdfNumberTreeNodeDictionary_autogen.h b/experimental/PdfViewer/SkPdfNumberTreeNodeDictionary_autogen.h index cb310c290d..b11ca9ba4d 100644 --- a/experimental/PdfViewer/SkPdfNumberTreeNodeDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfNumberTreeNodeDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfNumberTreeNodeDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryNumberTreeNodeDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryNumberTreeNodeDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kNumberTreeNodeDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kNumberTreeNodeDictionary_SkPdfObjectType + 1);} public: virtual SkPdfNumberTreeNodeDictionary* asNumberTreeNodeDictionary() {return this;} virtual const SkPdfNumberTreeNodeDictionary* asNumberTreeNodeDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfNumber_autogen.h b/experimental/PdfViewer/SkPdfNumber_autogen.h index 7cd6376bd6..68ae135941 100644 --- a/experimental/PdfViewer/SkPdfNumber_autogen.h +++ b/experimental/PdfViewer/SkPdfNumber_autogen.h @@ -3,550 +3,22 @@ #include "SkPdfEnums_autogen.h" #include "SkPdfArray_autogen.h" -#include "SkPdfObject_autogen.h" +#include "SkPdfInteger_autogen.h" -class SkPdfNumber : public SkPdfObject { +class SkPdfNumber : public SkPdfInteger { public: - virtual SkPdfObjectType getType() const { return kObjectNumber_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectNumber_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kNumber_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kNumber_SkPdfObjectType + 1);} public: virtual SkPdfNumber* asNumber() {return this;} virtual const SkPdfNumber* asNumber() const {return this;} private: - virtual SkPdfArray* asArray() {return NULL;} - virtual const SkPdfArray* asArray() const {return NULL;} - - virtual SkPdfBoolean* asBoolean() {return NULL;} - virtual const SkPdfBoolean* asBoolean() const {return NULL;} - - virtual SkPdfDictionary* asDictionary() {return NULL;} - virtual const SkPdfDictionary* asDictionary() const {return NULL;} - - 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 SkPdfCIDFontDictionary* asCIDFontDictionary() {return NULL;} - virtual const SkPdfCIDFontDictionary* asCIDFontDictionary() const {return NULL;} - - virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return NULL;} - virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return NULL;} - - virtual SkPdfType0FontDictionary* asType0FontDictionary() {return NULL;} - virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return NULL;} - - virtual SkPdfType1FontDictionary* asType1FontDictionary() {return NULL;} - virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return NULL;} - - virtual SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() {return NULL;} - virtual const SkPdfMultiMasterFontDictionary* asMultiMasterFontDictionary() const {return NULL;} - - virtual SkPdfType3FontDictionary* asType3FontDictionary() {return NULL;} - virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return NULL;} - - virtual SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() {return NULL;} - virtual const SkPdfFormFieldActionsDictionary* asFormFieldActionsDictionary() const {return NULL;} - - 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;} - - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - - virtual SkPdfInteger* asInteger() {return NULL;} - virtual const SkPdfInteger* asInteger() const {return NULL;} - - virtual SkPdfName* asName() {return NULL;} - virtual const SkPdfName* asName() const {return NULL;} - - virtual SkPdfNull* asNull() {return NULL;} - virtual const SkPdfNull* asNull() const {return NULL;} - - virtual SkPdfReference* asReference() {return NULL;} - virtual const SkPdfReference* asReference() const {return NULL;} - - virtual SkPdfString* asString() {return NULL;} - virtual const SkPdfString* asString() const {return NULL;} - public: double value() const {return fPodofoObj->GetReal();} private: public: - SkPdfNumber(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfObject(podofoDoc, podofoObj) {} + SkPdfNumber(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdfInteger(podofoDoc, podofoObj) {} virtual bool valid() const {return true;} diff --git a/experimental/PdfViewer/SkPdfObjectReferenceDictionary_autogen.h b/experimental/PdfViewer/SkPdfObjectReferenceDictionary_autogen.h index 6692f04003..a7369557e9 100644 --- a/experimental/PdfViewer/SkPdfObjectReferenceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfObjectReferenceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfObjectReferenceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryObjectReferenceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryObjectReferenceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kObjectReferenceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectReferenceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfObjectReferenceDictionary* asObjectReferenceDictionary() {return this;} virtual const SkPdfObjectReferenceDictionary* asObjectReferenceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfObject_autogen.h b/experimental/PdfViewer/SkPdfObject_autogen.h index e2c0a35da7..859a217acd 100644 --- a/experimental/PdfViewer/SkPdfObject_autogen.h +++ b/experimental/PdfViewer/SkPdfObject_autogen.h @@ -522,27 +522,27 @@ public: virtual SkPdfType1FormDictionary* asType1FormDictionary() {return NULL;} virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return NULL;} - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - virtual SkPdfInteger* asInteger() {return NULL;} virtual const SkPdfInteger* asInteger() const {return NULL;} + virtual SkPdfNumber* asNumber() {return NULL;} + virtual const SkPdfNumber* asNumber() const {return NULL;} + virtual SkPdfName* asName() {return NULL;} virtual const SkPdfName* asName() const {return NULL;} virtual SkPdfNull* asNull() {return NULL;} virtual const SkPdfNull* asNull() const {return NULL;} - virtual SkPdfNumber* asNumber() {return NULL;} - virtual const SkPdfNumber* asNumber() const {return NULL;} - virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} + virtual SkPdfHexString* asHexString() {return NULL;} + virtual const SkPdfHexString* asHexString() const {return NULL;} + public: private: protected: diff --git a/experimental/PdfViewer/SkPdfOpiVersionDictionary_autogen.h b/experimental/PdfViewer/SkPdfOpiVersionDictionary_autogen.h index b4ced9b212..8d5ebef069 100644 --- a/experimental/PdfViewer/SkPdfOpiVersionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfOpiVersionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfOpiVersionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryOpiVersionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryOpiVersionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kOpiVersionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kOpiVersionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfOpiVersionDictionary* asOpiVersionDictionary() {return this;} virtual const SkPdfOpiVersionDictionary* asOpiVersionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfOutlineDictionary_autogen.h b/experimental/PdfViewer/SkPdfOutlineDictionary_autogen.h index f41982eec6..2f1c007141 100644 --- a/experimental/PdfViewer/SkPdfOutlineDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfOutlineDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfOutlineDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryOutlineDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryOutlineDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kOutlineDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kOutlineDictionary_SkPdfObjectType + 1);} public: virtual SkPdfOutlineDictionary* asOutlineDictionary() {return this;} virtual const SkPdfOutlineDictionary* asOutlineDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfOutlineItemDictionary_autogen.h b/experimental/PdfViewer/SkPdfOutlineItemDictionary_autogen.h index 9294275e1e..1fc60b6280 100644 --- a/experimental/PdfViewer/SkPdfOutlineItemDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfOutlineItemDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfOutlineItemDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryOutlineItemDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryOutlineItemDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kOutlineItemDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kOutlineItemDictionary_SkPdfObjectType + 1);} public: virtual SkPdfOutlineItemDictionary* asOutlineItemDictionary() {return this;} virtual const SkPdfOutlineItemDictionary* asOutlineItemDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPDF_XOutputIntentDictionary_autogen.h b/experimental/PdfViewer/SkPdfPDF_XOutputIntentDictionary_autogen.h index 0285cc7c34..85b469c7db 100644 --- a/experimental/PdfViewer/SkPdfPDF_XOutputIntentDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPDF_XOutputIntentDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPDF_XOutputIntentDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPDF_XOutputIntentDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPDF_XOutputIntentDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPDF_XOutputIntentDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPDF_XOutputIntentDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPDF_XOutputIntentDictionary* asPDF_XOutputIntentDictionary() {return this;} virtual const SkPdfPDF_XOutputIntentDictionary* asPDF_XOutputIntentDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPSXobjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfPSXobjectDictionary_autogen.h index 514c7d8eee..157ff866bd 100644 --- a/experimental/PdfViewer/SkPdfPSXobjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPSXobjectDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPSXobjectDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPSXobjectDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPSXobjectDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPSXobjectDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPSXobjectDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPSXobjectDictionary* asPSXobjectDictionary() {return this;} virtual const SkPdfPSXobjectDictionary* asPSXobjectDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPageLabelDictionary_autogen.h b/experimental/PdfViewer/SkPdfPageLabelDictionary_autogen.h index 46414bfb00..b3189e1ae7 100644 --- a/experimental/PdfViewer/SkPdfPageLabelDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPageLabelDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPageLabelDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPageLabelDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPageLabelDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPageLabelDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPageLabelDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPageLabelDictionary* asPageLabelDictionary() {return this;} virtual const SkPdfPageLabelDictionary* asPageLabelDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPageObjectActionsDictionary_autogen.h b/experimental/PdfViewer/SkPdfPageObjectActionsDictionary_autogen.h index d9a5687ec2..0e306be9b0 100644 --- a/experimental/PdfViewer/SkPdfPageObjectActionsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPageObjectActionsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPageObjectActionsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPageObjectActionsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPageObjectActionsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPageObjectActionsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPageObjectActionsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPageObjectActionsDictionary* asPageObjectActionsDictionary() {return this;} virtual const SkPdfPageObjectActionsDictionary* asPageObjectActionsDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPageObjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfPageObjectDictionary_autogen.h index 6adf62ec26..2248835849 100644 --- a/experimental/PdfViewer/SkPdfPageObjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPageObjectDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPageObjectDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPageObjectDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPageObjectDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPageObjectDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPageObjectDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPageObjectDictionary* asPageObjectDictionary() {return this;} virtual const SkPdfPageObjectDictionary* asPageObjectDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPagePieceDictionary_autogen.h b/experimental/PdfViewer/SkPdfPagePieceDictionary_autogen.h index 40a10fb4d1..f2aec8f262 100644 --- a/experimental/PdfViewer/SkPdfPagePieceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPagePieceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPagePieceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPagePieceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPagePieceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPagePieceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPagePieceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPagePieceDictionary* asPagePieceDictionary() {return this;} virtual const SkPdfPagePieceDictionary* asPagePieceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPageTreeNodeDictionary_autogen.h b/experimental/PdfViewer/SkPdfPageTreeNodeDictionary_autogen.h index 6445496e46..d6cf2a0a97 100644 --- a/experimental/PdfViewer/SkPdfPageTreeNodeDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPageTreeNodeDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPageTreeNodeDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPageTreeNodeDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPageTreeNodeDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPageTreeNodeDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPageTreeNodeDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPageTreeNodeDictionary* asPageTreeNodeDictionary() {return this;} virtual const SkPdfPageTreeNodeDictionary* asPageTreeNodeDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPodofoMapper_autogen.h b/experimental/PdfViewer/SkPdfPodofoMapper_autogen.h index 6edf5ddd5b..533f6fecf9 100644 --- a/experimental/PdfViewer/SkPdfPodofoMapper_autogen.h +++ b/experimental/PdfViewer/SkPdfPodofoMapper_autogen.h @@ -14,11 +14,9 @@ public: if (map(podofoDoc, podofoObj, (SkPdfArray**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfBoolean**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfDictionary**)out)) return true; - if (map(podofoDoc, podofoObj, (SkPdfHexString**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfInteger**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfName**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfNull**)out)) return true; - if (map(podofoDoc, podofoObj, (SkPdfNumber**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfReference**)out)) return true; if (map(podofoDoc, podofoObj, (SkPdfString**)out)) return true; @@ -57,6 +55,7 @@ public: static bool map(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj, SkPdfInteger** out) { if (!isInteger(podofoDoc, podofoObj)) return false; + if (map(podofoDoc, podofoObj, (SkPdfNumber**)out)) return true; *out = new SkPdfInteger(&podofoDoc, &podofoObj); return true; @@ -117,6 +116,7 @@ public: static bool map(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj, SkPdfString** out) { if (!isString(podofoDoc, podofoObj)) return false; + if (map(podofoDoc, podofoObj, (SkPdfHexString**)out)) return true; *out = new SkPdfString(&podofoDoc, &podofoObj); return true; @@ -2330,11 +2330,11 @@ public: } static bool isInteger(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { - return podofoObj.GetDataType() == ePdfDataType_Number; + return podofoObj.GetDataType() == ePdfDataType_Number || podofoObj.GetDataType() == ePdfDataType_Real; } static bool isNumber(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { - return podofoObj.GetDataType() == ePdfDataType_Real; + return podofoObj.GetDataType() == ePdfDataType_Number || podofoObj.GetDataType() == ePdfDataType_Real; } static bool isName(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { @@ -2350,7 +2350,7 @@ public: } static bool isString(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { - return podofoObj.GetDataType() == ePdfDataType_String; + return podofoObj.GetDataType() == ePdfDataType_String || podofoObj.GetDataType() == ePdfDataType_HexString; } static bool isHexString(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) { diff --git a/experimental/PdfViewer/SkPdfPopUpAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfPopUpAnnotationDictionary_autogen.h index 58a230eb0d..843b57d2e3 100644 --- a/experimental/PdfViewer/SkPdfPopUpAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPopUpAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPopUpAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPopUpAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPopUpAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPopUpAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPopUpAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPopUpAnnotationDictionary* asPopUpAnnotationDictionary() {return this;} virtual const SkPdfPopUpAnnotationDictionary* asPopUpAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPrinterMarkAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfPrinterMarkAnnotationDictionary_autogen.h index 5b299cce5e..240802e3af 100644 --- a/experimental/PdfViewer/SkPdfPrinterMarkAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPrinterMarkAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPrinterMarkAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPrinterMarkAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPrinterMarkAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPrinterMarkAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPrinterMarkAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPrinterMarkAnnotationDictionary* asPrinterMarkAnnotationDictionary() {return this;} virtual const SkPdfPrinterMarkAnnotationDictionary* asPrinterMarkAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfPrinterMarkFormDictionary_autogen.h b/experimental/PdfViewer/SkPdfPrinterMarkFormDictionary_autogen.h index 2625a55f35..113359d41b 100644 --- a/experimental/PdfViewer/SkPdfPrinterMarkFormDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfPrinterMarkFormDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfPrinterMarkFormDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryPrinterMarkFormDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryPrinterMarkFormDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kPrinterMarkFormDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kPrinterMarkFormDictionary_SkPdfObjectType + 1);} public: virtual SkPdfPrinterMarkFormDictionary* asPrinterMarkFormDictionary() {return this;} virtual const SkPdfPrinterMarkFormDictionary* asPrinterMarkFormDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfRadioButtonFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfRadioButtonFieldDictionary_autogen.h index 6e4ffbd028..b0ccbb3331 100644 --- a/experimental/PdfViewer/SkPdfRadioButtonFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfRadioButtonFieldDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfRadioButtonFieldDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryRadioButtonFieldDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryRadioButtonFieldDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kRadioButtonFieldDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kRadioButtonFieldDictionary_SkPdfObjectType + 1);} public: virtual SkPdfRadioButtonFieldDictionary* asRadioButtonFieldDictionary() {return this;} virtual const SkPdfRadioButtonFieldDictionary* asRadioButtonFieldDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfReferenceDictionary_autogen.h b/experimental/PdfViewer/SkPdfReferenceDictionary_autogen.h index 85241faea6..33226c0271 100644 --- a/experimental/PdfViewer/SkPdfReferenceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfReferenceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfReferenceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryReferenceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryReferenceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kReferenceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kReferenceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfReferenceDictionary* asReferenceDictionary() {return this;} virtual const SkPdfReferenceDictionary* asReferenceDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfReference_autogen.h b/experimental/PdfViewer/SkPdfReference_autogen.h index f47891b391..629592890a 100644 --- a/experimental/PdfViewer/SkPdfReference_autogen.h +++ b/experimental/PdfViewer/SkPdfReference_autogen.h @@ -7,8 +7,8 @@ class SkPdfReference : public SkPdfObject { public: - virtual SkPdfObjectType getType() const { return kObjectReference_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectReference_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kReference_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kReference_SkPdfObjectType + 1);} public: virtual SkPdfReference* asReference() {return this;} virtual const SkPdfReference* asReference() const {return this;} @@ -524,24 +524,24 @@ private: virtual SkPdfType1FormDictionary* asType1FormDictionary() {return NULL;} virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return NULL;} - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - virtual SkPdfInteger* asInteger() {return NULL;} virtual const SkPdfInteger* asInteger() const {return NULL;} + virtual SkPdfNumber* asNumber() {return NULL;} + virtual const SkPdfNumber* asNumber() const {return NULL;} + virtual SkPdfName* asName() {return NULL;} virtual const SkPdfName* asName() const {return NULL;} virtual SkPdfNull* asNull() {return NULL;} virtual const SkPdfNull* asNull() const {return NULL;} - virtual SkPdfNumber* asNumber() {return NULL;} - virtual const SkPdfNumber* asNumber() const {return NULL;} - virtual SkPdfString* asString() {return NULL;} virtual const SkPdfString* asString() const {return NULL;} + virtual SkPdfHexString* asHexString() {return NULL;} + virtual const SkPdfHexString* asHexString() const {return NULL;} + public: private: public: diff --git a/experimental/PdfViewer/SkPdfRemoteGoToActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfRemoteGoToActionDictionary_autogen.h index 2a917e96a0..53ead2c452 100644 --- a/experimental/PdfViewer/SkPdfRemoteGoToActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfRemoteGoToActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfRemoteGoToActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryRemoteGoToActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryRemoteGoToActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kRemoteGoToActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kRemoteGoToActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfRemoteGoToActionDictionary* asRemoteGoToActionDictionary() {return this;} virtual const SkPdfRemoteGoToActionDictionary* asRemoteGoToActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfResetFormActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfResetFormActionDictionary_autogen.h index d5a38348a8..b454f09afb 100644 --- a/experimental/PdfViewer/SkPdfResetFormActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfResetFormActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfResetFormActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryResetFormActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryResetFormActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kResetFormActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kResetFormActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfResetFormActionDictionary* asResetFormActionDictionary() {return this;} virtual const SkPdfResetFormActionDictionary* asResetFormActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfResourceDictionary_autogen.h b/experimental/PdfViewer/SkPdfResourceDictionary_autogen.h index f3009c9216..4bb3c94c4b 100644 --- a/experimental/PdfViewer/SkPdfResourceDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfResourceDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfResourceDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryResourceDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryResourceDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kResourceDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kResourceDictionary_SkPdfObjectType + 1);} public: virtual SkPdfResourceDictionary* asResourceDictionary() {return this;} virtual const SkPdfResourceDictionary* asResourceDictionary() const {return this;} @@ -549,11 +549,11 @@ public: return NULL; } - SkPdfStream XObject() const { - SkPdfStream ret; - if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "XObject", "", &ret)) return ret; + SkPdfDictionary* XObject() const { + SkPdfDictionary* ret; + if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "XObject", "", &ret)) return ret; // TODO(edisonn): warn about missing required field, assert for known good pdfs - return SkPdfStream(); + return NULL; } SkPdfDictionary* Font() const { diff --git a/experimental/PdfViewer/SkPdfRubberStampAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfRubberStampAnnotationDictionary_autogen.h index ec0cdf1109..d578054021 100644 --- a/experimental/PdfViewer/SkPdfRubberStampAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfRubberStampAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfRubberStampAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryRubberStampAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryRubberStampAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kRubberStampAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kRubberStampAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfRubberStampAnnotationDictionary* asRubberStampAnnotationDictionary() {return this;} virtual const SkPdfRubberStampAnnotationDictionary* asRubberStampAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfSeparationDictionary_autogen.h b/experimental/PdfViewer/SkPdfSeparationDictionary_autogen.h index d2ec1b9855..28dccb1074 100644 --- a/experimental/PdfViewer/SkPdfSeparationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSeparationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfSeparationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySeparationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySeparationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSeparationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSeparationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfSeparationDictionary* asSeparationDictionary() {return this;} virtual const SkPdfSeparationDictionary* asSeparationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfShadingDictionary_autogen.h b/experimental/PdfViewer/SkPdfShadingDictionary_autogen.h index a741ae5281..cf0e871a57 100644 --- a/experimental/PdfViewer/SkPdfShadingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfShadingDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfShadingDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryShadingDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return kObjectDictionaryShadingDictionary__End_SkPdfObjectType;} + virtual SkPdfObjectType getType() const { return kShadingDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return kShadingDictionary__End_SkPdfObjectType;} public: virtual SkPdfShadingDictionary* asShadingDictionary() {return this;} virtual const SkPdfShadingDictionary* asShadingDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfSignatureDictionary_autogen.h b/experimental/PdfViewer/SkPdfSignatureDictionary_autogen.h index 03794178cc..80eb1926f0 100644 --- a/experimental/PdfViewer/SkPdfSignatureDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSignatureDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfSignatureDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySignatureDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySignatureDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSignatureDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSignatureDictionary_SkPdfObjectType + 1);} public: virtual SkPdfSignatureDictionary* asSignatureDictionary() {return this;} virtual const SkPdfSignatureDictionary* asSignatureDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfSoftMaskDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoftMaskDictionary_autogen.h index 5704af0b36..0b516b798c 100644 --- a/experimental/PdfViewer/SkPdfSoftMaskDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoftMaskDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfSoftMaskDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySoftMaskDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySoftMaskDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSoftMaskDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSoftMaskDictionary_SkPdfObjectType + 1);} public: virtual SkPdfSoftMaskDictionary* asSoftMaskDictionary() {return this;} virtual const SkPdfSoftMaskDictionary* asSoftMaskDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfSoftMaskImageDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoftMaskImageDictionary_autogen.h index 8d009a5d36..bc20f9dda5 100644 --- a/experimental/PdfViewer/SkPdfSoftMaskImageDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoftMaskImageDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfSoftMaskImageDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySoftMaskImageDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySoftMaskImageDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSoftMaskImageDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSoftMaskImageDictionary_SkPdfObjectType + 1);} public: virtual SkPdfSoftMaskImageDictionary* asSoftMaskImageDictionary() {return this;} virtual const SkPdfSoftMaskImageDictionary* asSoftMaskImageDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfSoundActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoundActionDictionary_autogen.h index a06f0aea10..2acc411f5e 100644 --- a/experimental/PdfViewer/SkPdfSoundActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoundActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfSoundActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySoundActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySoundActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSoundActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSoundActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfSoundActionDictionary* asSoundActionDictionary() {return this;} virtual const SkPdfSoundActionDictionary* asSoundActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfSoundAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoundAnnotationDictionary_autogen.h index f9909628da..84fbf464af 100644 --- a/experimental/PdfViewer/SkPdfSoundAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoundAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfSoundAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySoundAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySoundAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSoundAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSoundAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfSoundAnnotationDictionary* asSoundAnnotationDictionary() {return this;} virtual const SkPdfSoundAnnotationDictionary* asSoundAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfSoundObjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfSoundObjectDictionary_autogen.h index d910c5a598..0b71158e2c 100644 --- a/experimental/PdfViewer/SkPdfSoundObjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSoundObjectDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfSoundObjectDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySoundObjectDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySoundObjectDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSoundObjectDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSoundObjectDictionary_SkPdfObjectType + 1);} public: virtual SkPdfSoundObjectDictionary* asSoundObjectDictionary() {return this;} virtual const SkPdfSoundObjectDictionary* asSoundObjectDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfSourceInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfSourceInformationDictionary_autogen.h index a6660806fb..52d04be2b3 100644 --- a/experimental/PdfViewer/SkPdfSourceInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSourceInformationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfSourceInformationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySourceInformationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySourceInformationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSourceInformationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSourceInformationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfSourceInformationDictionary* asSourceInformationDictionary() {return this;} virtual const SkPdfSourceInformationDictionary* asSourceInformationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfSquareOrCircleAnnotation_autogen.h b/experimental/PdfViewer/SkPdfSquareOrCircleAnnotation_autogen.h index c7af9dd427..d135dd87ff 100644 --- a/experimental/PdfViewer/SkPdfSquareOrCircleAnnotation_autogen.h +++ b/experimental/PdfViewer/SkPdfSquareOrCircleAnnotation_autogen.h @@ -7,8 +7,8 @@ class SkPdfSquareOrCircleAnnotation : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySquareOrCircleAnnotation_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySquareOrCircleAnnotation_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSquareOrCircleAnnotation_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSquareOrCircleAnnotation_SkPdfObjectType + 1);} public: virtual SkPdfSquareOrCircleAnnotation* asSquareOrCircleAnnotation() {return this;} virtual const SkPdfSquareOrCircleAnnotation* asSquareOrCircleAnnotation() const {return this;} diff --git a/experimental/PdfViewer/SkPdfStandardSecurityHandlerDictionary_autogen.h b/experimental/PdfViewer/SkPdfStandardSecurityHandlerDictionary_autogen.h index bdcbceab0e..4537479bf1 100644 --- a/experimental/PdfViewer/SkPdfStandardSecurityHandlerDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStandardSecurityHandlerDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfStandardSecurityHandlerDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryStandardSecurityHandlerDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryStandardSecurityHandlerDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kStandardSecurityHandlerDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kStandardSecurityHandlerDictionary_SkPdfObjectType + 1);} public: virtual SkPdfStandardSecurityHandlerDictionary* asStandardSecurityHandlerDictionary() {return this;} virtual const SkPdfStandardSecurityHandlerDictionary* asStandardSecurityHandlerDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfStandardStructureDictionary_autogen.h b/experimental/PdfViewer/SkPdfStandardStructureDictionary_autogen.h index b087a119c6..eac8eefd9a 100644 --- a/experimental/PdfViewer/SkPdfStandardStructureDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStandardStructureDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfStandardStructureDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryStandardStructureDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryStandardStructureDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kStandardStructureDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kStandardStructureDictionary_SkPdfObjectType + 1);} public: virtual SkPdfStandardStructureDictionary* asStandardStructureDictionary() {return this;} virtual const SkPdfStandardStructureDictionary* asStandardStructureDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfStreamCommonDictionary_autogen.h b/experimental/PdfViewer/SkPdfStreamCommonDictionary_autogen.h index 7a0e869c2d..46afecf96e 100644 --- a/experimental/PdfViewer/SkPdfStreamCommonDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStreamCommonDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfStreamCommonDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryStreamCommonDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryStreamCommonDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kStreamCommonDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kStreamCommonDictionary_SkPdfObjectType + 1);} public: virtual SkPdfStreamCommonDictionary* asStreamCommonDictionary() {return this;} virtual const SkPdfStreamCommonDictionary* asStreamCommonDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfString_autogen.h b/experimental/PdfViewer/SkPdfString_autogen.h index c3314d5662..2d018101ce 100644 --- a/experimental/PdfViewer/SkPdfString_autogen.h +++ b/experimental/PdfViewer/SkPdfString_autogen.h @@ -7,8 +7,8 @@ class SkPdfString : public SkPdfObject { public: - virtual SkPdfObjectType getType() const { return kObjectString_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectString_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kString_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return kString__End_SkPdfObjectType;} public: virtual SkPdfString* asString() {return this;} virtual const SkPdfString* asString() const {return this;} @@ -524,21 +524,18 @@ private: virtual SkPdfType1FormDictionary* asType1FormDictionary() {return NULL;} virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return NULL;} - virtual SkPdfHexString* asHexString() {return NULL;} - virtual const SkPdfHexString* asHexString() const {return NULL;} - virtual SkPdfInteger* asInteger() {return NULL;} virtual const SkPdfInteger* asInteger() const {return NULL;} + virtual SkPdfNumber* asNumber() {return NULL;} + virtual const SkPdfNumber* asNumber() const {return NULL;} + virtual SkPdfName* asName() {return NULL;} virtual const SkPdfName* asName() const {return NULL;} virtual SkPdfNull* asNull() {return NULL;} virtual const SkPdfNull* asNull() const {return NULL;} - virtual SkPdfNumber* asNumber() {return NULL;} - virtual const SkPdfNumber* asNumber() const {return NULL;} - virtual SkPdfReference* asReference() {return NULL;} virtual const SkPdfReference* asReference() const {return NULL;} diff --git a/experimental/PdfViewer/SkPdfStructureElementAccessDictionary_autogen.h b/experimental/PdfViewer/SkPdfStructureElementAccessDictionary_autogen.h index b9b67bf50e..eccd07b9ce 100644 --- a/experimental/PdfViewer/SkPdfStructureElementAccessDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStructureElementAccessDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfStructureElementAccessDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryStructureElementAccessDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryStructureElementAccessDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kStructureElementAccessDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kStructureElementAccessDictionary_SkPdfObjectType + 1);} public: virtual SkPdfStructureElementAccessDictionary* asStructureElementAccessDictionary() {return this;} virtual const SkPdfStructureElementAccessDictionary* asStructureElementAccessDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfStructureElementDictionary_autogen.h b/experimental/PdfViewer/SkPdfStructureElementDictionary_autogen.h index 793924d473..bf46678735 100644 --- a/experimental/PdfViewer/SkPdfStructureElementDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStructureElementDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfStructureElementDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryStructureElementDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryStructureElementDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kStructureElementDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kStructureElementDictionary_SkPdfObjectType + 1);} public: virtual SkPdfStructureElementDictionary* asStructureElementDictionary() {return this;} virtual const SkPdfStructureElementDictionary* asStructureElementDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfStructureTreeRootDictionary_autogen.h b/experimental/PdfViewer/SkPdfStructureTreeRootDictionary_autogen.h index 692e4a1a6a..ee873e8a04 100644 --- a/experimental/PdfViewer/SkPdfStructureTreeRootDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfStructureTreeRootDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfStructureTreeRootDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryStructureTreeRootDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryStructureTreeRootDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kStructureTreeRootDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kStructureTreeRootDictionary_SkPdfObjectType + 1);} public: virtual SkPdfStructureTreeRootDictionary* asStructureTreeRootDictionary() {return this;} virtual const SkPdfStructureTreeRootDictionary* asStructureTreeRootDictionary() const {return this;} @@ -583,7 +583,7 @@ public: bool isParentTreeANumber() const { SkPdfObject* ret = NULL; if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ParentTree", "", &ret)) return false; - return ret->podofo()->GetDataType() == ePdfDataType_Real; + return ret->podofo()->GetDataType() == ePdfDataType_Real || ret->podofo()->GetDataType() == ePdfDataType_Number; } double getParentTreeAsNumber() const { diff --git a/experimental/PdfViewer/SkPdfSubmitFormActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfSubmitFormActionDictionary_autogen.h index e72acca161..99a0d52f45 100644 --- a/experimental/PdfViewer/SkPdfSubmitFormActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfSubmitFormActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfSubmitFormActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionarySubmitFormActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionarySubmitFormActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kSubmitFormActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kSubmitFormActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfSubmitFormActionDictionary* asSubmitFormActionDictionary() {return this;} virtual const SkPdfSubmitFormActionDictionary* asSubmitFormActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfTableAttributesDictionary_autogen.h b/experimental/PdfViewer/SkPdfTableAttributesDictionary_autogen.h index 057b7d7a1e..181d2bcec4 100644 --- a/experimental/PdfViewer/SkPdfTableAttributesDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTableAttributesDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfTableAttributesDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryTableAttributesDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryTableAttributesDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kTableAttributesDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kTableAttributesDictionary_SkPdfObjectType + 1);} public: virtual SkPdfTableAttributesDictionary* asTableAttributesDictionary() {return this;} virtual const SkPdfTableAttributesDictionary* asTableAttributesDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfTextAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfTextAnnotationDictionary_autogen.h index a7dab2cb8b..1a0908240e 100644 --- a/experimental/PdfViewer/SkPdfTextAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTextAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfTextAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryTextAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryTextAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kTextAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kTextAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfTextAnnotationDictionary* asTextAnnotationDictionary() {return this;} virtual const SkPdfTextAnnotationDictionary* asTextAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfTextFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfTextFieldDictionary_autogen.h index 05d4cc7d48..7334857d54 100644 --- a/experimental/PdfViewer/SkPdfTextFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTextFieldDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfTextFieldDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryTextFieldDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryTextFieldDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kTextFieldDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kTextFieldDictionary_SkPdfObjectType + 1);} public: virtual SkPdfTextFieldDictionary* asTextFieldDictionary() {return this;} virtual const SkPdfTextFieldDictionary* asTextFieldDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfThreadActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfThreadActionDictionary_autogen.h index 87ff0ae799..09a06e09d5 100644 --- a/experimental/PdfViewer/SkPdfThreadActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfThreadActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfThreadActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryThreadActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryThreadActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kThreadActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kThreadActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfThreadActionDictionary* asThreadActionDictionary() {return this;} virtual const SkPdfThreadActionDictionary* asThreadActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfThreadDictionary_autogen.h b/experimental/PdfViewer/SkPdfThreadDictionary_autogen.h index 7353218199..90f6f72686 100644 --- a/experimental/PdfViewer/SkPdfThreadDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfThreadDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfThreadDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryThreadDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryThreadDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kThreadDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kThreadDictionary_SkPdfObjectType + 1);} public: virtual SkPdfThreadDictionary* asThreadDictionary() {return this;} virtual const SkPdfThreadDictionary* asThreadDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfTransitionDictionary_autogen.h b/experimental/PdfViewer/SkPdfTransitionDictionary_autogen.h index c29b6c003b..9126265fb2 100644 --- a/experimental/PdfViewer/SkPdfTransitionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTransitionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfTransitionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryTransitionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryTransitionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kTransitionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kTransitionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfTransitionDictionary* asTransitionDictionary() {return this;} virtual const SkPdfTransitionDictionary* asTransitionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfTransparencyGroupDictionary_autogen.h b/experimental/PdfViewer/SkPdfTransparencyGroupDictionary_autogen.h index 087f560b28..5ce9781253 100644 --- a/experimental/PdfViewer/SkPdfTransparencyGroupDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTransparencyGroupDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfTransparencyGroupDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryTransparencyGroupDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryTransparencyGroupDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kTransparencyGroupDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kTransparencyGroupDictionary_SkPdfObjectType + 1);} public: virtual SkPdfTransparencyGroupDictionary* asTransparencyGroupDictionary() {return this;} virtual const SkPdfTransparencyGroupDictionary* asTransparencyGroupDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfTrapNetworkAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfTrapNetworkAnnotationDictionary_autogen.h index 5649d3f503..eb3dd68ccb 100644 --- a/experimental/PdfViewer/SkPdfTrapNetworkAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTrapNetworkAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfTrapNetworkAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryTrapNetworkAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryTrapNetworkAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kTrapNetworkAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kTrapNetworkAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfTrapNetworkAnnotationDictionary* asTrapNetworkAnnotationDictionary() {return this;} virtual const SkPdfTrapNetworkAnnotationDictionary* asTrapNetworkAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h b/experimental/PdfViewer/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h index 73e88ffd26..7d86089986 100644 --- a/experimental/PdfViewer/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfTrapNetworkAppearanceStreamDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryTrapNetworkAppearanceStreamDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryTrapNetworkAppearanceStreamDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kTrapNetworkAppearanceStreamDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kTrapNetworkAppearanceStreamDictionary_SkPdfObjectType + 1);} public: virtual SkPdfTrapNetworkAppearanceStreamDictionary* asTrapNetworkAppearanceStreamDictionary() {return this;} virtual const SkPdfTrapNetworkAppearanceStreamDictionary* asTrapNetworkAppearanceStreamDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfTrueTypeFontDictionary_autogen.h b/experimental/PdfViewer/SkPdfTrueTypeFontDictionary_autogen.h index 3a1ed1f6c3..5055165bb1 100644 --- a/experimental/PdfViewer/SkPdfTrueTypeFontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfTrueTypeFontDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfTrueTypeFontDictionary : public SkPdfFontDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFontDictionaryTrueTypeFontDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFontDictionaryTrueTypeFontDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kTrueTypeFontDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kTrueTypeFontDictionary_SkPdfObjectType + 1);} public: virtual SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() {return this;} virtual const SkPdfTrueTypeFontDictionary* asTrueTypeFontDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType0FontDictionary_autogen.h b/experimental/PdfViewer/SkPdfType0FontDictionary_autogen.h index 514e8d95de..75fb17e798 100644 --- a/experimental/PdfViewer/SkPdfType0FontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType0FontDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType0FontDictionary : public SkPdfFontDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFontDictionaryType0FontDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFontDictionaryType0FontDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType0FontDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType0FontDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType0FontDictionary* asType0FontDictionary() {return this;} virtual const SkPdfType0FontDictionary* asType0FontDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType0FunctionDictionary_autogen.h b/experimental/PdfViewer/SkPdfType0FunctionDictionary_autogen.h index 5d758d4791..19b9a4c00c 100644 --- a/experimental/PdfViewer/SkPdfType0FunctionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType0FunctionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType0FunctionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType0FunctionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType0FunctionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType0FunctionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType0FunctionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType0FunctionDictionary* asType0FunctionDictionary() {return this;} virtual const SkPdfType0FunctionDictionary* asType0FunctionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType10HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType10HalftoneDictionary_autogen.h index d4ee30863c..c8502e4085 100644 --- a/experimental/PdfViewer/SkPdfType10HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType10HalftoneDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType10HalftoneDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType10HalftoneDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType10HalftoneDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType10HalftoneDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType10HalftoneDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType10HalftoneDictionary* asType10HalftoneDictionary() {return this;} virtual const SkPdfType10HalftoneDictionary* asType10HalftoneDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType16HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType16HalftoneDictionary_autogen.h index 9d6c77d91a..352b984c0a 100644 --- a/experimental/PdfViewer/SkPdfType16HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType16HalftoneDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType16HalftoneDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType16HalftoneDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType16HalftoneDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType16HalftoneDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType16HalftoneDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType16HalftoneDictionary* asType16HalftoneDictionary() {return this;} virtual const SkPdfType16HalftoneDictionary* asType16HalftoneDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType1FontDictionary_autogen.h b/experimental/PdfViewer/SkPdfType1FontDictionary_autogen.h index 07d11961f6..1373022bb6 100644 --- a/experimental/PdfViewer/SkPdfType1FontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType1FontDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType1FontDictionary : public SkPdfFontDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFontDictionaryType1FontDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return kObjectDictionaryFontDictionaryType1FontDictionary__End_SkPdfObjectType;} + virtual SkPdfObjectType getType() const { return kType1FontDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return kType1FontDictionary__End_SkPdfObjectType;} public: virtual SkPdfType1FontDictionary* asType1FontDictionary() {return this;} virtual const SkPdfType1FontDictionary* asType1FontDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType1FormDictionary_autogen.h b/experimental/PdfViewer/SkPdfType1FormDictionary_autogen.h index d910e8ef1a..089de9e21f 100644 --- a/experimental/PdfViewer/SkPdfType1FormDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType1FormDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType1FormDictionary : public SkPdfXObjectDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryXObjectDictionaryType1FormDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryXObjectDictionaryType1FormDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType1FormDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType1FormDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType1FormDictionary* asType1FormDictionary() {return this;} virtual const SkPdfType1FormDictionary* asType1FormDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType1HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType1HalftoneDictionary_autogen.h index 438f8b311b..5431eda95d 100644 --- a/experimental/PdfViewer/SkPdfType1HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType1HalftoneDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType1HalftoneDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType1HalftoneDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType1HalftoneDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType1HalftoneDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType1HalftoneDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType1HalftoneDictionary* asType1HalftoneDictionary() {return this;} virtual const SkPdfType1HalftoneDictionary* asType1HalftoneDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType1PatternDictionary_autogen.h b/experimental/PdfViewer/SkPdfType1PatternDictionary_autogen.h index 6cd8a7573e..65f31b7376 100644 --- a/experimental/PdfViewer/SkPdfType1PatternDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType1PatternDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType1PatternDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType1PatternDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType1PatternDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType1PatternDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType1PatternDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType1PatternDictionary* asType1PatternDictionary() {return this;} virtual const SkPdfType1PatternDictionary* asType1PatternDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType1ShadingDictionary_autogen.h b/experimental/PdfViewer/SkPdfType1ShadingDictionary_autogen.h index f6e7abcc6c..1ae12a1650 100644 --- a/experimental/PdfViewer/SkPdfType1ShadingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType1ShadingDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType1ShadingDictionary : public SkPdfShadingDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryShadingDictionaryType1ShadingDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryShadingDictionaryType1ShadingDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType1ShadingDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType1ShadingDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType1ShadingDictionary* asType1ShadingDictionary() {return this;} virtual const SkPdfType1ShadingDictionary* asType1ShadingDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType2FunctionDictionary_autogen.h b/experimental/PdfViewer/SkPdfType2FunctionDictionary_autogen.h index 5466e522b6..1997355cbc 100644 --- a/experimental/PdfViewer/SkPdfType2FunctionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType2FunctionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType2FunctionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType2FunctionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType2FunctionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType2FunctionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType2FunctionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType2FunctionDictionary* asType2FunctionDictionary() {return this;} virtual const SkPdfType2FunctionDictionary* asType2FunctionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType2PatternDictionary_autogen.h b/experimental/PdfViewer/SkPdfType2PatternDictionary_autogen.h index 8699b2d555..08004f222b 100644 --- a/experimental/PdfViewer/SkPdfType2PatternDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType2PatternDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType2PatternDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType2PatternDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType2PatternDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType2PatternDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType2PatternDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType2PatternDictionary* asType2PatternDictionary() {return this;} virtual const SkPdfType2PatternDictionary* asType2PatternDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType2ShadingDictionary_autogen.h b/experimental/PdfViewer/SkPdfType2ShadingDictionary_autogen.h index a2d8929e4e..7a6a706f64 100644 --- a/experimental/PdfViewer/SkPdfType2ShadingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType2ShadingDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType2ShadingDictionary : public SkPdfShadingDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryShadingDictionaryType2ShadingDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryShadingDictionaryType2ShadingDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType2ShadingDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType2ShadingDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType2ShadingDictionary* asType2ShadingDictionary() {return this;} virtual const SkPdfType2ShadingDictionary* asType2ShadingDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType3FontDictionary_autogen.h b/experimental/PdfViewer/SkPdfType3FontDictionary_autogen.h index 4673c0e33f..e50b6a4d32 100644 --- a/experimental/PdfViewer/SkPdfType3FontDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType3FontDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType3FontDictionary : public SkPdfFontDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryFontDictionaryType3FontDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryFontDictionaryType3FontDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType3FontDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType3FontDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType3FontDictionary* asType3FontDictionary() {return this;} virtual const SkPdfType3FontDictionary* asType3FontDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType3FunctionDictionary_autogen.h b/experimental/PdfViewer/SkPdfType3FunctionDictionary_autogen.h index 4d59f231d8..d58950d597 100644 --- a/experimental/PdfViewer/SkPdfType3FunctionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType3FunctionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType3FunctionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType3FunctionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType3FunctionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType3FunctionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType3FunctionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType3FunctionDictionary* asType3FunctionDictionary() {return this;} virtual const SkPdfType3FunctionDictionary* asType3FunctionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType3ShadingDictionary_autogen.h b/experimental/PdfViewer/SkPdfType3ShadingDictionary_autogen.h index 1e1c8218fe..00642c2737 100644 --- a/experimental/PdfViewer/SkPdfType3ShadingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType3ShadingDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType3ShadingDictionary : public SkPdfShadingDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryShadingDictionaryType3ShadingDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryShadingDictionaryType3ShadingDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType3ShadingDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType3ShadingDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType3ShadingDictionary* asType3ShadingDictionary() {return this;} virtual const SkPdfType3ShadingDictionary* asType3ShadingDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType4ShadingDictionary_autogen.h b/experimental/PdfViewer/SkPdfType4ShadingDictionary_autogen.h index defff8dbf4..6b0f1a3d66 100644 --- a/experimental/PdfViewer/SkPdfType4ShadingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType4ShadingDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType4ShadingDictionary : public SkPdfShadingDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryShadingDictionaryType4ShadingDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryShadingDictionaryType4ShadingDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType4ShadingDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType4ShadingDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType4ShadingDictionary* asType4ShadingDictionary() {return this;} virtual const SkPdfType4ShadingDictionary* asType4ShadingDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType5HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType5HalftoneDictionary_autogen.h index 3e26bc57b5..648d3750e1 100644 --- a/experimental/PdfViewer/SkPdfType5HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType5HalftoneDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType5HalftoneDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType5HalftoneDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType5HalftoneDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType5HalftoneDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType5HalftoneDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType5HalftoneDictionary* asType5HalftoneDictionary() {return this;} virtual const SkPdfType5HalftoneDictionary* asType5HalftoneDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType5ShadingDictionary_autogen.h b/experimental/PdfViewer/SkPdfType5ShadingDictionary_autogen.h index ead37dd466..102a13e2b4 100644 --- a/experimental/PdfViewer/SkPdfType5ShadingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType5ShadingDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType5ShadingDictionary : public SkPdfShadingDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryShadingDictionaryType5ShadingDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryShadingDictionaryType5ShadingDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType5ShadingDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType5ShadingDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType5ShadingDictionary* asType5ShadingDictionary() {return this;} virtual const SkPdfType5ShadingDictionary* asType5ShadingDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType6HalftoneDictionary_autogen.h b/experimental/PdfViewer/SkPdfType6HalftoneDictionary_autogen.h index 1d1df92849..22a1b80486 100644 --- a/experimental/PdfViewer/SkPdfType6HalftoneDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType6HalftoneDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType6HalftoneDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryType6HalftoneDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryType6HalftoneDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType6HalftoneDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType6HalftoneDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType6HalftoneDictionary* asType6HalftoneDictionary() {return this;} virtual const SkPdfType6HalftoneDictionary* asType6HalftoneDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfType6ShadingDictionary_autogen.h b/experimental/PdfViewer/SkPdfType6ShadingDictionary_autogen.h index 8ef3829667..4ada31d869 100644 --- a/experimental/PdfViewer/SkPdfType6ShadingDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfType6ShadingDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfType6ShadingDictionary : public SkPdfShadingDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryShadingDictionaryType6ShadingDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryShadingDictionaryType6ShadingDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kType6ShadingDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kType6ShadingDictionary_SkPdfObjectType + 1);} public: virtual SkPdfType6ShadingDictionary* asType6ShadingDictionary() {return this;} virtual const SkPdfType6ShadingDictionary* asType6ShadingDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfURIActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfURIActionDictionary_autogen.h index 8ce55e6051..104b141c32 100644 --- a/experimental/PdfViewer/SkPdfURIActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfURIActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfURIActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryURIActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryURIActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kURIActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kURIActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfURIActionDictionary* asURIActionDictionary() {return this;} virtual const SkPdfURIActionDictionary* asURIActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfURIDictionary_autogen.h b/experimental/PdfViewer/SkPdfURIDictionary_autogen.h index feee61e26b..1b282fa1c0 100644 --- a/experimental/PdfViewer/SkPdfURIDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfURIDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfURIDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryURIDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryURIDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kURIDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kURIDictionary_SkPdfObjectType + 1);} public: virtual SkPdfURIDictionary* asURIDictionary() {return this;} virtual const SkPdfURIDictionary* asURIDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfURLAliasDictionary_autogen.h b/experimental/PdfViewer/SkPdfURLAliasDictionary_autogen.h index 41c8214d2c..2323bcbb99 100644 --- a/experimental/PdfViewer/SkPdfURLAliasDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfURLAliasDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfURLAliasDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryURLAliasDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryURLAliasDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kURLAliasDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kURLAliasDictionary_SkPdfObjectType + 1);} public: virtual SkPdfURLAliasDictionary* asURLAliasDictionary() {return this;} virtual const SkPdfURLAliasDictionary* asURLAliasDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfVariableTextFieldDictionary_autogen.h b/experimental/PdfViewer/SkPdfVariableTextFieldDictionary_autogen.h index 4c2070fb3b..1637098378 100644 --- a/experimental/PdfViewer/SkPdfVariableTextFieldDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfVariableTextFieldDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfVariableTextFieldDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryVariableTextFieldDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryVariableTextFieldDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kVariableTextFieldDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kVariableTextFieldDictionary_SkPdfObjectType + 1);} public: virtual SkPdfVariableTextFieldDictionary* asVariableTextFieldDictionary() {return this;} virtual const SkPdfVariableTextFieldDictionary* asVariableTextFieldDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfViewerPreferencesDictionary_autogen.h b/experimental/PdfViewer/SkPdfViewerPreferencesDictionary_autogen.h index 496f6c7886..74a773f65c 100644 --- a/experimental/PdfViewer/SkPdfViewerPreferencesDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfViewerPreferencesDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfViewerPreferencesDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryViewerPreferencesDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryViewerPreferencesDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kViewerPreferencesDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kViewerPreferencesDictionary_SkPdfObjectType + 1);} public: virtual SkPdfViewerPreferencesDictionary* asViewerPreferencesDictionary() {return this;} virtual const SkPdfViewerPreferencesDictionary* asViewerPreferencesDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfWebCaptureCommandDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureCommandDictionary_autogen.h index a5d2ae9487..0f8d4d5296 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureCommandDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureCommandDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfWebCaptureCommandDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryWebCaptureCommandDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryWebCaptureCommandDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kWebCaptureCommandDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kWebCaptureCommandDictionary_SkPdfObjectType + 1);} public: virtual SkPdfWebCaptureCommandDictionary* asWebCaptureCommandDictionary() {return this;} virtual const SkPdfWebCaptureCommandDictionary* asWebCaptureCommandDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfWebCaptureCommandSettingsDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureCommandSettingsDictionary_autogen.h index 36deedc341..ca953189ed 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureCommandSettingsDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureCommandSettingsDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfWebCaptureCommandSettingsDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryWebCaptureCommandSettingsDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryWebCaptureCommandSettingsDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kWebCaptureCommandSettingsDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kWebCaptureCommandSettingsDictionary_SkPdfObjectType + 1);} public: virtual SkPdfWebCaptureCommandSettingsDictionary* asWebCaptureCommandSettingsDictionary() {return this;} virtual const SkPdfWebCaptureCommandSettingsDictionary* asWebCaptureCommandSettingsDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfWebCaptureDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureDictionary_autogen.h index c7a5e55732..fa77815234 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfWebCaptureDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryWebCaptureDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryWebCaptureDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kWebCaptureDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kWebCaptureDictionary_SkPdfObjectType + 1);} public: virtual SkPdfWebCaptureDictionary* asWebCaptureDictionary() {return this;} virtual const SkPdfWebCaptureDictionary* asWebCaptureDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfWebCaptureImageSetDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureImageSetDictionary_autogen.h index d01c28ff3d..d8ee276beb 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureImageSetDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureImageSetDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfWebCaptureImageSetDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryWebCaptureImageSetDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryWebCaptureImageSetDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kWebCaptureImageSetDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kWebCaptureImageSetDictionary_SkPdfObjectType + 1);} public: virtual SkPdfWebCaptureImageSetDictionary* asWebCaptureImageSetDictionary() {return this;} virtual const SkPdfWebCaptureImageSetDictionary* asWebCaptureImageSetDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfWebCaptureInformationDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCaptureInformationDictionary_autogen.h index 57b40bb912..13a1c1ea94 100644 --- a/experimental/PdfViewer/SkPdfWebCaptureInformationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCaptureInformationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfWebCaptureInformationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryWebCaptureInformationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryWebCaptureInformationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kWebCaptureInformationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kWebCaptureInformationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfWebCaptureInformationDictionary* asWebCaptureInformationDictionary() {return this;} virtual const SkPdfWebCaptureInformationDictionary* asWebCaptureInformationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfWebCapturePageSetDictionary_autogen.h b/experimental/PdfViewer/SkPdfWebCapturePageSetDictionary_autogen.h index 891311cac3..b9b5287d13 100644 --- a/experimental/PdfViewer/SkPdfWebCapturePageSetDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWebCapturePageSetDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfWebCapturePageSetDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryWebCapturePageSetDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryWebCapturePageSetDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kWebCapturePageSetDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kWebCapturePageSetDictionary_SkPdfObjectType + 1);} public: virtual SkPdfWebCapturePageSetDictionary* asWebCapturePageSetDictionary() {return this;} virtual const SkPdfWebCapturePageSetDictionary* asWebCapturePageSetDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfWidgetAnnotationDictionary_autogen.h b/experimental/PdfViewer/SkPdfWidgetAnnotationDictionary_autogen.h index 529133a00c..cbb3fb1326 100644 --- a/experimental/PdfViewer/SkPdfWidgetAnnotationDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWidgetAnnotationDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfWidgetAnnotationDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryWidgetAnnotationDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryWidgetAnnotationDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kWidgetAnnotationDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kWidgetAnnotationDictionary_SkPdfObjectType + 1);} public: virtual SkPdfWidgetAnnotationDictionary* asWidgetAnnotationDictionary() {return this;} virtual const SkPdfWidgetAnnotationDictionary* asWidgetAnnotationDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfWindowsLaunchActionDictionary_autogen.h b/experimental/PdfViewer/SkPdfWindowsLaunchActionDictionary_autogen.h index c49f03b873..48b333c881 100644 --- a/experimental/PdfViewer/SkPdfWindowsLaunchActionDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfWindowsLaunchActionDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfWindowsLaunchActionDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryWindowsLaunchActionDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kObjectDictionaryWindowsLaunchActionDictionary_SkPdfObjectType + 1);} + virtual SkPdfObjectType getType() const { return kWindowsLaunchActionDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(kWindowsLaunchActionDictionary_SkPdfObjectType + 1);} public: virtual SkPdfWindowsLaunchActionDictionary* asWindowsLaunchActionDictionary() {return this;} virtual const SkPdfWindowsLaunchActionDictionary* asWindowsLaunchActionDictionary() const {return this;} diff --git a/experimental/PdfViewer/SkPdfXObjectDictionary_autogen.h b/experimental/PdfViewer/SkPdfXObjectDictionary_autogen.h index b699e2ca25..d68325f330 100644 --- a/experimental/PdfViewer/SkPdfXObjectDictionary_autogen.h +++ b/experimental/PdfViewer/SkPdfXObjectDictionary_autogen.h @@ -7,8 +7,8 @@ class SkPdfXObjectDictionary : public SkPdfDictionary { public: - virtual SkPdfObjectType getType() const { return kObjectDictionaryXObjectDictionary_SkPdfObjectType;} - virtual SkPdfObjectType getTypeEnd() const { return kObjectDictionaryXObjectDictionary__End_SkPdfObjectType;} + virtual SkPdfObjectType getType() const { return kXObjectDictionary_SkPdfObjectType;} + virtual SkPdfObjectType getTypeEnd() const { return kXObjectDictionary__End_SkPdfObjectType;} public: virtual SkPdfXObjectDictionary* asXObjectDictionary() {return this;} virtual const SkPdfXObjectDictionary* asXObjectDictionary() const {return this;} diff --git a/experimental/PdfViewer/generate_code.py b/experimental/PdfViewer/generate_code.py index 05267bc940..e730a6fa70 100644 --- a/experimental/PdfViewer/generate_code.py +++ b/experimental/PdfViewer/generate_code.py @@ -18,7 +18,7 @@ knowTypes = { 'file_specification': ['SkPdfFileSpec', 'FileSpecFromDictionary', datatypes.FileSpecNone(), 'ret->podofo()->GetDataType() == ePdfDataType_Reference'], 'name': ['std::string', 'NameFromDictionary', datatypes.PdfString('""'), 'ret->podofo()->GetDataType() == ePdfDataType_Name'], 'tree': ['SkPdfTree*', 'TreeFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Reference'], -'number': ['double', 'DoubleFromDictionary', datatypes.PdfNumber(0), 'ret->podofo()->GetDataType() == ePdfDataType_Real'], +'number': ['double', 'DoubleFromDictionary', datatypes.PdfNumber(0), 'ret->podofo()->GetDataType() == ePdfDataType_Real || ret->podofo()->GetDataType() == ePdfDataType_Number'], 'rectangle': ['SkRect', 'SkRectFromDictionary', datatypes.PdfEmptyRect(), 'ret->podofo()->GetDataType() == ePdfDataType_Array'], 'stream': ['SkPdfStream', 'StreamFromDictionary', datatypes.PdfEmptyStream(), 'ret->podofo()->HasStream()'], 'string': ['std::string', 'StringFromDictionary', datatypes.PdfString('""'), 'ret->podofo()->GetDataType() == ePdfDataType_String || ret->podofo()->GetDataType() == ePdfDataType_HexString'], @@ -160,72 +160,60 @@ class PdfClassManager: self.fClassesNamesInOrder.append(name) return cls - def longName(self, name): - #return name - # TODO(edisonn): we need the long name to nenerate and sort enums, but we can generate them recursively - ret = '' - while name != '': - cls = self.fClasses[name] - ret = name + ret - name = cls.fBase - - return ret - - - def writeEnum(self, enum, enumToCls): - print(' ' + enum + ',') + def writeEnum(self, fileEnums, enum, enumToCls): + fileEnums.write(' ' + enum + ',\n') cls = enumToCls[enum] cls.fEnumSubclasses.sort() cnt = 0 for sub in cls.fEnumSubclasses: - self.writeEnum(cls.fEnumSubclasses[cnt], enumToCls) + self.writeEnum(fileEnums, cls.fEnumSubclasses[cnt], enumToCls) cnt = cnt + 1 if cnt != 0: - print(' ' + cls.fEnumEnd + ',') + fileEnums.write(' ' + cls.fEnumEnd + ',\n') - def writeAsNull(self, cls, enumToCls): - print(' virtual SkPdf' + cls.fName +'* as' + cls.fName + '() {return NULL;}') - print(' virtual const SkPdf' + cls.fName +'* as' + cls.fName + '() const {return NULL;}') - print + def writeAsNull(self, fileClass, cls, enumToCls): + fileClass.write(' virtual SkPdf' + cls.fName +'* as' + cls.fName + '() {return NULL;}\n') + fileClass.write(' virtual const SkPdf' + cls.fName +'* as' + cls.fName + '() const {return NULL;}\n') + fileClass.write('\n') cnt = 0 for sub in cls.fEnumSubclasses: - self.writeAsNull(enumToCls[cls.fEnumSubclasses[cnt]], enumToCls) + self.writeAsNull(fileClass, enumToCls[cls.fEnumSubclasses[cnt]], enumToCls) cnt = cnt + 1 - def writeAsFoo(self, cls, enumToCls): + def writeAsFoo(self, fileClass, cls, enumToCls): # TODO(edisonn): add a container, with sections, public, private, default, ... # the end code will be grouped # me - print('public:') - print(' virtual SkPdf' + cls.fName +'* as' + cls.fName + '() {return this;}') - print(' virtual const SkPdf' + cls.fName +'* as' + cls.fName + '() const {return this;}') - print + fileClass.write('public:\n') + fileClass.write(' virtual SkPdf' + cls.fName +'* as' + cls.fName + '() {return this;}\n') + fileClass.write(' virtual const SkPdf' + cls.fName +'* as' + cls.fName + '() const {return this;}\n') + fileClass.write('\n') if cls.fName == 'Object': cnt = 0 for sub in cls.fEnumSubclasses: - self.writeAsNull(enumToCls[cls.fEnumSubclasses[cnt]], enumToCls) + self.writeAsNull(fileClass, enumToCls[cls.fEnumSubclasses[cnt]], enumToCls) cnt = cnt + 1 if cls.fName != 'Object': - print('private:') + fileClass.write('private:\n') base = self.fClasses[cls.fBase] cnt = 0 for sub in base.fEnumSubclasses: if enumToCls[base.fEnumSubclasses[cnt]].fName != cls.fName: - self.writeAsNull(enumToCls[base.fEnumSubclasses[cnt]], enumToCls) + self.writeAsNull(fileClass, enumToCls[base.fEnumSubclasses[cnt]], enumToCls) cnt = cnt + 1 def write(self): - + global fileHeaders global knowTypes # generate enum @@ -235,9 +223,10 @@ class PdfClassManager: for name in self.fClasses: cls = self.fClasses[name] - enum = self.longName(name) - cls.fEnum = 'k' + enum + '_SkPdfObjectType' - cls.fEnumEnd = 'k' + enum + '__End_SkPdfObjectType' + cls.fEnum = 'k' + name + '_SkPdfObjectType' + cls.fEnumEnd = 'k' + name + '__End_SkPdfObjectType' + + fileHeaders.write('#include "SkPdf' + cls.fName + '_autogen.h"\n') if cls.fBase != '': self.fClasses[cls.fBase].fEnumSubclasses.append(cls.fEnum) @@ -254,116 +243,134 @@ class PdfClassManager: # write imports # write enums - print('enum SkPdfObjectType {') + fileEnums = open('SkPdfEnums_autogen.h', 'w') + fileEnums.write('#ifndef __DEFINED__SkPdfEnums\n') + fileEnums.write('#define __DEFINED__SkPdfEnums\n') + fileEnums.write('\n') + + fileEnums.write('enum SkPdfObjectType {\n') for enum in enumsRoot: - self.writeEnum(enum, enumToCls) - print('};') - print + self.writeEnum(fileEnums, enum, enumToCls) + fileEnums.write('};\n') + fileEnums.write('\n') # write forward class declaration for name in self.fClassesNamesInOrder: - print('class SkPdf' + name + ';') - print + fileEnums.write('class SkPdf' + name + ';\n') + fileEnums.write('\n') + + fileEnums.write('#endif // __DEFINED__SkPdfEnums\n') + fileEnums.close() for name in self.fClassesNamesInOrder: cls = self.fClasses[name] enum = cls.fEnum + fileClass = open('SkPdf' + cls.fName + '_autogen.h', 'w') + fileClass.write('#ifndef __DEFINED__SkPdf' + cls.fName + '\n') + fileClass.write('#define __DEFINED__SkPdf' + cls.fName + '\n') + fileClass.write('\n') + + fileClass.write('#include "SkPdfEnums_autogen.h"\n') + fileClass.write('#include "SkPdfArray_autogen.h"\n') + if cls.fBase == '': - print('class SkPdf' + cls.fName + ' {') + fileClass.write('\nclass SkPdf' + cls.fName + ' {\n') else: - print('class SkPdf' + cls.fName + ' : public SkPdf' + cls.fBase + ' {') + fileClass.write('#include "SkPdf' + cls.fBase + '_autogen.h"\n') + fileClass.write('\nclass SkPdf' + cls.fName + ' : public SkPdf' + cls.fBase + ' {\n') - print('public:') - print(' virtual SkPdfObjectType getType() const { return ' + cls.fEnum + ';}') + fileClass.write('public:\n') + fileClass.write(' virtual SkPdfObjectType getType() const { return ' + cls.fEnum + ';}\n') if len(cls.fEnumSubclasses) == 0: - print(' virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(' + cls.fEnum + ' + 1);}') + fileClass.write(' virtual SkPdfObjectType getTypeEnd() const { return (SkPdfObjectType)(' + cls.fEnum + ' + 1);}\n') else: - print(' virtual SkPdfObjectType getTypeEnd() const { return ' + cls.fEnumEnd + ';}') + fileClass.write(' virtual SkPdfObjectType getTypeEnd() const { return ' + cls.fEnumEnd + ';}\n') + self.writeAsFoo(fileClass, cls, enumToCls) - self.writeAsFoo(cls, enumToCls) - - print('public:') + fileClass.write('public:\n') for cc in cls.fCCPublic: - print(' ' + cc) + fileClass.write(' ' + cc + '\n') - print('private:') + fileClass.write('private:\n') for cc in cls.fCCPrivate: - print(' ' + cc) + fileClass.write(' ' + cc + '\n') if cls.fBase == '': - print('protected:') - print(' const PdfMemDocument* fPodofoDoc;') - print(' const PdfObject* fPodofoObj;') - print - print('public:') - print(' SkPdf' + cls.fName + '(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : fPodofoDoc(podofoDoc), fPodofoObj(podofoObj) {}') - print(' const PdfMemDocument* doc() const { return fPodofoDoc;}') - print(' const PdfObject* podofo() const { return fPodofoObj;}') + fileClass.write('protected:\n') + fileClass.write(' const PdfMemDocument* fPodofoDoc;\n') + fileClass.write(' const PdfObject* fPodofoObj;\n') + fileClass.write('\n') + fileClass.write('public:\n') + fileClass.write(' SkPdf' + cls.fName + '(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : fPodofoDoc(podofoDoc), fPodofoObj(podofoObj) {}\n') + fileClass.write(' const PdfMemDocument* doc() const { return fPodofoDoc;}\n') + fileClass.write(' const PdfObject* podofo() const { return fPodofoObj;}\n') else: - print('public:') - print(' SkPdf' + cls.fName + '(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdf' + cls.fBase + '(podofoDoc, podofoObj) {}') - print + fileClass.write('public:\n') + fileClass.write(' SkPdf' + cls.fName + '(const PdfMemDocument* podofoDoc = NULL, const PdfObject* podofoObj = NULL) : SkPdf' + cls.fBase + '(podofoDoc, podofoObj) {}\n') + fileClass.write('\n') #check required fieds, also, there should be an internal_valid() manually wrote for complex # situations # right now valid return true - print(' virtual bool valid() const {return true;}') - print + fileClass.write(' virtual bool valid() const {return true;}\n') + fileClass.write('\n') - print(' SkPdf' + cls.fName + '& operator=(const SkPdf' + cls.fName + '& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}') - print + fileClass.write(' SkPdf' + cls.fName + '& operator=(const SkPdf' + cls.fName + '& from) {this->fPodofoDoc = from.fPodofoDoc; this->fPodofoObj = from.fPodofoObj; return *this;}\n') + fileClass.write('\n') for field in cls.fFields: prop = field.fProp if prop.fCppName != '': if prop.fCppName[0] == '[': - print('/*') # comment code of the atributes that can have any name + fileClass.write('/*\n') # comment code of the atributes that can have any name # TODO(edisonn): has_foo(); - print(' bool has_' + prop.fCppName + '() const {') - print(' return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", NULL));') - print(' }') + fileClass.write(' bool has_' + prop.fCppName + '() const {\n') + fileClass.write(' return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", NULL));\n') + fileClass.write(' }\n') if len(prop.fTypes.split()) == 1: t = prop.fTypes.strip() - print(' ' + knowTypes[t][0] + ' ' + prop.fCppName + '() const {') - print(' ' + knowTypes[t][0] + ' ret;') - print(' if (' + knowTypes[t][1] + '(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &ret)) return ret;') + fileClass.write(' ' + knowTypes[t][0] + ' ' + prop.fCppName + '() const {\n') + fileClass.write(' ' + knowTypes[t][0] + ' ret;\n') + fileClass.write(' if (' + knowTypes[t][1] + '(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &ret)) return ret;\n') if field.fRequired == False and prop.fDefault != '': - print(' return ' + prop.fDefault.toCpp() + ';'); + fileClass.write(' return ' + prop.fDefault.toCpp() + ';\n'); else: - print(' // TODO(edisonn): warn about missing required field, assert for known good pdfs') - print(' return ' + knowTypes[t][2].toCpp() + ';'); - print(' }') - print + fileClass.write(' // TODO(edisonn): warn about missing required field, assert for known good pdfs\n') + fileClass.write(' return ' + knowTypes[t][2].toCpp() + ';\n'); + fileClass.write(' }\n') + fileClass.write('\n') else: for type in prop.fTypes.split(): t = type.strip() - print(' bool is' + prop.fCppName + 'A' + t.title() + '() const {') - print(' SkPdfObject* ret = NULL;') - print(' if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &ret)) return false;') - print(' return ' + knowTypes[t][3] + ';') - print(' }') - print - - print(' ' + knowTypes[t][0] + ' get' + prop.fCppName + 'As' + t.title() + '() const {') - print(' ' + knowTypes[t][0] + ' ret = ' + knowTypes[t][2].toCpp() + ';') - print(' if (' + knowTypes[t][1] + '(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &ret)) return ret;') - print(' // TODO(edisonn): warn about missing required field, assert for known good pdfs') - print(' return ' + knowTypes[t][2].toCpp() + ';') - print(' }') - print + fileClass.write(' bool is' + prop.fCppName + 'A' + t.title() + '() const {\n') + fileClass.write(' SkPdfObject* ret = NULL;\n') + fileClass.write(' if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &ret)) return false;\n') + fileClass.write(' return ' + knowTypes[t][3] + ';\n') + fileClass.write(' }\n') + fileClass.write('\n') + + fileClass.write(' ' + knowTypes[t][0] + ' get' + prop.fCppName + 'As' + t.title() + '() const {\n') + fileClass.write(' ' + knowTypes[t][0] + ' ret = ' + knowTypes[t][2].toCpp() + ';\n') + fileClass.write(' if (' + knowTypes[t][1] + '(fPodofoDoc, fPodofoObj->GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &ret)) return ret;\n') + fileClass.write(' // TODO(edisonn): warn about missing required field, assert for known good pdfs\n') + fileClass.write(' return ' + knowTypes[t][2].toCpp() + ';\n') + fileClass.write(' }\n') + fileClass.write('\n') if prop.fCppName[0] == '[': - print('*/') # comment code of the atributes that can have any name + fileClass.write('*/\n') # comment code of the atributes that can have any name - print('};') - print - print + fileClass.write('};\n') + fileClass.write('\n') + + fileClass.write('#endif // __DEFINED__SkPdf' + cls.fName + '\n') + fileClass.close() @@ -371,62 +378,79 @@ class PdfClassManager: # later, p2, generate constructor when not knowing the type - very similar with parsing? # generate parser - # TODO(edisonn): fast recognition based on must attributes. - print('class PodofoMapper {') - print('public:') + fileMapper = open('SkPdfPodofoMapper_autogen.h', 'w') + fileMapper.write('#ifndef __DEFINED__SkPdfPodofoMapper\n') + fileMapper.write('#define __DEFINED__SkPdfPodofoMapper\n') + fileMapper.write('\n') + + fileMapper.write('#include "SkPdfHeaders_autogen.h"\n') + fileMapper.write('class PodofoMapper {\n') + fileMapper.write('public:\n') for name in self.fClassesNamesInOrder: cls = self.fClasses[name] - print(' static bool map(const SkPdfObject& in, SkPdf' + name + '** out) {') - print(' return map(*in.doc(), *in.podofo(), out);') - print(' }') - print + fileMapper.write(' static bool map(const SkPdfObject& in, SkPdf' + name + '** out) {\n') + fileMapper.write(' return map(*in.doc(), *in.podofo(), out);\n') + fileMapper.write(' }\n') + fileMapper.write('\n') - print(' static bool map(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj, SkPdf' + name + '** out) {') - print(' if (!is' + name + '(podofoDoc, podofoObj)) return false;') - print + fileMapper.write(' static bool map(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj, SkPdf' + name + '** out) {\n') + fileMapper.write(' if (!is' + name + '(podofoDoc, podofoObj)) return false;\n') + fileMapper.write('\n') for sub in cls.fEnumSubclasses: - print(' if (map(podofoDoc, podofoObj, (SkPdf' + enumToCls[sub].fName + '**)out)) return true;') + fileMapper.write(' if (map(podofoDoc, podofoObj, (SkPdf' + enumToCls[sub].fName + '**)out)) return true;\n') - print + fileMapper.write('\n') - print(' *out = new SkPdf' + name + '(&podofoDoc, &podofoObj);') - print(' return true;') - print(' }') - print + fileMapper.write(' *out = new SkPdf' + name + '(&podofoDoc, &podofoObj);\n') + fileMapper.write(' return true;\n') + fileMapper.write(' }\n') + fileMapper.write('\n') for name in self.fClassesNamesInOrder: cls = self.fClasses[name] - print(' static bool is' + name + '(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) {') + fileMapper.write(' static bool is' + name + '(const PdfMemDocument& podofoDoc, const PdfObject& podofoObj) {\n') if cls.fCheck != '': - print(' return ' + cls.fCheck + ';') + fileMapper.write(' return ' + cls.fCheck + ';\n') else: cntMust = 0 for field in cls.fFields: prop = field.fProp if prop.fHasMust: cntMust = cntMust + 1 - print(' ' + knowTypes[prop.fTypes.strip()][0] + ' ' + prop.fCppName + ';') - print(' if (!' + knowTypes[prop.fTypes.strip()][1] + '(&podofoDoc, podofoObj.GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &' + prop.fCppName + ')) return false;') - print(' if (' + prop.fCppName + ' != ' + prop.fMustBe.toCpp() + ') return false;') - print + fileMapper.write(' ' + knowTypes[prop.fTypes.strip()][0] + ' ' + prop.fCppName + ';\n') + fileMapper.write(' if (!' + knowTypes[prop.fTypes.strip()][1] + '(&podofoDoc, podofoObj.GetDictionary(), \"' + prop.fName + '\", \"' + prop.fAbr + '\", &' + prop.fCppName + ')) return false;\n') + fileMapper.write(' if (' + prop.fCppName + ' != ' + prop.fMustBe.toCpp() + ') return false;\n') + fileMapper.write('\n') - print(' return true;') + fileMapper.write(' return true;\n') - print(' }') - print + fileMapper.write(' }\n') + fileMapper.write('\n') - print('};') - print + fileMapper.write('};\n') + fileMapper.write('\n') + + fileMapper.write('#endif // __DEFINED__SkPdfPodofoMapper\n') + fileMapper.close() return def generateCode(): + global fileHeaders + + fileHeaders = open('SkPdfHeaders_autogen.h', 'w') + fileHeaders.write('#ifndef __DEFINED__SkPdfHeaders\n') + fileHeaders.write('#define __DEFINED__SkPdfHeaders\n') + fileHeaders.write('\n') + + fileHeaders.write('#include "SkPdfEnums_autogen.h"\n') + manager = PdfClassManager() manager.addClass('Object') @@ -435,10 +459,10 @@ def generateCode(): manager.addClass('Boolean').check('podofoObj.GetDataType() == ePdfDataType_Bool')\ .carbonCopyPublic('bool value() const {return fPodofoObj->GetBool();}') - manager.addClass('Integer').check('podofoObj.GetDataType() == ePdfDataType_Number')\ + manager.addClass('Integer').check('podofoObj.GetDataType() == ePdfDataType_Number || podofoObj.GetDataType() == ePdfDataType_Real')\ .carbonCopyPublic('long value() const {return fPodofoObj->GetNumber();}') - manager.addClass('Number').check('podofoObj.GetDataType() == ePdfDataType_Real')\ + manager.addClass('Number', 'Integer').check('podofoObj.GetDataType() == ePdfDataType_Number || podofoObj.GetDataType() == ePdfDataType_Real')\ .carbonCopyPublic('double value() const {return fPodofoObj->GetReal();}') manager.addClass('Name').check('podofoObj.GetDataType() == ePdfDataType_Name')\ @@ -452,13 +476,16 @@ def generateCode(): .carbonCopyPublic('const SkPdfObject operator[](int i) const {return SkPdfObject(fPodofoDoc, &fPodofoObj->GetArray()[i]);}')\ .carbonCopyPublic('SkPdfObject operator[](int i) {return SkPdfObject(fPodofoDoc, &fPodofoObj->GetArray()[i]);}') - manager.addClass('String').check('podofoObj.GetDataType() == ePdfDataType_String')\ + manager.addClass('String').check('podofoObj.GetDataType() == ePdfDataType_String || podofoObj.GetDataType() == ePdfDataType_HexString')\ .carbonCopyPublic('const std::string& value() const {return fPodofoObj->GetString().GetStringUtf8();}') - manager.addClass('HexString').check('podofoObj.GetDataType() == ePdfDataType_HexString')\ + manager.addClass('HexString', 'String').check('podofoObj.GetDataType() == ePdfDataType_HexString')\ .carbonCopyPublic('const std::string& value() const {return fPodofoObj->GetString().GetStringUtf8();}') - manager.addClass('Dictionary').check('podofoObj.GetDataType() == ePdfDataType_Dictionary') + manager.addClass('Dictionary').check('podofoObj.GetDataType() == ePdfDataType_Dictionary')\ + .carbonCopyPublic('const SkPdfObject get(const char* dictionaryKeyName) const {return SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));}')\ + .carbonCopyPublic('SkPdfObject get(const char* dictionaryKeyName) {return SkPdfObject(fPodofoDoc, resolveReferenceObject(fPodofoDoc, fPodofoObj->GetDictionary().GetKey(PdfName(dictionaryKeyName))));}')\ + # these classes are not explicitely backed by a table in the pdf spec manager.addClass('XObjectDictionary', 'Dictionary') @@ -481,9 +508,11 @@ def generateCode(): manager.write() + fileHeaders.write('#endif // __DEFINED__SkPdfHeaders\n') + fileHeaders.close() + return 1 if '__main__' == __name__: sys.exit(generateCode()) -
\ No newline at end of file diff --git a/experimental/PdfViewer/pdf_viewer_main.cpp b/experimental/PdfViewer/pdf_viewer_main.cpp index aa4417e02f..2c6c4235d5 100644 --- a/experimental/PdfViewer/pdf_viewer_main.cpp +++ b/experimental/PdfViewer/pdf_viewer_main.cpp @@ -24,6 +24,10 @@ #include "podofo.h" using namespace PoDoFo; +const PdfObject* resolveReferenceObject(const PdfMemDocument* pdfDoc, + const PdfObject* obj, + bool resolveOneElementArrays = false); + bool LongFromDictionary(const PdfMemDocument* pdfDoc, const PdfDictionary& dict, const char* key, @@ -128,7 +132,9 @@ bool FunctionFromDictionary(const PdfMemDocument* pdfDoc, SkPdfFunction* data); -#include "pdf_auto_gen.h" +#include "SkPdfHeaders_autogen.h" +#include "SkPdfPodofoMapper_autogen.h" +#include "SkPdfParser.h" bool ArrayFromDictionary(const PdfMemDocument* pdfDoc, const PdfDictionary& dict, @@ -160,12 +166,6 @@ bool DateFromDictionary(const PdfMemDocument* pdfDoc, const char* abr, SkPdfDate* data) {return false;} -bool SkRectFromDictionary(const PdfMemDocument* pdfDoc, - const PdfDictionary& dict, - const char* key, - const char* abr, - SkRect* data) {return false;} - bool FunctionFromDictionary(const PdfMemDocument* pdfDoc, const PdfDictionary& dict, const char* key, @@ -235,7 +235,7 @@ int GetColorSpaceComponents(const std::string& colorSpace) { const PdfObject* resolveReferenceObject(const PdfMemDocument* pdfDoc, const PdfObject* obj, - bool resolveOneElementArrays = false) { + bool resolveOneElementArrays) { while (obj && (obj->IsReference() || (resolveOneElementArrays && obj->IsArray() && obj->GetArray().GetSize() == 1))) { @@ -307,7 +307,7 @@ struct PdfGraphicsState { double fWordSpace; double fCharSpace; - SkPdfResourceDictionary fResources; + SkPdfResourceDictionary* fResources; SkBitmap fSMask; @@ -326,6 +326,7 @@ struct PdfGraphicsState { fWordSpace = 0; fCharSpace = 0; fHasClipPathToApply = false; + fResources = NULL; } }; @@ -338,17 +339,15 @@ struct PdfInlineImage { // TODO(edisonn): better class design. struct PdfContext { - std::stack<PdfVariant> fVarStack; + std::stack<SkPdfObject*> fObjectStack; std::stack<PdfGraphicsState> fStateStack; PdfGraphicsState fGraphicsState; - PoDoFo::PdfPage* fPdfPage; - PdfMemDocument* fPdfDoc; + SkPdfDoc& fPdfDoc; SkMatrix fOriginalMatrix; PdfInlineImage fInlineImage; - PdfContext() : fPdfPage(NULL), - fPdfDoc(NULL) {} + PdfContext(SkPdfDoc& doc) : fPdfDoc(doc) {} }; @@ -364,20 +363,12 @@ enum PdfResult { kCount_PdfResult }; -struct PdfToken { - const char* pszToken; - PdfVariant var; - EPdfContentsType eType; - - PdfToken() : pszToken(NULL) {} -}; - PdfContext* gPdfContext = NULL; SkBitmap* gDumpBitmap = NULL; SkCanvas* gDumpCanvas = NULL; char gLastKeyword[100] = ""; int gLastOpKeyword = -1; -char allOpWithVisualEffects[100] = ",S,s,f,F,f*,B,B*,b,b*,n,Tj,TJ,\',\",d0,d1,sh,EI,Do,EX"; +char allOpWithVisualEffects[100] = ",S,s,f,F,f*,B,B*,b,b*,n,Tj,TJ,\',\",d0,d1,sh,EI,Do,EX,"; int gReadOp = 0; @@ -394,8 +385,8 @@ bool hasVisualEffect(const char* pdfOp) { } // TODO(edisonn): Pass PdfContext and SkCanvasd only with the define for instrumentation. -static bool readToken(PdfContentsTokenizer* fTokenizer, PdfToken* token) { - bool ret = fTokenizer->ReadNext(token->eType, token->pszToken, token->var); +static bool readToken(SkPdfTokenizer fTokenizer, PdfToken* token) { + bool ret = fTokenizer.readToken(token); gReadOp++; @@ -474,8 +465,8 @@ static bool readToken(PdfContentsTokenizer* fTokenizer, PdfToken* token) { SkImageEncoder::EncodeFile(out.c_str(), bitmap, SkImageEncoder::kPNG_Type, 100); } - if (token->eType == ePdfContentsType_Keyword) { - strcpy(gLastKeyword, token->pszToken); + if (token->fType == kKeyword_TokenType) { + strcpy(gLastKeyword, token->fKeyword); gLastOpKeyword = gReadOp; } else { strcpy(gLastKeyword, ""); @@ -489,13 +480,13 @@ static bool readToken(PdfContentsTokenizer* fTokenizer, PdfToken* token) { class PdfTokenLooper { protected: PdfTokenLooper* fParent; - PdfContentsTokenizer* fTokenizer; + SkPdfTokenizer fTokenizer; PdfContext* fPdfContext; SkCanvas* fCanvas; public: PdfTokenLooper(PdfTokenLooper* parent, - PdfContentsTokenizer* tokenizer, + SkPdfTokenizer tokenizer, PdfContext* pdfContext, SkCanvas* canvas) : fParent(parent), fTokenizer(tokenizer), fPdfContext(pdfContext), fCanvas(canvas) {} @@ -514,7 +505,7 @@ public: class PdfMainLooper : public PdfTokenLooper { public: PdfMainLooper(PdfTokenLooper* parent, - PdfContentsTokenizer* tokenizer, + SkPdfTokenizer tokenizer, PdfContext* pdfContext, SkCanvas* canvas) : PdfTokenLooper(parent, tokenizer, pdfContext, canvas) {} @@ -526,7 +517,7 @@ public: class PdfInlineImageLooper : public PdfTokenLooper { public: PdfInlineImageLooper() - : PdfTokenLooper(NULL, NULL, NULL, NULL) {} + : PdfTokenLooper(NULL, SkPdfTokenizer(), NULL, NULL) {} virtual PdfResult consumeToken(PdfToken& token); virtual void loop(); @@ -536,7 +527,7 @@ public: class PdfCompatibilitySectionLooper : public PdfTokenLooper { public: PdfCompatibilitySectionLooper() - : PdfTokenLooper(NULL, NULL, NULL, NULL) {} + : PdfTokenLooper(NULL, SkPdfTokenizer(), NULL, NULL) {} virtual PdfResult consumeToken(PdfToken& token); virtual void loop(); @@ -716,7 +707,7 @@ PdfEncoding* FixPdfFont(PdfContext* pdfContext, PdfFont* fCurFont) { if (fCurFont->GetObject()->IsDictionary() && fCurFont->GetObject()->GetDictionary().HasKey(PdfName("ToUnicode"))) { PdfCMapEncoding* enc = new PdfCMapEncoding( fCurFont->GetObject(), - (PdfObject*)resolveReferenceObject(pdfContext->fPdfDoc, + (PdfObject*)resolveReferenceObject(&pdfContext->fPdfDoc.podofo(), fCurFont->GetObject()->GetDictionary().GetKey(PdfName("ToUnicode"))), PdfCMapEncoding::eBaseEncoding_Identity); // todo, read the base encoding gFontsFixed[fCurFont] = enc; @@ -1282,7 +1273,7 @@ SkBitmap getImageFromObject(PdfContext* pdfContext, const SkPdfImageDictionary* } SkBitmap getSmaskFromObject(PdfContext* pdfContext, const SkPdfImageDictionary* obj) { - const PdfObject* sMask = resolveReferenceObject(pdfContext->fPdfDoc, + const PdfObject* sMask = resolveReferenceObject(&pdfContext->fPdfDoc.podofo(), obj->podofo()->GetDictionary().GetKey(PdfName("SMask"))); #ifdef PDF_TRACE @@ -1294,7 +1285,7 @@ SkBitmap getSmaskFromObject(PdfContext* pdfContext, const SkPdfImageDictionary* #endif if (sMask) { - SkPdfImageDictionary skxobjmask(pdfContext->fPdfDoc, sMask); + SkPdfImageDictionary skxobjmask(&pdfContext->fPdfDoc.podofo(), sMask); return getImageFromObject(pdfContext, &skxobjmask, true); } @@ -1334,7 +1325,7 @@ bool SkMatrixFromDictionary(PdfContext* pdfContext, const PdfDictionary& dict, const char* key, SkMatrix* matrix) { - const PdfObject* value = resolveReferenceObject(pdfContext->fPdfDoc, + const PdfObject* value = resolveReferenceObject(&pdfContext->fPdfDoc.podofo(), dict.GetKey(PdfName(key))); if (value == NULL || !value->IsArray()) { @@ -1347,7 +1338,7 @@ bool SkMatrixFromDictionary(PdfContext* pdfContext, double array[6]; for (int i = 0; i < 6; i++) { - const PdfObject* elem = resolveReferenceObject(pdfContext->fPdfDoc, &value->GetArray()[i]); + const PdfObject* elem = resolveReferenceObject(&pdfContext->fPdfDoc.podofo(), &value->GetArray()[i]); if (elem == NULL || (!elem->IsReal() && !elem->IsNumber())) { return false; } @@ -1358,11 +1349,11 @@ bool SkMatrixFromDictionary(PdfContext* pdfContext, return true; } -bool SkRectFromDictionary(PdfContext* pdfContext, +bool SkRectFromDictionary(const PdfMemDocument* pdfDoc, const PdfDictionary& dict, const char* key, SkRect* rect) { - const PdfObject* value = resolveReferenceObject(pdfContext->fPdfDoc, + const PdfObject* value = resolveReferenceObject(pdfDoc, dict.GetKey(PdfName(key))); if (value == NULL || !value->IsArray()) { @@ -1375,7 +1366,7 @@ bool SkRectFromDictionary(PdfContext* pdfContext, double array[4]; for (int i = 0; i < 4; i++) { - const PdfObject* elem = resolveReferenceObject(pdfContext->fPdfDoc, &value->GetArray()[i]); + const PdfObject* elem = resolveReferenceObject(pdfDoc, &value->GetArray()[i]); if (elem == NULL || (!elem->IsReal() && !elem->IsNumber())) { return false; } @@ -1389,6 +1380,18 @@ bool SkRectFromDictionary(PdfContext* pdfContext, return true; } +bool SkRectFromDictionary(const PdfMemDocument* pdfDoc, + const PdfDictionary& dict, + const char* key, + const char* abr, + SkRect* data) { + if (SkRectFromDictionary(pdfDoc, dict, key, data)) return true; + if (abr == NULL || *abr == '\0') return false; + return SkRectFromDictionary(pdfDoc, dict, abr, data); + +} + + SkPdfObject* get(const SkPdfObject* obj, const char* key, const char* abr = "") { SkPdfObject* ret = NULL; if (obj == NULL) return NULL; @@ -1413,8 +1416,7 @@ PdfResult doXObject_Form(PdfContext* pdfContext, SkCanvas* canvas, SkPdfType1For PodofoMapper::map(*get(skobj, "Resources"), &res); if (res) { - pdfContext->fGraphicsState.fResources = *res; - delete res; + pdfContext->fGraphicsState.fResources = res; } } @@ -1433,7 +1435,7 @@ PdfResult doXObject_Form(PdfContext* pdfContext, SkCanvas* canvas, SkPdfType1For canvas->setMatrix(pdfContext->fGraphicsState.fMatrix); SkRect bbox; - if (SkRectFromDictionary(pdfContext, skobj->podofo()->GetDictionary(), "BBox", &bbox)) { + if (SkRectFromDictionary(&pdfContext->fPdfDoc.podofo(), skobj->podofo()->GetDictionary(), "BBox", &bbox)) { canvas->clipRect(bbox, SkRegion::kIntersect_Op, true); // TODO(edisonn): AA from settings. } @@ -1449,8 +1451,8 @@ PdfResult doXObject_Form(PdfContext* pdfContext, SkCanvas* canvas, SkPdfType1For try { skobj->podofo()->GetStream()->GetFilteredCopy(&uncompressedStream, &uncompressedStreamLength); if (uncompressedStream != NULL && uncompressedStreamLength != 0) { - PdfContentsTokenizer tokenizer(uncompressedStream, uncompressedStreamLength); - PdfMainLooper looper(NULL, &tokenizer, pdfContext, canvas); + SkPdfTokenizer tokenizer = pdfContext->fPdfDoc.tokenizerOfStream(uncompressedStream, uncompressedStreamLength); + PdfMainLooper looper(NULL, tokenizer, pdfContext, canvas); looper.loop(); } free(uncompressedStream); @@ -1469,7 +1471,7 @@ PdfResult doXObject_PS(PdfContext* pdfContext, SkCanvas* canvas, const PdfObject return kNYI_PdfResult; } -// TODO(edisonn): faster, have the property on the PdfObject itself. +// TODO(edisonn): faster, have the property on the SkPdfObject itself? std::set<const PdfObject*> gInRendering; class CheckRecursiveRendering { @@ -1489,27 +1491,27 @@ public: } }; -PdfResult doXObject(PdfContext* pdfContext, SkCanvas* canvas, const PdfObject& obj) { - if (CheckRecursiveRendering::IsInRendering(obj)) { +PdfResult doXObject(PdfContext* pdfContext, SkCanvas* canvas, const SkPdfObject& obj) { + if (CheckRecursiveRendering::IsInRendering(*obj.podofo())) { // Oops, corrupt PDF! return kIgnoreError_PdfResult; } - CheckRecursiveRendering checkRecursion(obj); + CheckRecursiveRendering checkRecursion(*obj.podofo()); // TODO(edisonn): check type SkPdfXObjectDictionary* skobj = NULL; - if (!PodofoMapper::map(*pdfContext->fPdfDoc, obj, &skobj)) return kIgnoreError_PdfResult; + if (!PodofoMapper::map(obj, &skobj)) return kIgnoreError_PdfResult; if (!skobj || !skobj->valid()) return kIgnoreError_PdfResult; PdfResult ret = kIgnoreError_PdfResult; switch (skobj->getType()) { - case kObjectDictionaryXObjectDictionaryImageDictionary_SkPdfObjectType: + case kImageDictionary_SkPdfObjectType: ret = doXObject_Image(pdfContext, canvas, skobj->asImageDictionary()); break; - case kObjectDictionaryXObjectDictionaryType1FormDictionary_SkPdfObjectType: + case kType1FormDictionary_SkPdfObjectType: ret = doXObject_Form(pdfContext, canvas, skobj->asType1FormDictionary()); break; //case kObjectDictionaryXObjectPS_SkPdfObjectType: @@ -1536,8 +1538,8 @@ PdfResult PdfOp_Q(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo PdfResult PdfOp_cm(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { double array[6]; for (int i = 0 ; i < 6 ; i++) { - array[5 - i] = pdfContext->fVarStack.top().GetReal(); - pdfContext->fVarStack.pop(); + array[5 - i] = pdfContext->fObjectStack.top()->asNumber()->value(); + pdfContext->fObjectStack.pop(); } // a b @@ -1571,7 +1573,7 @@ PdfResult PdfOp_cm(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //, to leading, which is a number expressed in unscaled text //space units. Text leading is used only by the T*, ', and " operators. Initial value: 0. PdfResult PdfOp_TL(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double ty = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double ty = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); pdfContext->fGraphicsState.fTextLeading = ty; @@ -1579,8 +1581,8 @@ PdfResult PdfOp_TL(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo } PdfResult PdfOp_Td(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double ty = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double tx = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double ty = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double tx = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); double array[6] = {1, 0, 0, 1, tx, ty}; SkMatrix matrix = SkMatrixFromPdfMatrix(array); @@ -1592,27 +1594,30 @@ PdfResult PdfOp_Td(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo } PdfResult PdfOp_TD(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double ty = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double tx = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double ty = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double tx = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + + PdfObject _ty(PdfVariant(-ty)); + pdfContext->fObjectStack.push(new SkPdfNumber(&pdfContext->fPdfDoc.podofo(), &_ty)); - PdfVariant _ty(-ty); - pdfContext->fVarStack.push(_ty); PdfOp_TL(pdfContext, canvas, looper); - PdfVariant vtx(tx); - PdfVariant vty(ty); - pdfContext->fVarStack.push(vtx); - pdfContext->fVarStack.push(vty); + PdfObject vtx(PdfVariant(-(-tx))); // TODO(edisonn) Hmm, the compiler thinks I have here a function pointer if we use (tx), but not -(-tx) + pdfContext->fObjectStack.push(new SkPdfNumber(&pdfContext->fPdfDoc.podofo(), &vtx)); + + PdfObject vty(PdfVariant(-(-ty))); + pdfContext->fObjectStack.push(new SkPdfNumber(&pdfContext->fPdfDoc.podofo(), &vty)); + return PdfOp_Td(pdfContext, canvas, looper); } PdfResult PdfOp_Tm(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double f = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double e = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double d = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double c = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double b = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double a = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double f = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double e = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double d = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double c = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double b = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double a = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); double array[6]; array[0] = a; @@ -1636,11 +1641,11 @@ PdfResult PdfOp_Tm(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //0 Tl Td //where Tl is the current leading parameter in the text state PdfResult PdfOp_T_star(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - PdfVariant zero(0.0); - PdfVariant tl(pdfContext->fGraphicsState.fTextLeading); + PdfObject zero(PdfVariant(0.0)); + PdfObject tl(PdfVariant(-(-pdfContext->fGraphicsState.fTextLeading))); - pdfContext->fVarStack.push(zero); - pdfContext->fVarStack.push(tl); + pdfContext->fObjectStack.push(new SkPdfNumber(&pdfContext->fPdfDoc.podofo(), &zero)); + pdfContext->fObjectStack.push(new SkPdfNumber(&pdfContext->fPdfDoc.podofo(), &tl)); return PdfOp_Td(pdfContext, canvas, looper); } @@ -1650,8 +1655,8 @@ PdfResult PdfOp_m(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo pdfContext->fGraphicsState.fPathClosed = false; } - pdfContext->fGraphicsState.fCurPosY = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - pdfContext->fGraphicsState.fCurPosX = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + pdfContext->fGraphicsState.fCurPosY = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + pdfContext->fGraphicsState.fCurPosX = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); pdfContext->fGraphicsState.fPath.moveTo(SkDoubleToScalar(pdfContext->fGraphicsState.fCurPosX), SkDoubleToScalar(pdfContext->fGraphicsState.fCurPosY)); @@ -1665,8 +1670,8 @@ PdfResult PdfOp_l(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo pdfContext->fGraphicsState.fPathClosed = false; } - pdfContext->fGraphicsState.fCurPosY = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - pdfContext->fGraphicsState.fCurPosX = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + pdfContext->fGraphicsState.fCurPosY = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + pdfContext->fGraphicsState.fCurPosX = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); pdfContext->fGraphicsState.fPath.lineTo(SkDoubleToScalar(pdfContext->fGraphicsState.fCurPosX), SkDoubleToScalar(pdfContext->fGraphicsState.fCurPosY)); @@ -1680,12 +1685,12 @@ PdfResult PdfOp_c(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo pdfContext->fGraphicsState.fPathClosed = false; } - double y3 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double x3 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double y2 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double x2 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double y1 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double x1 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double y3 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double x3 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double y2 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double x2 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double y1 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double x1 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); pdfContext->fGraphicsState.fPath.cubicTo(SkDoubleToScalar(x1), SkDoubleToScalar(y1), SkDoubleToScalar(x2), SkDoubleToScalar(y2), @@ -1703,10 +1708,10 @@ PdfResult PdfOp_v(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo pdfContext->fGraphicsState.fPathClosed = false; } - double y3 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double x3 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double y2 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double x2 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double y3 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double x3 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double y2 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double x2 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); double y1 = pdfContext->fGraphicsState.fCurPosY; double x1 = pdfContext->fGraphicsState.fCurPosX; @@ -1726,12 +1731,12 @@ PdfResult PdfOp_y(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo pdfContext->fGraphicsState.fPathClosed = false; } - double y3 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double x3 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double y3 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double x3 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); double y2 = pdfContext->fGraphicsState.fCurPosY; double x2 = pdfContext->fGraphicsState.fCurPosX; - double y1 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double x1 = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double y1 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double x1 = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); pdfContext->fGraphicsState.fPath.cubicTo(SkDoubleToScalar(x1), SkDoubleToScalar(y1), SkDoubleToScalar(x2), SkDoubleToScalar(y2), @@ -1749,10 +1754,10 @@ PdfResult PdfOp_re(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo pdfContext->fGraphicsState.fPathClosed = false; } - double height = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double width = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double y = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double x = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double height = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double width = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double y = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double x = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); pdfContext->fGraphicsState.fPath.addRect(SkDoubleToScalar(x), SkDoubleToScalar(y), SkDoubleToScalar(x + width), SkDoubleToScalar(y + height)); @@ -1904,18 +1909,26 @@ PdfResult PdfOp_ET(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //a number representing a scale factor. There is no initial value for either font or //size; they must be specified explicitly using Tf before any text is shown. PdfResult PdfOp_Tf(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fGraphicsState.fCurFontSize = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - PdfName fontName = pdfContext->fVarStack.top().GetName(); pdfContext->fVarStack.pop(); + pdfContext->fGraphicsState.fCurFontSize = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + std::string fontName = pdfContext->fObjectStack.top()->asName()->value(); pdfContext->fObjectStack.pop(); + +#ifdef PDF_TRACE + printf("font name: %s\n", fontName.c_str()); + std::string str; + pdfContext->fGraphicsState.fResources->podofo()->ToString(str); + printf("Print Tf font Resources: %s\n", str.c_str()); +#endif // TODO(edisonn): Load font from pdfContext->fGraphicsState.fObjectWithResources ? - PdfObject* pFont = pdfContext->fPdfPage->GetFromResources( PdfName("Font"), fontName ); + const PdfObject* pFont = resolveReferenceObject(&pdfContext->fPdfDoc.podofo(), + pdfContext->fGraphicsState.fResources->Font()->get(fontName.c_str()).podofo()); if( !pFont ) { // TODO(edisonn): try to ignore the error, make sure we do not crash. return kIgnoreError_PdfResult; } - pdfContext->fGraphicsState.fCurFont = pdfContext->fPdfDoc->GetFont( pFont ); + pdfContext->fGraphicsState.fCurFont = pdfContext->fPdfDoc.podofo().GetFont( (PdfObject*)pFont ); if( !pdfContext->fGraphicsState.fCurFont ) { // TODO(edisonn): check ~/crasing, for one of the files PoDoFo throws exception @@ -1934,9 +1947,9 @@ PdfResult PdfOp_Tj(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo PdfResult ret = DrawText(pdfContext, pdfContext->fGraphicsState.fCurFont, - pdfContext->fVarStack.top().GetString(), + pdfContext->fObjectStack.top()->podofo()->GetString(), canvas); - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); return ret; } @@ -1958,17 +1971,17 @@ PdfResult PdfOp_doublequote(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLo return kIgnoreError_PdfResult; } - PdfVariant str = pdfContext->fVarStack.top(); pdfContext->fVarStack.pop(); - PdfVariant ac = pdfContext->fVarStack.top(); pdfContext->fVarStack.pop(); - PdfVariant aw = pdfContext->fVarStack.top(); pdfContext->fVarStack.pop(); + SkPdfObject* str = pdfContext->fObjectStack.top(); pdfContext->fObjectStack.pop(); + SkPdfObject* ac = pdfContext->fObjectStack.top(); pdfContext->fObjectStack.pop(); + SkPdfObject* aw = pdfContext->fObjectStack.top(); pdfContext->fObjectStack.pop(); - pdfContext->fVarStack.push(aw); + pdfContext->fObjectStack.push(aw); PdfOp_Tw(pdfContext, canvas, looper); - pdfContext->fVarStack.push(ac); + pdfContext->fObjectStack.push(ac); PdfOp_Tc(pdfContext, canvas, looper); - pdfContext->fVarStack.push(str); + pdfContext->fObjectStack.push(str); PdfOp_quote(pdfContext, canvas, looper); return kPartial_PdfResult; @@ -1980,18 +1993,18 @@ PdfResult PdfOp_TJ(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo return kIgnoreError_PdfResult; } - PdfArray array = pdfContext->fVarStack.top().GetArray(); - pdfContext->fVarStack.pop(); + SkPdfArray* array = pdfContext->fObjectStack.top()->asArray(); + pdfContext->fObjectStack.pop(); - for( int i=0; i<static_cast<int>(array.GetSize()); i++ ) + for( int i=0; i<static_cast<int>(array->size()); i++ ) { - if( array[i].IsString() || array[i].IsHexString() ) { + if( (*array)[i].asString()) { DrawText(pdfContext, pdfContext->fGraphicsState.fCurFont, - array[i].GetString(), + (*array)[i].podofo()->GetString(), canvas); - } else if (array[i].IsReal() || array[i].IsNumber()) { - double dx = array[i].GetReal(); + } else if ((*array)[i].asInteger() || (*array)[i].asNumber()) { + double dx = (*array)[i].asNumber()->value(); SkMatrix matrix; matrix.setAll(SkDoubleToScalar(1), SkDoubleToScalar(0), @@ -2011,7 +2024,7 @@ PdfResult PdfOp_TJ(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo } PdfResult PdfOp_CS_cs(PdfContext* pdfContext, SkCanvas* canvas, PdfColorOperator* colorOperator) { - colorOperator->fColorSpace = pdfContext->fVarStack.top().GetName().GetName(); pdfContext->fVarStack.pop(); + colorOperator->fColorSpace = pdfContext->fObjectStack.top()->asName()->value(); pdfContext->fObjectStack.pop(); return kOK_PdfResult; } @@ -2040,9 +2053,9 @@ PdfResult PdfOp_SC_sc(PdfContext* pdfContext, SkCanvas* canvas, PdfColorOperator for (int i = n - 1; i >= 0 ; i--) { if (doubles) { - c[i] = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + c[i] = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); } else { - v[i] = pdfContext->fVarStack.top().GetNumber(); pdfContext->fVarStack.pop(); + v[i] = pdfContext->fObjectStack.top()->asInteger()->value(); pdfContext->fObjectStack.pop(); } } @@ -2064,8 +2077,8 @@ PdfResult PdfOp_sc(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo PdfResult PdfOp_SCN_scn(PdfContext* pdfContext, SkCanvas* canvas, PdfColorOperator* colorOperator) { PdfString name; - if (pdfContext->fVarStack.top().IsName()) { - pdfContext->fVarStack.pop(); + if (pdfContext->fObjectStack.top()->asName()) { + pdfContext->fObjectStack.pop(); } // TODO(edisonn): SCN supports more color spaces than SCN. Read and implement spec. @@ -2083,7 +2096,7 @@ PdfResult PdfOp_scn(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** l } PdfResult PdfOp_G_g(PdfContext* pdfContext, SkCanvas* canvas, PdfColorOperator* colorOperator) { - double gray = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double gray = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2096,9 +2109,9 @@ PdfResult PdfOp_g(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo } PdfResult PdfOp_RG_rg(PdfContext* pdfContext, SkCanvas* canvas, PdfColorOperator* colorOperator) { - double b = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double g = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double r = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double b = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double g = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double r = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); colorOperator->fColorSpace = "DeviceRGB"; colorOperator->setRGBColor(SkColorSetRGB(255*r, 255*g, 255*b)); @@ -2115,10 +2128,10 @@ PdfResult PdfOp_rg(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo PdfResult PdfOp_K_k(PdfContext* pdfContext, SkCanvas* canvas, PdfColorOperator* colorOperator) { // TODO(edisonn): spec has some rules about overprint, implement them. - double k = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double y = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double m = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); - double c = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double k = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double y = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double m = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); + double c = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); colorOperator->fColorSpace = "DeviceCMYK"; // TODO(edisonn): Set color. @@ -2192,7 +2205,7 @@ PdfResult PdfOp_EI(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //lineWidth w Set the line width in the graphics state (see “Line Width” on page 152). PdfResult PdfOp_w(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double lineWidth = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double lineWidth = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); pdfContext->fGraphicsState.fLineWidth = lineWidth; return kOK_PdfResult; @@ -2200,24 +2213,24 @@ PdfResult PdfOp_w(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo //lineCap J Set the line cap style in the graphics state (see “Line Cap Style” on page 153). PdfResult PdfOp_J(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); - //double lineCap = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); + //double lineCap = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } //lineJoin j Set the line join style in the graphics state (see “Line Join Style” on page 153). PdfResult PdfOp_j(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); - //double lineJoin = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); + //double lineJoin = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } //miterLimit M Set the miter limit in the graphics state (see “Miter Limit” on page 153). PdfResult PdfOp_M(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); - //double miterLimit = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); + //double miterLimit = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2225,15 +2238,15 @@ PdfResult PdfOp_M(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo //dashArray dashPhase d Set the line dash pattern in the graphics state (see “Line Dash Pattern” on //page 155). PdfResult PdfOp_d(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } //intent ri (PDF 1.1) Set the color rendering intent in the graphics state (see “Rendering Intents” on page 197). PdfResult PdfOp_ri(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2242,7 +2255,7 @@ PdfResult PdfOp_ri(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //Tolerance”). flatness is a number in the range 0 to 100; a value of 0 speci- //fies the output device’s default flatness tolerance. PdfResult PdfOp_i(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2250,37 +2263,14 @@ PdfResult PdfOp_i(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** loo //dictName gs (PDF 1.2) Set the specified parameters in the graphics state. dictName is //the name of a graphics state parameter dictionary in the ExtGState subdictionary of the current resource dictionary (see the next section). PdfResult PdfOp_gs(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - PdfName name = pdfContext->fVarStack.top().GetName(); pdfContext->fVarStack.pop(); + std::string name = pdfContext->fObjectStack.top()->asName()->value(); pdfContext->fObjectStack.pop(); #ifdef PDF_TRACE std::string str; #endif - const PdfObject* resources = pdfContext->fGraphicsState.fResources.podofo(); - - if (resources == NULL) { -#ifdef PDF_TRACE - printf("WARNING: No Resources for a page with 'gs' operator!\n"); -#endif - return kIgnoreError_PdfResult; - } - -#ifdef PDF_TRACE - resources->ToString(str); - printf("Print gs Page Resources: %s\n", str.c_str()); -#endif - - if (!resources->IsDictionary()) { -#ifdef PDF_TRACE - printf("Resources is not a dictionary!\n"); -#endif - return kIgnoreError_PdfResult; - } - - const PdfDictionary& resourceDict = resources->GetDictionary(); //Next, get the ExtGState Dictionary from the Resource Dictionary: - const PdfObject* extGStateDictionary = resolveReferenceObject(pdfContext->fPdfDoc, - resourceDict.GetKey("ExtGState")); + const SkPdfDictionary* extGStateDictionary = pdfContext->fGraphicsState.fResources->ExtGState(); if (extGStateDictionary == NULL) { #ifdef PDF_TRACE @@ -2289,30 +2279,15 @@ PdfResult PdfOp_gs(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo return kIgnoreError_PdfResult; } - if (!extGStateDictionary->IsDictionary()) { -#ifdef PDF_TRACE - printf("extGStateDictionary is not a dictionary!\n"); -#endif - return kIgnoreError_PdfResult; - } - - const PdfObject* value = - resolveReferenceObject(pdfContext->fPdfDoc, - extGStateDictionary->GetDictionary().GetKey(name)); - - if (value == NULL) { -#ifdef PDF_TRACE - printf("Named object not found!\n"); -#endif - return kIgnoreError_PdfResult; - } + SkPdfObject value = extGStateDictionary->get(name.c_str()); #ifdef PDF_TRACE - value->ToString(str); - printf("gs object value: %s\n", str.c_str()); +// value->ToString(str); +// printf("gs object value: %s\n", str.c_str()); #endif - SkPdfGraphicsStateDictionary gs(pdfContext->fPdfDoc, value); + SkPdfGraphicsStateDictionary* gs = NULL; + PodofoMapper::map(value, &gs); // TODO(edisonn): now load all those properties in graphic state. @@ -2323,7 +2298,7 @@ PdfResult PdfOp_gs(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //, to charSpace, which is a number expressed in unscaled text space units. Character spacing is used by the Tj, TJ, and ' operators. //Initial value: 0. PdfResult PdfOp_Tc(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double charSpace = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double charSpace = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); pdfContext->fGraphicsState.fCharSpace = charSpace; return kOK_PdfResult; @@ -2335,7 +2310,7 @@ PdfResult PdfOp_Tc(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //text space units. Word spacing is used by the Tj, TJ, and ' operators. Initial //value: 0. PdfResult PdfOp_Tw(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double wordSpace = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double wordSpace = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); pdfContext->fGraphicsState.fWordSpace = wordSpace; return kOK_PdfResult; @@ -2345,7 +2320,7 @@ PdfResult PdfOp_Tw(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //, to (scale ˜ 100). scale is a number specifying the //percentage of the normal width. Initial value: 100 (normal width). PdfResult PdfOp_Tz(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double scale = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double scale = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2353,7 +2328,7 @@ PdfResult PdfOp_Tz(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //render Tr Set the text rendering mode, T //mode, to render, which is an integer. Initial value: 0. PdfResult PdfOp_Tr(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double render = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double render = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2361,107 +2336,65 @@ PdfResult PdfOp_Tr(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //rise Ts Set the text rise, Trise, to rise, which is a number expressed in unscaled text space //units. Initial value: 0. PdfResult PdfOp_Ts(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - double rise = pdfContext->fVarStack.top().GetReal(); pdfContext->fVarStack.pop(); + double rise = pdfContext->fObjectStack.top()->asNumber()->value(); pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } //wx wy d0 PdfResult PdfOp_d0(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } //wx wy llx lly urx ury d1 PdfResult PdfOp_d1(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); - pdfContext->fVarStack.pop(); - pdfContext->fVarStack.pop(); - pdfContext->fVarStack.pop(); - pdfContext->fVarStack.pop(); - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); + pdfContext->fObjectStack.pop(); + pdfContext->fObjectStack.pop(); + pdfContext->fObjectStack.pop(); + pdfContext->fObjectStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } //name sh PdfResult PdfOp_sh(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } //name Do PdfResult PdfOp_Do(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - PdfName name = pdfContext->fVarStack.top().GetName(); pdfContext->fVarStack.pop(); - - const PdfObject* resources = pdfContext->fGraphicsState.fResources.podofo(); - - if (resources == NULL) { -#ifdef PDF_TRACE - printf("WARNING: No Resources for a page with 'Do' operator!s\n"); -#endif - return kIgnoreError_PdfResult; - } - -#ifdef PDF_TRACE - std::string str; - resources->ToString(str); - printf("Print Do Page Resources: %s\n", str.c_str()); -#endif + std::string name = pdfContext->fObjectStack.top()->asName()->value(); pdfContext->fObjectStack.pop(); - if (!resources->IsDictionary()) { -#ifdef PDF_TRACE - printf("Resources is not a dictionary!\n"); -#endif - return kIgnoreError_PdfResult; - } - - const PdfDictionary& resourceDict = resources->GetDictionary(); - //Next, get the XObject Dictionary from the Resource Dictionary: - const PdfObject* xObjectDictionary = resolveReferenceObject(pdfContext->fPdfDoc, - resourceDict.GetKey("XObject")); + SkPdfDictionary* xObject = pdfContext->fGraphicsState.fResources->XObject(); - if (xObjectDictionary == NULL) { + if (xObject == NULL) { #ifdef PDF_TRACE printf("XObject is NULL!\n"); #endif return kIgnoreError_PdfResult; } - if (!xObjectDictionary->IsDictionary()) { -#ifdef PDF_TRACE - printf("xObjectDictionary is not a dictionary!\n"); -#endif - return kIgnoreError_PdfResult; - } + SkPdfObject value = xObject->get(name.c_str()); - const PdfObject* value = - resolveReferenceObject(pdfContext->fPdfDoc, - xObjectDictionary->GetDictionary().GetKey(name)); - - if (value == NULL) { #ifdef PDF_TRACE - printf("Named object not found!\n"); -#endif - return kIgnoreError_PdfResult; - } - -#ifdef PDF_TRACE - value->ToString(str); - printf("Do object value: %s\n", str.c_str()); +// value->ToString(str); +// printf("Do object value: %s\n", str.c_str()); #endif - return doXObject(pdfContext, canvas, *value); + return doXObject(pdfContext, canvas, value); } - //tag MP Designate a marked-content point. tag is a name object indicating the role or //significance of the point. PdfResult PdfOp_MP(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2472,8 +2405,8 @@ PdfResult PdfOp_MP(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //associated with it in the Properties subdictionary of the current resource //dictionary (see Section 9.5.1, “Property Lists”). PdfResult PdfOp_DP(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2481,7 +2414,7 @@ PdfResult PdfOp_DP(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** lo //tag BMC Begin a marked-content sequence terminated by a balancing EMC operator. //tag is a name object indicating the role or significance of the sequence. PdfResult PdfOp_BMC(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2490,8 +2423,8 @@ PdfResult PdfOp_BMC(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** l //by a balancing EMCoperator. tag is a name object indicating the role or significance of the sequence; propertiesis either an inline dictionary containing the //property list or a name object associated with it in the Properties subdictionary of the current resource dictionary (see Section 9.5.1, “Property Lists”). PdfResult PdfOp_BDC(PdfContext* pdfContext, SkCanvas* canvas, PdfTokenLooper** looper) { - pdfContext->fVarStack.pop(); - pdfContext->fVarStack.pop(); + pdfContext->fObjectStack.pop(); + pdfContext->fObjectStack.pop(); return kNYI_PdfResult; } @@ -2610,17 +2543,17 @@ void reportPdfRenderStats() { } PdfResult PdfMainLooper::consumeToken(PdfToken& token) { - if( token.eType == ePdfContentsType_Keyword ) + if (token.fType == kKeyword_TokenType) { // TODO(edisonn): log trace flag (verbose, error, info, warning, ...) #ifdef PDF_TRACE - printf("KEYWORD: %s\n", token.pszToken); + printf("KEYWORD: %s\n", token.fKeyword); #endif - PdfOperatorRenderer pdfOperatorRenderer = gPdfOps[token.pszToken]; + PdfOperatorRenderer pdfOperatorRenderer = gPdfOps[token.fKeyword]; if (pdfOperatorRenderer) { // caller, main work is done by pdfOperatorRenderer(...) PdfTokenLooper* childLooper = NULL; - gRenderStats[pdfOperatorRenderer(fPdfContext, fCanvas, &childLooper)][token.pszToken]++; + gRenderStats[pdfOperatorRenderer(fPdfContext, fCanvas, &childLooper)][token.fKeyword]++; if (childLooper) { childLooper->setUp(this); @@ -2628,19 +2561,19 @@ PdfResult PdfMainLooper::consumeToken(PdfToken& token) { delete childLooper; } } else { - gRenderStats[kUnsupported_PdfResult][token.pszToken]++; + gRenderStats[kUnsupported_PdfResult][token.fKeyword]++; } } - else if ( token.eType == ePdfContentsType_Variant ) + else if (token.fType == kObject_TokenType) { #ifdef PDF_TRACE std::string _var; - token.var.ToString(_var); + token.fObject->podofo()->ToString(_var); printf("var: %s\n", _var.c_str()); #endif - fPdfContext->fVarStack.push( token.var ); + fPdfContext->fObjectStack.push( token.fObject ); } - else if ( token.eType == ePdfContentsType_ImageData) { + else if ( token.fType == kImageData_TokenType) { // TODO(edisonn): implement inline image. } else { @@ -2664,12 +2597,12 @@ PdfResult PdfInlineImageLooper::consumeToken(PdfToken& token) { void PdfInlineImageLooper::loop() { PdfToken token; while (readToken(fTokenizer, &token)) { - if (token.eType == ePdfContentsType_Keyword && strcmp(token.pszToken, "BX") == 0) { + if (token.fType == kKeyword_TokenType && strcmp(token.fKeyword, "BX") == 0) { PdfTokenLooper* looper = new PdfCompatibilitySectionLooper(); looper->setUp(this); looper->loop(); } else { - if (token.eType == ePdfContentsType_Keyword && strcmp(token.pszToken, "EI") == 0) { + if (token.fType == kKeyword_TokenType && strcmp(token.fKeyword, "EI") == 0) { done(); return; } @@ -2710,13 +2643,13 @@ void PdfCompatibilitySectionLooper::loop() { // pop-ing too much will not affect outside the section. PdfToken token; while (readToken(fTokenizer, &token)) { - if (token.eType == ePdfContentsType_Keyword && strcmp(token.pszToken, "BX") == 0) { + if (token.fType == kKeyword_TokenType && strcmp(token.fKeyword, "BX") == 0) { PdfTokenLooper* looper = new PdfCompatibilitySectionLooper(); looper->setUp(this); looper->loop(); delete looper; } else { - if (token.eType == ePdfContentsType_Keyword && strcmp(token.pszToken, "EX") == 0) break; + if (token.fType == kKeyword_TokenType && strcmp(token.fKeyword, "EX") == 0) break; fParent->consumeToken(token); } } @@ -2744,44 +2677,41 @@ public: { std::cout << "Init: " << inputFileName.c_str() << std::endl; - PdfMemDocument doc(inputFileName.c_str()); - if( !doc.GetPageCount() ) + SkPdfDoc doc(inputFileName.c_str()); + if( !doc.pages() ) { std::cout << "ERROR: Empty Document" << inputFileName.c_str() << std::endl; return false; } else { - for (int pn = 0; pn < doc.GetPageCount(); ++pn) { - PoDoFo::PdfPage* page = doc.GetPage(pn); - PdfRect rect = page->GetMediaBox(); + for (int pn = 0; pn < doc.pages(); ++pn) { + SkPdfPageObjectDictionary* page = doc.page(pn); + + // TODO(edisonn): implement inheritance properties as per PDF spec + //SkRect rect = page->MediaBox(); + SkRect rect = doc.MediaBox(pn); + #ifdef PDF_TRACE - printf("Page Width: %f, Page Height: %f\n", rect.GetWidth(), rect.GetHeight()); + printf("Page Width: %f, Page Height: %f\n", SkScalarToDouble(rect.width()), SkScalarToDouble(rect.height())); #endif // TODO(edisonn): page->GetCropBox(), page->GetTrimBox() ... how to use? SkBitmap bitmap; #ifdef PDF_DEBUG_3X - setup_bitmap(&bitmap, 3*rect.GetWidth(), 3*rect.GetHeight()); + setup_bitmap(&bitmap, 3 * (int)SkScalarToDouble(rect.width()), 3 * (int)SkScalarToDouble(rect.height())) #else - setup_bitmap(&bitmap, rect.GetWidth(), rect.GetHeight()); + setup_bitmap(&bitmap, (int)SkScalarToDouble(rect.width()), (int)SkScalarToDouble(rect.height())); #endif SkAutoTUnref<SkDevice> device(SkNEW_ARGS(SkDevice, (bitmap))); SkCanvas canvas(device); + SkPdfTokenizer tokenizer = doc.tokenizerOfPage(pn); - const char* pszToken = NULL; - PdfVariant var; - EPdfContentsType eType; - - PdfContentsTokenizer tokenizer( page ); - - PdfContext pdfContext; - pdfContext.fPdfPage = page; - pdfContext.fPdfDoc = &doc; + PdfContext pdfContext(doc); pdfContext.fOriginalMatrix = SkMatrix::I(); - pdfContext.fGraphicsState.fResources = SkPdfResourceDictionary(pdfContext.fPdfDoc, resolveReferenceObject(pdfContext.fPdfDoc, - pdfContext.fPdfPage->GetResources())); + pdfContext.fGraphicsState.fResources = NULL; + PodofoMapper::map(*page->Resources(), &pdfContext.fGraphicsState.fResources); gPdfContext = &pdfContext; gDumpBitmap = &bitmap; @@ -2791,8 +2721,8 @@ public: // TODO(edisonn): get matrix stuff right. // TODO(edisonn): add DPI/scale/zoom. SkScalar z = SkIntToScalar(0); - SkScalar w = SkDoubleToScalar(rect.GetWidth()); - SkScalar h = SkDoubleToScalar(rect.GetHeight()); + SkScalar w = rect.width(); + SkScalar h = rect.height(); SkPoint pdfSpace[4] = {SkPoint::Make(z, z), SkPoint::Make(w, z), SkPoint::Make(w, h), SkPoint::Make(z, h)}; // SkPoint skiaSpace[4] = {SkPoint::Make(z, h), SkPoint::Make(w, h), SkPoint::Make(w, z), SkPoint::Make(z, z)}; @@ -2830,7 +2760,7 @@ public: canvas.clipRect(SkRect::MakeXYWH(z, z, w, h), SkRegion::kIntersect_Op, true); #endif - PdfMainLooper looper(NULL, &tokenizer, &pdfContext, &canvas); + PdfMainLooper looper(NULL, tokenizer, &pdfContext, &canvas); looper.loop(); canvas.flush(); diff --git a/experimental/PdfViewer/pdfspec_autogen.py b/experimental/PdfViewer/pdfspec_autogen.py index ffaa430f1b..38ff5d3ddf 100644 --- a/experimental/PdfViewer/pdfspec_autogen.py +++ b/experimental/PdfViewer/pdfspec_autogen.py @@ -83,43 +83,43 @@ def buildPdfSpec(pdfspec): .optional()\ .field('EndOfLine')\ .name('EndOfLine')\ - .type(' boolean')\ + .type('boolean')\ .comment('()A flag indicating whether end-of-line bit patterns are required to be\npresent in the encoding. The CCITTFaxDecode filter always accepts\nend-of-line bit patterns, but requires them only if EndOfLine is true.\nDefault value: false.')\ .done().done()\ .optional()\ .field('EncodedByteAlign')\ .name('EncodedByteAlign')\ - .type(' boolean')\ + .type('boolean')\ .comment('()A flag indicating whether the filter expects extra 0 bits before each\nencoded line so that the line begins on a byte boundary. If true, the\nfilter skips over encoded bits to begin decoding each line at a byte\nboundary. If false, the filter does not expect extra bits in the encod-\ned representation. Default value: false.')\ .done().done()\ .optional()\ .field('Columns')\ .name('Columns')\ - .type(' integer')\ + .type('integer')\ .comment('()The width of the image in pixels. If the value is not a multiple of 8,\nthe filter adjusts the width of the unencoded image to the next mul-\ntiple of 8, so that each line starts on a byte boundary. Default value:\n1728.')\ .done().done()\ .optional()\ .field('Rows')\ .name('Rows')\ - .type(' integer')\ + .type('integer')\ .comment('()The height of the image in scan lines. If the value is 0 or absent, the\nimage\'s height is not predetermined, and the encoded data must be\nterminated by an end-of-block bit pattern or by the end of the fil-\nter\'s data. Default value: 0.')\ .done().done()\ .optional()\ .field('EndOfBlock')\ .name('EndOfBlock')\ - .type(' boolean')\ + .type('boolean')\ .comment('()A flag indicating whether the filter expects the encoded data to be\nterminated by an end-of-block pattern, overriding the Rows pa-\nrameter. If false, the filter stops when it has decoded the number of\nlines indicated by Rows or when its data has been exhausted, which-\never occurs first. The end-of-block pattern is the CCITT end-of-\nfacsimile-block (EOFB) or return-to-control (RTC) appropriate for\nthe K parameter. Default value: true.')\ .done().done()\ .optional()\ .field('BlackIs1')\ .name('BlackIs1')\ - .type(' boolean')\ + .type('boolean')\ .comment('()A flag indicating whether 1 bits are to be interpreted as black pixels\nand 0 bits as white pixels, the reverse of the normal PDF convention\nfor image data. Default value: false.')\ .done().done()\ .optional()\ .field('DamagedRowsBeforeError')\ .name('DamagedRowsBeforeError')\ - .type(' integer')\ + .type('integer')\ .comment('()The number of damaged rows of data to be tolerated before an\nerror occurs. This entry applies only if EndOfLine is true and K is\nnonnegative. Tolerating a damaged row means locating its end in\nthe encoded data by searching for an EndOfLine pattern and then\nsubstituting decoded data from the previous row if the previous\nrow was not damaged, or a white scan line if the previous row was\nalso damaged. Default value: 0.')\ .done().done()\ .done() @@ -617,7 +617,7 @@ def buildPdfSpec(pdfspec): .optional()\ .field('XObject')\ .name('XObject')\ - .type('stream')\ + .type('dictionary')\ .comment('(Optional) A dictionary mapping resource names to external objects (see Sec-\ntion 4.7, "External Objects").')\ .done().done()\ .optional()\ |