QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

webkit/quota/quota_manager.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 WEBKIT_QUOTA_QUOTA_MANAGER_H_
 #define WEBKIT_QUOTA_QUOTA_MANAGER_H_
 #pragma once
 
 #include <deque>
 #include <list>
 #include <map>
@@ skipping 129 matching lines @@
 
   // Used to avoid evicting origins with open pages.
   // A call to NotifyOriginInUse must be balanced by a later call
   // to NotifyOriginNoLongerInUse.
   void NotifyOriginInUse(const GURL& origin);
   void NotifyOriginNoLongerInUse(const GURL& origin);
   bool IsOriginInUse(const GURL& origin) const {
     return origins_in_use_.find(origin) != origins_in_use_.end();
   }
 
-  // Called by UI.
+  // DeleteOriginData and DeleteHostData (surprisingly enough) delete data of a
+  // particular StorageType associated with either a specific origin or set of
+  // origins. Each method additionally requires a quota_client_mask which
+  // specifies the types of QuotaClients to delete from the origin. This is
+  // specified as a bitmask built from QuotaClient::IDs.

[kinuko, 2012/01/22 18:35:31]

It might be helpful to note that the caller specify the wildcard mask
(kAllClientsMask) to delete all.

[Mike West, 2012/01/22 20:54:38]

Good call. Done, both here and in MockQuotaManager.

+  //
+  // Both methods must be called on the UI thread.
   virtual void DeleteOriginData(const GURL& origin,
                                 StorageType type,
+                                int quota_client_mask,
                                 const StatusCallback& callback);
   void DeleteHostData(const std::string& host,
                       StorageType type,
+                      int quota_client_mask,
                       const StatusCallback& callback);
 
   // Called by UI and internal modules.
   void GetAvailableSpace(const AvailableSpaceCallback& callback);
   void GetTemporaryGlobalQuota(const QuotaCallback& callback);
 
   // Ok to call with NULL callback.
   void SetTemporaryGlobalOverrideQuota(int64 new_quota,
                                        const QuotaCallback& callback);
 
@@ skipping 245 matching lines @@
 
   QuotaManager* manager_;  // only accessed on the io thread
   scoped_refptr<base::MessageLoopProxy> io_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaManagerProxy);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_QUOTA_MANAGER_H_