QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

webkit/quota/quota_client.h

 // Copyright (c) 2011 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_CLIENT_H_
 #define WEBKIT_QUOTA_QUOTA_CLIENT_H_
 
 #include <list>
 #include <set>
 #include <string>
@@ skipping 12 matching lines @@
 class QuotaClient {
  public:
   typedef Callback1<int64>::Type GetUsageCallback;
   typedef Callback2<const std::set<GURL>&, StorageType>::Type
       GetOriginsCallback;
   typedef Callback1<QuotaStatusCode>::Type DeletionCallback;
 
   virtual ~QuotaClient() {}
 
   enum ID {
-    kUnknown,
-    kFileSystem,
-    kDatabase,
-    kAppcache,
-    kIndexedDatabase,
+    kUnknown = 1 << 0,
+    kFileSystem = 1 << 1,
+    kDatabase = 1 << 2,
+    kAppcache = 1 << 3,
+    kIndexedDatabase = 1 << 4,
     kMockStart,  // This needs to be the end of the enum.

[kinuko, 2011/09/26 09:43:48]

what should we do if we want to test the feature with the mock storage?

   };
 
+  static const int kAllClientsMask = kFileSystem | kDatabase | kAppcache |
+                                     kIndexedDatabase;

[kinuko, 2011/09/26 09:43:48]

-1?

+
   virtual ID id() const = 0;
 
   // Called when the quota manager is destroyed.
   virtual void OnQuotaManagerDestroyed() = 0;
 
   // Called by the QuotaManager.
   // Gets the amount of data stored in the storage specified by
   // |origin_url| and |type|.
   virtual void GetOriginUsage(const GURL& origin_url,
                               StorageType type,
                               GetUsageCallback* callback) = 0;
 
   // Called by the QuotaManager.
   // Returns a list of origins that has data in the |type| storage.
   virtual void GetOriginsForType(StorageType type,
                                  GetOriginsCallback* callback) = 0;
 
   // Called by the QuotaManager.
   // Returns a list of origins that match the |host|.
   virtual void GetOriginsForHost(StorageType type,
                                  const std::string& host,
                                  GetOriginsCallback* callback) = 0;
 
   // Called by the QuotaManager.
   virtual void DeleteOriginData(const GURL& origin,
                                 StorageType type,
                                 DeletionCallback* callback) = 0;
 };
 
+const int kQuotaClientAllIDsMask = QuotaClient::kFileSystem |
+    QuotaClient::kDatabase | QuotaClient::kAppcache |
+    QuotaClient::kIndexedDatabase;

[kinuko, 2011/09/26 09:43:48]

is this a dupe of line 41?

+
 // TODO(dmikurube): Replace it to std::vector for efficiency.
 typedef std::list<QuotaClient*> QuotaClientList;
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_QUOTA_CLIENT_H_