refactoring for pdf viewer lib

experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.h

Index: experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.h
===================================================================
--- experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.h	(revision 9765)
+++ experimental/PdfViewer/autogen/SkPdfCatalogDictionary_autogen.h	(working copy)
@@ -532,13 +532,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Type", "", NULL));
   }
 
-  std::string Type() const {
-    std::string ret;
-    if (NameFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Type", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
+  std::string Type() const;
 /** (Optional; PDF 1.4) The version of the PDF specification to which the
  *  document conforms (for example, 1.4), if later than the version specified
  *  in the file's header (see Section 3.4.1, "File Header"). If the header speci-
@@ -555,13 +549,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Version", "", NULL));
   }
 
-  std::string Version() const {
-    std::string ret;
-    if (NameFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Version", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
+  std::string Version() const;
 /** (Required; must be an indirect reference) The page tree node that is the
  *  root of the document's page tree (see Section 3.6.2, "Page Tree").
 **/
@@ -569,13 +557,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Pages", "", NULL));
   }
 
-  SkPdfDictionary* Pages() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Pages", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* Pages() const;
 /** (Optional; PDF 1.3) A number tree (see Section 3.8.5, "Number Trees")
  *  defining the page labeling for the document. The keys in this tree are
  *  page indices; the corresponding values are page label dictionaries (see
@@ -593,26 +575,14 @@
     return ret->podofo()->GetDataType() == ePdfDataType_Real || ret->podofo()->GetDataType() == ePdfDataType_Number;
   }
 
-  double getPageLabelsAsNumber() const {
-    double ret = 0;
-    if (DoubleFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "PageLabels", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return 0;
-  }
-
+  double getPageLabelsAsNumber() const;
   bool isPageLabelsATree() const {
     SkPdfObject* ret = NULL;
     if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "PageLabels", "", &ret)) return false;
     return ret->podofo()->GetDataType() == ePdfDataType_Reference;
   }
 
-  SkPdfTree* getPageLabelsAsTree() const {
-    SkPdfTree* ret = NULL;
-    if (TreeFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "PageLabels", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfTree* getPageLabelsAsTree() const;
 /** (Optional; PDF 1.2) The document's name dictionary (see Section 3.6.3,
  *  "Name Dictionary").
 **/
@@ -620,13 +590,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Names", "", NULL));
   }
 
-  SkPdfDictionary* Names() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Names", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* Names() const;
 /** (Optional; PDF 1.1; must be an indirect reference) A dictionary of names
  *  and corresponding destinations (see "Named Destinations" on page
  *  476).
@@ -635,13 +599,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Dests", "", NULL));
   }
 
-  SkPdfDictionary* Dests() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Dests", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* Dests() const;
 /** (Optional; PDF 1.2) A viewer preferences dictionary (see Section 8.1,
  *  "Viewer Preferences") specifying the way the document is to be dis-
  *  played on the screen. If this entry is absent, viewer applications should
@@ -651,13 +609,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ViewerPreferences", "", NULL));
   }
 
-  SkPdfDictionary* ViewerPreferences() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ViewerPreferences", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* ViewerPreferences() const;
 /** (Optional) A name object specifying the page layout to be used when the
  *  document is opened:
  *      SinglePage           Display one page at a time.
@@ -672,13 +624,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "PageLayout", "", NULL));
   }
 
-  std::string PageLayout() const {
-    std::string ret;
-    if (NameFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "PageLayout", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
+  std::string PageLayout() const;
 /** (Optional) A name object specifying how the document should be dis-
  *  played when opened:
  *      UseNone              Neither document outline nor thumbnail im-
@@ -693,13 +639,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "PageMode", "", NULL));
   }
 
-  std::string PageMode() const {
-    std::string ret;
-    if (NameFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "PageMode", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
+  std::string PageMode() const;
 /** (Optional; must be an indirect reference) The outline dictionary that is the
  *  root of the document's outline hierarchy (see Section 8.2.2, "Document
  *  Outline").
@@ -708,13 +648,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Outlines", "", NULL));
   }
 
-  SkPdfDictionary* Outlines() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Outlines", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* Outlines() const;
 /** (Optional; PDF 1.1; must be an indirect reference) An array of thread
  *  dictionaries representing the document's article threads (see Section
  *  8.3.2, "Articles").
@@ -723,13 +657,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Threads", "", NULL));
   }
 
-  SkPdfArray* Threads() const {
-    SkPdfArray* ret;
-    if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Threads", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfArray* Threads() const;
 /** (Optional; PDF 1.1) A value specifying a destination to be displayed or
  *  an action to be performed when the document is opened. The value is
  *  either an array defining a destination (see Section 8.2.1, "Destinations")
@@ -747,26 +675,14 @@
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray* getOpenActionAsArray() const {
-    SkPdfArray* ret = NULL;
-    if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "OpenAction", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfArray* getOpenActionAsArray() const;
   bool isOpenActionADictionary() const {
     SkPdfObject* ret = NULL;
     if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "OpenAction", "", &ret)) return false;
     return ret->podofo()->GetDataType() == ePdfDataType_Dictionary;
   }
 
-  SkPdfDictionary* getOpenActionAsDictionary() const {
-    SkPdfDictionary* ret = NULL;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "OpenAction", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* getOpenActionAsDictionary() const;
 /** (Optional; PDF 1.4) An additional-actions dictionary defining the actions
  *  to be taken in response to various trigger events affecting the document
  *  as a whole (see "Trigger Events" on page 514). (See also implementation
@@ -776,13 +692,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "AA", "", NULL));
   }
 
-  SkPdfDictionary* AA() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "AA", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* AA() const;
 /** (Optional) A URI dictionary containing document-level information for
  *  URI (uniform resource identifier) actions (see "URI Actions" on page
  *  523).
@@ -791,13 +701,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "URI", "", NULL));
   }
 
-  SkPdfDictionary* URI() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "URI", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* URI() const;
 /** (Optional; PDF 1.2) The document's interactive form (AcroForm) dic-
  *  tionary (see Section 8.6.1, "Interactive Form Dictionary").
 **/
