PicasaAlbumTableReader for Media Galleries API

webkit/fileapi/media/picasa/pmp_column_reader.h

Index: webkit/fileapi/media/picasa/pmp_column_reader.h
diff --git a/webkit/fileapi/media/picasa/pmp_column_reader.h b/webkit/fileapi/media/picasa/pmp_column_reader.h
index 126657421df75c498d7bc654e75380d7d2e9a6c1..cf6e8c434fe6363822f25c73f1d3a4be8da111b9 100644
--- a/webkit/fileapi/media/picasa/pmp_column_reader.h
+++ b/webkit/fileapi/media/picasa/pmp_column_reader.h
@@ -27,7 +27,8 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE PmpColumnReader {
 
   // Returns true if read successfully.
   // |rows_read| is undefined if returns false.
-  bool Init(const base::FilePath& filepath, uint32* rows_read);
+  bool Init(const base::FilePath& filepath, const PmpFieldType expected_type,
+            uint32* rows_read);

[tommycli, 2013/04/08 23:27:10]

Turns out that in every use case, I already know what type I expect it to be -
and it will fail later if I get it wrong, so I might as well fail immediately.

 
   // These functions read the value of that |row| into |result|.
   // Functions return false if the column is of the wrong type or the row
@@ -38,13 +39,8 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE PmpColumnReader {
   bool ReadUInt8(const uint32 row, uint8* result) const;
   bool ReadUInt64(const uint32 row, uint64* result) const;
 
-  // Returns the native encoding of field_type.
-  PmpFieldType field_type() const {
-    return field_type_;
-  }
-
  private:
-  bool ParseData(uint32* rows_read);
+  bool ParseData(const PmpFieldType expected_type, uint32* rows_read);
   // Returns the number of bytes parsed in the body, or, -1 on failure.
   long IndexStrings();