PicasaAlbumTableReader for Media Galleries API

webkit/fileapi/media/picasa/pmp_table_reader.h

Index: webkit/fileapi/media/picasa/pmp_table_reader.h
diff --git a/webkit/fileapi/media/picasa/pmp_table_reader.h b/webkit/fileapi/media/picasa/pmp_table_reader.h
index de2627f5bf6290ea6496fe00779bf75cca6301f9..5caff1a5d9d7e7570db2f9322b1570febdad1d0f 100644
--- a/webkit/fileapi/media/picasa/pmp_table_reader.h
+++ b/webkit/fileapi/media/picasa/pmp_table_reader.h
@@ -5,10 +5,13 @@
 #ifndef WEBKIT_FILEAPI_MEDIA_PICASA_PMP_TABLE_READER_H_
 #define WEBKIT_FILEAPI_MEDIA_PICASA_PMP_TABLE_READER_H_
 
+#include <map>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/files/file_path.h"
 #include "base/memory/scoped_vector.h"
+#include "webkit/fileapi/media/picasa/pmp_constants.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
@@ -21,23 +24,30 @@ class PmpColumnReader;
 
 class WEBKIT_STORAGE_EXPORT_PRIVATE PmpTableReader {
  public:
-  PmpTableReader();
+  PmpTableReader(const std::string& table_name,
+                 const base::FilePath& directory_path);
 
   virtual ~PmpTableReader();
 
-  // |columns| parameter will define, in-order, the columns returned by
-  // subsequent columns to GetColumns() if Init() succeeds.
-  bool Init(const std::string& table_name,
-            const base::FilePath& directory_path,
-            const std::vector<std::string>& columns);
+  // Returns NULL on failure.
+  const PmpColumnReader* AddColumn(const std::string& column_name,
+                                   const PmpFieldType expected_type);
 
-  // Returns a const "view" of the current contents of |column_readers_|.
-  std::vector<const PmpColumnReader*> GetColumns() const;
+  // Returns a const "view" of the successfully added columns.
+  std::map<std::string, const PmpColumnReader*> Columns() const;
 
+  // This value may change after calls to AddColumn().
   uint32 RowCount() const;
 
  private:
+  bool initialized_;
+
+  std::string table_name_;
+  base::FilePath directory_path_;
+
   ScopedVector<PmpColumnReader> column_readers_;
+  std::map<std::string, const PmpColumnReader*> column_map_;
+
   uint32 max_row_count_;
 
   DISALLOW_COPY_AND_ASSIGN(PmpTableReader);