Allowing multiple SaveItems to have same URLs.

content/browser/download/save_package.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_
 #define CONTENT_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 89 matching lines @@
   // written to disk.
   bool Init(const SavePackageDownloadCreatedCallback& cb);
 
   // Cancel all in progress request, might be called by user or internal error.
   void Cancel(bool user_action);
 
   void Finish();
 
   // Notifications sent from the file thread to the UI thread.
   void StartSave(const SaveFileCreateInfo* info);
-  bool UpdateSaveProgress(int32 save_id, int64 size, bool write_success);
-  void SaveFinished(int32 save_id, int64 size, bool is_success);
-  void SaveFailed(const GURL& save_url);
+  bool UpdateSaveProgress(int32 save_item_id, int64 size, bool write_success);
+  void SaveFinished(int32 save_item_id, int64 size, bool is_success);
   void SaveCanceled(SaveItem* save_item);
 
   // Rough percent complete, -1 means we don't know (since we didn't receive a
   // total size).
   int PercentComplete();
 
   bool canceled() const { return user_canceled_ || disk_error_occurred_; }
   bool finished() const { return finished_; }
   SavePageType save_type() const { return save_type_; }
   int id() const { return unique_id_; }
@@ skipping 56 matching lines @@
                         bool need_html_ext,
                         base::FilePath::StringType* generated_name);
 
   // Main routine that initiates asking all frames for their savable resources,
   // using GetSavableResourceLinksForFrame to send IPC to individual frames.
   //
   // Responses are received asynchronously by OnSavableResourceLinks... methods
   // and pending responses are counted/tracked by
   // CompleteSavableResourceLinksResponse.
   //
   // OnSavableResourceLinksResponse creates of SaveItems for each savable

[Randy Smith (Not in Mondays), 2015/12/03 20:58:28]

nit: Willing to fix this grammar while you're here?  ("creates of SaveItems")

[Łukasz Anforowicz, 2015/12/04 21:16:45]

Oops.  That came from my commit :-)

   // resource and each subframe which get enqueued into |waiting_item_queue_|
-  // with the help of FindOrCreatePendingSaveItem, EnqueueSavableResource,
+  // with the help of CreatePendingSaveItem, EnqueueSavableResource,
   // EnqueueFrame.
   void GetSavableResourceLinks();
 
   // Asks a given frame for its savable resources.
   void GetSavableResourceLinksForFrame(RenderFrameHost* target);
 
   // Response from |sender| frame to GetSavableResourceLinksForFrame request.
   void OnSavableResourceLinksResponse(
       RenderFrameHostImpl* sender,
       const std::vector<GURL>& resources_list,
       const Referrer& referrer,
       const std::vector<SavableSubframe>& subframes);
 
   // Helper for finding or creating a SaveItem with the given parameters.
-  SaveItem* FindOrCreatePendingSaveItem(
+  SaveItem* CreatePendingSaveItem(
       int container_frame_tree_node_id,
       const GURL& url,
       const Referrer& referrer,
+      SaveFileCreateInfo::SaveFileSource save_source);
+
+  // Helper for finding a SaveItem with the given url, or falling back to
+  // creating a SaveItem with the given parameters.
+  SaveItem* CreatePendingSaveItemDeduplicatingByUrl(
+      int container_frame_tree_node_id,
+      const GURL& url,
+      const Referrer& referrer,
       SaveFileCreateInfo::SaveFileSource save_source);
 
   // Helper to enqueue a savable resource reported by
   // GetSavableResourceLinksForFrame.
   void EnqueueSavableResource(int container_frame_tree_node_id,
                               const GURL& url,
                               const Referrer& referrer);
   // Helper to enqueue a subframe reported by GetSavableResourceLinksForFrame.
   void EnqueueFrame(int container_frame_tree_node_id,
                     int frame_tree_node_id,
@@ skipping 16 matching lines @@
   // with resource links replaced with a link to a locally saved copy.
   void GetSerializedHtmlWithLocalLinksForFrame(FrameTreeNode* target_tree_node);
 
   // Routes html data (sent by renderer process in response to
   // GetSerializedHtmlWithLocalLinksForFrame above) to the associated local file
   // (and also keeps track of when all frames have been completed).
   void OnSerializedHtmlWithLocalLinksResponse(RenderFrameHostImpl* sender,
                                               const std::string& data,
                                               bool end_of_data);
 
-  // Look up SaveItem by save id from in progress map.
-  SaveItem* LookupItemInProcessBySaveId(int32 save_id);
+  // Look up SaveItem by save item id from in progress map.
+  SaveItem* LookupSaveItemInProcess(int32 save_item_id);
 
   // Remove SaveItem from in progress map and put it to saved map.
   void PutInProgressItemToSavedMap(SaveItem* save_item);
 
   // Retrieves the URL to be saved from the WebContents.
   GURL GetUrlToBeSaved();
 
   void CreateDirectoryOnFileThread(const base::FilePath& website_save_dir,
                                    const base::FilePath& download_save_dir,
                                    bool skip_dir_check,
                                    const std::string& mime_type,
                                    const std::string& accept_langs);
   void ContinueGetSaveInfo(const base::FilePath& suggested_path,
                            bool can_save_as_complete);
   void OnPathPicked(
       const base::FilePath& final_name,
       SavePageType type,
       const SavePackageDownloadCreatedCallback& cb);
 
-  typedef base::hash_map<std::string, SaveItem*> SaveUrlItemMap;
+  // Map from SaveItem::id() (aka save_item_id) into a SaveItem.
+  typedef base::hash_map<int, SaveItem*> SaveItemIdMap;
   // in_progress_items_ is map of all saving job in in-progress state.
-  SaveUrlItemMap in_progress_items_;
+  SaveItemIdMap in_progress_items_;
   // saved_failed_items_ is map of all saving job which are failed.
-  SaveUrlItemMap saved_failed_items_;
+  SaveItemIdMap saved_failed_items_;
 
   // The number of in process SaveItems.
   int in_process_count() const {
     return static_cast<int>(in_progress_items_.size());
   }
 
   // The number of all SaveItems which have completed, including success items
   // and failed items.
   int completed_count() const {
     return static_cast<int>(saved_success_items_.size() +
@@ skipping 121 matching lines @@
   friend class SavePackageTest;
   FRIEND_TEST_ALL_PREFIXES(SavePackageTest, TestSuggestedSaveNames);
   FRIEND_TEST_ALL_PREFIXES(SavePackageTest, TestLongSafePureFilename);
 
   DISALLOW_COPY_AND_ASSIGN(SavePackage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_