Refactor Reading List Model to use URL as key.

ios/chrome/browser/reading_list/reading_list_model_impl.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef IOS_CHROME_BROWSER_READING_LIST_READING_LIST_MODEL_IMPL_H_
 #define IOS_CHROME_BROWSER_READING_LIST_READING_LIST_MODEL_IMPL_H_
 
 #include <memory>
+#include <unordered_map>
 
 #include "components/keyed_service/core/keyed_service.h"
 #include "ios/chrome/browser/reading_list/reading_list_entry.h"
 #include "ios/chrome/browser/reading_list/reading_list_model.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_storage.h"
 #include "ios/chrome/browser/reading_list/reading_list_store_delegate.h"
 
 class PrefService;
 
 // Concrete implementation of a reading list model using in memory lists.
 class ReadingListModelImpl : public ReadingListModel,
                              public ReadingListStoreDelegate,
                              public KeyedService {
  public:
   // Initialize a ReadingListModelImpl to load and save data in
   // |persistence_layer|.
   ReadingListModelImpl(std::unique_ptr<ReadingListModelStorage> storage_layer,
                        PrefService* pref_service);
 
   // Initialize a ReadingListModelImpl without persistence. Data will not be
   // persistent across sessions.
   ReadingListModelImpl();
 
   syncer::ModelTypeSyncBridge* GetModelTypeSyncBridge() override;
 
   ~ReadingListModelImpl() override;
 
-  void StoreLoaded(std::unique_ptr<ReadingListEntries> unread,
-                   std::unique_ptr<ReadingListEntries> read) override;
+  void StoreLoaded(std::unique_ptr<ReadingListEntries> entries) override;
 
   // KeyedService implementation.
   void Shutdown() override;
 
   // ReadingListModel implementation.
   bool loaded() const override;
 
+  size_t size() const override;
   size_t unread_size() const override;

[gambard, 2016/11/23 12:11:07]

Will this be deleted?

[Olivier, 2016/11/28 14:54:15]

Done.

   size_t read_size() const override;
 
   bool HasUnseenEntries() const override;
   void ResetUnseenEntries() override;
 
-  const ReadingListEntry& GetUnreadEntryAtIndex(size_t index) const override;
-  const ReadingListEntry& GetReadEntryAtIndex(size_t index) const override;
-
-  const ReadingListEntry* GetEntryFromURL(const GURL& gurl,
-                                          bool* read) const override;
+  const ReadingListEntry* GetEntryFromURL(const GURL& gurl) const override;
+  const ReadingListEntry* GetEntryAt(size_t index) const override;
+  const ReadingListEntry* GetReadEntryAt(size_t index) const override;
+  const ReadingListEntry* GetUnreadEntryAt(size_t index) const override;
 
   bool CallbackEntryURL(
       const GURL& url,
       base::Callback<void(const ReadingListEntry&)> callback) const override;
 
   void RemoveEntryByURL(const GURL& url) override;
 
   const ReadingListEntry& AddEntry(const GURL& url,
                                    const std::string& title) override;
 
-  void MarkReadByURL(const GURL& url) override;
-  void MarkUnreadByURL(const GURL& url) override;
+  void SetReadStatus(const GURL& url, bool read) override;
 
   void SetEntryTitle(const GURL& url, const std::string& title) override;
   void SetEntryDistilledPath(const GURL& url,
                              const base::FilePath& distilled_path) override;
   void SetEntryDistilledState(
       const GURL& url,
       ReadingListEntry::DistillationState state) override;
 
-  void SyncAddEntry(std::unique_ptr<ReadingListEntry> entry,
-                    bool read) override;
-  ReadingListEntry* SyncMergeEntry(std::unique_ptr<ReadingListEntry> entry,
-                                   bool read) override;
+  void SyncAddEntry(std::unique_ptr<ReadingListEntry> entry) override;
+  ReadingListEntry* SyncMergeEntry(
+      std::unique_ptr<ReadingListEntry> entry) override;
   void SyncRemoveEntry(const GURL& url) override;
 
   std::unique_ptr<ReadingListModel::ScopedReadingListBatchUpdate>
   CreateBatchToken() override;
 
   // Helper class that is used to scope batch updates.
   class ScopedReadingListBatchUpdate
       : public ReadingListModel::ScopedReadingListBatchUpdate {
    public:
     explicit ScopedReadingListBatchUpdate(ReadingListModelImpl* model);
@@ skipping 10 matching lines @@
   void EnteringBatchUpdates() override;
   void LeavingBatchUpdates() override;
 
  private:
   // Sets/Loads the pref flag that indicate if some entries have never been seen
   // since being added to the store.
   void SetPersistentHasUnseen(bool has_unseen);
   bool GetPersistentHasUnseen();
 
   // Returns a mutable pointer to the entry with URL |gurl|. Return nullptr if
   // no entry is found. If an entry is found, |read| is set to the read status

[jif-google, 2016/11/22 18:21:45]

update comment.

[Olivier, 2016/11/28 14:54:14]

Done.

   // of the entry.
-  ReadingListEntry* GetMutableEntryFromURL(const GURL& gurl, bool* read) const;
-
-  // Sorts the entries in |read_| and |unread_| according to their |UpdateTime|.
-  void SortEntries();
+  ReadingListEntry* GetMutableEntryFromURL(const GURL& gurl) const;
 
   // Returns the |storage_layer_| of the model.
   ReadingListModelStorage* StorageLayer();
 
   // Remove |entry| from the |entries| vector and calls the Move notifications
   // on observers.
   void MoveEntryFrom(ReadingListEntries* entries,

[gambard, 2016/11/23 12:11:07]

Is this still used?

[Olivier, 2016/11/28 14:54:14]

Done.

                      const ReadingListEntry& entry,
                      bool read);
 
   // Remove entry |url| and propagate to store if |from_sync| is false.
   void RemoveEntryByURLImpl(const GURL& url, bool from_sync);
 
-  std::unique_ptr<ReadingListEntries> unread_;
-  std::unique_ptr<ReadingListEntries> read_;
+  void RebuildIndex() const;
+
+  std::unique_ptr<ReadingListEntries> entries_;
+  size_t unread_entry_count_;
+  size_t read_entry_count_;
+
+  struct Cache {
+    Cache();
+    ~Cache();
+    std::vector<GURL> read_entries;
+    std::vector<GURL> unread_entries;
+    bool dirty;
+  };
+  std::unique_ptr<struct Cache> cache_;
+
   std::unique_ptr<ReadingListModelStorage> storage_layer_;
   PrefService* pref_service_;
   bool has_unseen_;
   bool loaded_;
   base::WeakPtrFactory<ReadingListModelImpl> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(ReadingListModelImpl);
 };
 
 #endif  // IOS_CHROME_BROWSER_READING_LIST_READING_LIST_MODEL_MEMORY_H_