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..daa0acd54f5a48303297aa24d293e0141630a851 100644
--- a/webkit/fileapi/media/picasa/pmp_table_reader.h
+++ b/webkit/fileapi/media/picasa/pmp_table_reader.h
@@ -8,7 +8,9 @@
 #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,22 +23,29 @@ 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

[vandebo (ex-Chrome), 2013/04/08 23:57:24]

Comment is out of date.

[tommycli, 2013/04/09 00:45:34]

I see what you mean about comments being a burden sometimes.

   // 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);
+  bool Init();
+
+  // 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;

[vandebo (ex-Chrome), 2013/04/08 23:57:24]

std:map

[tommycli, 2013/04/09 00:45:34]

Done.

 
+  // This value may change after calls to AddColumn().
   uint32 RowCount() const;
 
  private:
+  std::string table_name_;
+  base::FilePath directory_path_;
+
   ScopedVector<PmpColumnReader> column_readers_;
   uint32 max_row_count_;