[Quota] Refine usage handling in ClientUsageTracker.

webkit/quota/usage_tracker.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_USAGE_TRACKER_H_
 #define WEBKIT_QUOTA_USAGE_TRACKER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 72 matching lines @@
 // This class holds per-client usage tracking information and caches per-host
 // usage data.  An instance of this class is created per client.
 class ClientUsageTracker : public SpecialStoragePolicy::Observer,
                            public base::NonThreadSafe,
                            public base::SupportsWeakPtr<ClientUsageTracker> {
  public:
   typedef base::Callback<void(int64 cached_usage,
                               int64 non_cached_usage)> HostUsageAccumulator;
   typedef base::Callback<void(const GURL& origin,
                               int64 usage)> OriginUsageAccumulator;
+  typedef std::map<std::string, std::set<GURL> > OriginSetByHost;
 
   ClientUsageTracker(UsageTracker* tracker,
                      QuotaClient* client,
                      StorageType type,
                      SpecialStoragePolicy* special_storage_policy);
   virtual ~ClientUsageTracker();
 
   void GetGlobalUsage(const GlobalUsageCallback& callback);
   void GetHostUsage(const std::string& host, const UsageCallback& callback);
   void UpdateUsageCache(const GURL& origin, int64 delta);
   void GetCachedHostsUsage(std::map<std::string, int64>* host_usage) const;
   void GetCachedOrigins(std::set<GURL>* origins) const;
   int64 GetCachedOriginsUsage(const std::set<GURL>& origins,
                               std::vector<GURL>* origins_not_in_cache);
   bool IsUsageCacheEnabledForOrigin(const GURL& origin) const;
   void SetUsageCacheEnabled(const GURL& origin, bool enabled);
 
  private:
   typedef CallbackQueueMap<HostUsageAccumulator, std::string,
                            Tuple2<int64, int64> > HostUsageAccumulatorMap;
 
   typedef std::set<std::string> HostSet;
   typedef std::map<GURL, int64> UsageMap;
   typedef std::map<std::string, UsageMap> HostUsageMap;
-  typedef std::map<std::string, std::set<GURL> > OriginSetByHost;
 
   struct AccumulateInfo {
     int pending_jobs;
     int64 cached_usage;
     int64 non_cached_usage;
 
     AccumulateInfo() : pending_jobs(0), cached_usage(0), non_cached_usage(0) {}
   };
 
   void DidGetOriginsForGlobalUsage(const GlobalUsageCallback& callback,
@@ skipping 28 matching lines @@
   virtual void OnGranted(const GURL& origin, int change_flags) OVERRIDE;
   virtual void OnRevoked(const GURL& origin, int change_flags) OVERRIDE;
   virtual void OnCleared() OVERRIDE;
 
   bool IsStorageUnlimited(const GURL& origin) const;
 
   UsageTracker* tracker_;
   QuotaClient* client_;
   const StorageType type_;
 
-  int64 global_usage_;
+  int64 global_limited_usage_;
   int64 global_unlimited_usage_;
   bool global_usage_retrieved_;
   HostSet cached_hosts_;
   HostUsageMap cached_usage_by_host_;
 
-  OriginSetByHost non_cached_origins_by_host_;
+  OriginSetByHost non_cached_limited_origins_by_host_;
+  OriginSetByHost non_cached_unlimited_origins_by_host_;
 
   GlobalUsageCallbackQueue global_usage_callback_;
   HostUsageAccumulatorMap host_usage_accumulators_;
 
   scoped_refptr<SpecialStoragePolicy> special_storage_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientUsageTracker);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_USAGE_TRACKER_H_