Continue to contain podofo, shorter enums

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9670 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h b/experimental/PdfViewer/SkPdfBlockLevelStructureElementsDictionary_autogen.h
index 67f7d3e..d795a62 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 @@
   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 @@
   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 {