refactoring for pdf viewer lib

experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.h

Index: experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.h
===================================================================
--- experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_autogen.h	(revision 9765)
+++ experimental/PdfViewer/autogen/SkPdfWebCaptureDictionary_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;
 /** (Required) The subtype of content set that this dictionary describes:
  *     SPS     ("Spider page set") A page set
  *     SIS     ("Spider image set") An image set
@@ -547,13 +541,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "S", "", NULL));
   }
 
-  std::string S() const {
-    std::string ret;
-    if (NameFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "S", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
+  std::string S() const;
 /** (Required) The digital identifier of the content set (see "Digital Identifiers" on page
  *  664). If the content set has been located via the URLS name tree, this allows its related
  *  entry in the IDS name tree to be found.
@@ -562,13 +550,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ID", "", NULL));
   }
 
-  std::string ID() const {
-    std::string ret;
-    if (StringFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "ID", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
+  std::string ID() const;
 /** (Required) An array of indirect references to the objects belonging to the content set.
  *  The order of objects in the array is undefined in general, but may be restricted by spe-
  *  cific content set subtypes.
@@ -577,13 +559,7 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "O", "", NULL));
   }
 
-  SkPdfArray* O() const {
-    SkPdfArray* ret;
-    if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "O", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfArray* O() const;
 /** (Required) A source information dictionary (see Section 9.9.4, "Source Information"),
  *  or an array of such dictionaries, describing the sources from which the objects belong-
  *  ing to the content set were created.
@@ -598,26 +574,14 @@
     return ret->podofo()->GetDataType() == ePdfDataType_Dictionary;
   }
 
-  SkPdfDictionary* getSIAsDictionary() const {
-    SkPdfDictionary* ret = NULL;
-    if (DictionaryFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "SI", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfDictionary* getSIAsDictionary() const;
   bool isSIAArray() const {
     SkPdfObject* ret = NULL;
     if (!ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "SI", "", &ret)) return false;
     return ret->podofo()->GetDataType() == ePdfDataType_Array;
   }
 
-  SkPdfArray* getSIAsArray() const {
-    SkPdfArray* ret = NULL;
-    if (ArrayFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "SI", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return NULL;
-  }
-
+  SkPdfArray* getSIAsArray() const;
 /** (Optional) The content type, a string characterizing the source from which the objects
  *  belonging to the content set were created. The string should conform to the content
  *  type specification described in Internet RFC 2045, Multipurpose Internet Mail Exten-
@@ -629,26 +593,14 @@
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "CT", "", NULL));
   }
 
-  std::string CT() const {
-    std::string ret;
-    if (StringFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "CT", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return "";
-  }
-
+  std::string CT() const;
 /** (Optional) A time stamp giving the date and time at which the content set was created.
 **/
   bool has_TS() const {
     return (ObjectFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "TS", "", NULL));
   }
 
-  SkPdfDate TS() const {
-    SkPdfDate ret;
-    if (DateFromDictionary(fPodofoDoc, fPodofoObj->GetDictionary(), "TS", "", &ret)) return ret;
-    // TODO(edisonn): warn about missing required field, assert for known good pdfs
-    return SkPdfDate();
-  }
-
+  SkPdfDate TS() const;
 };
 
 #endif  // __DEFINED__SkPdfWebCaptureDictionary