@@ -805,13 +709,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "AcroForm", "", NULL));
   }
 
-  SkPdfDictionary* AcroForm() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "AcroForm", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* AcroForm() const;
 /** (Optional; PDF 1.4; must be an indirect reference) A metadata stream
  *  containing metadata for the document (see Section 9.2.2, "Metadata
  *  Streams").
@@ -820,13 +718,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", NULL));
   }
 
-  SkPdfStream* Metadata() const {
-    SkPdfStream* ret;
-    if (StreamFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Metadata", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfStream* Metadata() const;
 /** (Optional; PDF 1.3) The document's structure tree root dictionary (see
  *  Section 9.6.1, "Structure Hierarchy").
 **/
@@ -834,13 +726,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "StructTreeRoot", "", NULL));
   }
 
-  SkPdfDictionary* StructTreeRoot() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "StructTreeRoot", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* StructTreeRoot() const;
 /** (Optional; PDF 1.4) A mark information dictionary containing informa-
  *  tion about the document's usage of Tagged PDF conventions (see Sec-
  *  tion 9.7.1, "Mark Information Dictionary").
@@ -849,13 +735,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "MarkInfo", "", NULL));
   }
 
-  SkPdfDictionary* MarkInfo() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "MarkInfo", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* MarkInfo() const;
 /** (Optional; PDF 1.4) A language identifier specifying the natural language
  *  for all text in the document except where overridden by language speci-
  *  fications for structure elements or marked content (see Section 9.8.1,
@@ -866,13 +746,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Lang", "", NULL));
   }
 
-  std::string Lang() const {
-    std::string ret;
-    if (StringFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "Lang", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
+  std::string Lang() const;
 /** (Optional; PDF 1.3) A Web Capture information dictionary containing
  *  state information used by the Acrobat Web Capture (AcroSpider) plug-
  *  in extension (see Section 9.9.1, "Web Capture Information Dictionary").
@@ -881,13 +755,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "SpiderInfo", "", NULL));
   }
 
-  SkPdfDictionary* SpiderInfo() const {
-    SkPdfDictionary* ret;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "SpiderInfo", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* SpiderInfo() const;
 /** (Optional; PDF 1.4) An array of output intent dictionaries describing the
  *  color characteristics of output devices on which the document might be
  *  rendered (see "Output Intents" on page 684).
@@ -896,13 +764,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "OutputIntents", "", NULL));
   }
 
-  SkPdfArray* OutputIntents() const {
-    SkPdfArray* ret;
-    if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "OutputIntents", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfArray* OutputIntents() const;
 };
 
 #endif  // __DEFINED__SkPdfCatalogDictionary