Implement QM::GetOriginsModifiedSince for browser data deleter support

webkit/quota/quota_manager.cc

 // 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.
 
 #include "webkit/quota/quota_manager.h"
 
 #include <algorithm>
 #include <deque>
 #include <set>
 
@@ skipping 329 matching lines @@
       return new UsageAndQuotaDispatcherTaskForPersistent(
           manager, host);
     default:
       NOTREACHED();
   }
   return NULL;
 }
 
 class QuotaManager::DatabaseTaskBase : public QuotaThreadTask {
  public:
-  DatabaseTaskBase(QuotaManager* manager)
+  explicit DatabaseTaskBase(QuotaManager* manager)
       : QuotaThreadTask(manager, manager->db_thread_),
         manager_(manager),
         database_(manager->database_.get()),
         db_disabled_(false) {
     DCHECK(manager_);
     DCHECK(database_);
   }
 
  protected:
   virtual void DatabaseTaskCompleted() = 0;
@@ skipping 214 matching lines @@
   OriginDeletionDatabaseTask(
       QuotaManager* manager,
       const GURL& origin,
       StorageType type)
       : DatabaseTaskBase(manager),
         origin_(origin),
         type_(type) {}
 
  protected:
   virtual void RunOnTargetThread() OVERRIDE {
-    if (!database()->DeleteOriginLastAccessTime(origin_, type_)) {
+    if (!database()->DeleteOriginInfo(origin_, type_)) {
       set_db_disabled(true);
     }
   }
   virtual void DatabaseTaskCompleted() OVERRIDE {}
 
  private:
   GURL origin_;
   StorageType type_;
 };
 
 class QuotaManager::TemporaryOriginsRegistrationTask
     : public QuotaManager::DatabaseTaskBase {
  public:
   TemporaryOriginsRegistrationTask(
       QuotaManager* manager,
       UsageTracker* temporary_usage_tracker)
       : DatabaseTaskBase(manager),
         has_registered_origins_(false) {
     DCHECK(temporary_usage_tracker);
     temporary_usage_tracker->GetCachedOrigins(&origins_);
   }
 
  protected:
   virtual void RunOnTargetThread() OVERRIDE {
     if (!database()->IsOriginDatabaseBootstrapped()) {
       // Register existing origins with 0 last time access.
-      if (!database()->RegisterOrigins(origins_,
-                                       kStorageTypeTemporary,
-                                       base::Time::FromInternalValue(0))) {
+      if (!database()->RegisterInitialOriginInfo(
+              origins_, kStorageTypeTemporary)) {
         set_db_disabled(true);
       } else {
         has_registered_origins_ = true;
         database()->SetOriginDatabaseBootstrapped(true);
       }
     }
   }
   virtual void DatabaseTaskCompleted() OVERRIDE {
     if (has_registered_origins_)
       manager()->StartEviction();
@@ skipping 16 matching lines @@
         space_(-1),
         callback_(callback) {}
   virtual ~AvailableSpaceQueryTask() {}
 
  protected:
   virtual void RunOnTargetThread() OVERRIDE {
     space_ = base::SysInfo::AmountOfFreeDiskSpace(profile_path_);
   }
 
   virtual void Aborted() OVERRIDE {
-    callback_->Run(kQuotaErrorAbort, space_);
+    callback_->Run(kQuotaErrorAbort, -1);
   }
 
   virtual void Completed() OVERRIDE {
     callback_->Run(kQuotaStatusOk, space_);
   }
 
  private:
   FilePath profile_path_;
   int64 space_;
   scoped_ptr<AvailableSpaceCallback> callback_;
@@ skipping 19 matching lines @@
     }
   }
   virtual void DatabaseTaskCompleted() OVERRIDE {}
 
  private:
   GURL origin_;
   StorageType type_;
   base::Time accessed_time_;
 };
 
+class QuotaManager::OriginModifyRecordDatabaseTask

[michaeln, 2011/07/01 00:17:39]

naming nit: these names are awkward to me, too many nouns and verbs all in
one... maybe UpdateModifiedTimeTask and GetModifiedSinceTask

[kinuko, 2011/07/04 07:43:52]

They are named like that in order to make them distinguishable from method
names, but I know they are awkward... simply renamed most of them in a format
'verb' + 'noun'.

+    : public QuotaManager::DatabaseTaskBase {
+ public:
+  OriginModifyRecordDatabaseTask(
+      QuotaManager* manager,
+      const GURL& origin,
+      StorageType type,
+      base::Time modified_time)
+      : DatabaseTaskBase(manager),
+        origin_(origin),
+        type_(type),
+        modified_time_(modified_time) {}
+
+ protected:
+  virtual void RunOnTargetThread() OVERRIDE {
+    if (!database()->SetOriginLastModifiedTime(
+            origin_, type_, modified_time_)) {
+      set_db_disabled(true);
+    }
+  }
+  virtual void DatabaseTaskCompleted() OVERRIDE {}
+
+ private:
+  GURL origin_;
+  StorageType type_;
+  base::Time modified_time_;
+};
+
+class QuotaManager::OriginsModifiedSinceRetrieveTask
+    : public QuotaManager::DatabaseTaskBase {
+ public:
+  OriginsModifiedSinceRetrieveTask(
+      QuotaManager* manager,
+      StorageType type,
+      base::Time modified_since,
+      GetOriginsCallback* callback)
+      : DatabaseTaskBase(manager),
+        type_(type),
+        modified_since_(modified_since),
+        callback_(callback) {}
+
+ protected:
+  virtual void RunOnTargetThread() OVERRIDE {
+    if (!database()->GetOriginsModifiedSince(
+            type_, &origins_, modified_since_)) {
+      set_db_disabled(true);
+    }
+  }
+
+  virtual void DatabaseTaskCompleted() OVERRIDE {
+    callback_->Run(origins_);
+  }
+
+  virtual void Aborted() OVERRIDE {
+    callback_->Run(std::set<GURL>());
+  }
+
+ private:
+  StorageType type_;
+  base::Time modified_since_;
+  std::set<GURL> origins_;
+  scoped_ptr<GetOriginsCallback> callback_;
+};
+
 class QuotaManager::DumpQuotaTableTask
     : public QuotaManager::DatabaseTaskBase {
  private:
   typedef QuotaManager::DumpQuotaTableTask self_type;
   typedef QuotaManager::DumpQuotaTableCallback Callback;
   typedef QuotaManager::QuotaTableEntry TableEntry;
   typedef QuotaManager::QuotaTableEntries TableEntries;
   typedef QuotaDatabase::QuotaTableCallback TableCallback;
 
  public:
   DumpQuotaTableTask(
       QuotaManager* manager,
       Callback* callback)
       : DatabaseTaskBase(manager),
         callback_(callback) {
   }
  protected:
   virtual void RunOnTargetThread() OVERRIDE {
     if (!database()->DumpQuotaTable(
             new TableCallback(
                 base::Bind(&self_type::AppendEntry, this))))
       set_db_disabled(true);
   }
 
   virtual void Aborted() OVERRIDE {
-    callback_->Run(entries_);
+    callback_->Run(TableEntries());
   }
 
   virtual void DatabaseTaskCompleted() OVERRIDE {
     callback_->Run(entries_);
   }
 
  private:
   bool AppendEntry(const TableEntry& entry) {
     entries_.push_back(entry);
     return true;
   }
 
   scoped_ptr<Callback> callback_;
   TableEntries entries_;
 };
 
-class QuotaManager::DumpLastAccessTimeTableTask
+class QuotaManager::DumpOriginInfoTableTask
     : public QuotaManager::DatabaseTaskBase {
  private:
-  typedef QuotaManager::DumpLastAccessTimeTableTask self_type;
-  typedef QuotaManager::DumpLastAccessTimeTableCallback Callback;
-  typedef QuotaManager::LastAccessTimeTableEntry TableEntry;
-  typedef QuotaManager::LastAccessTimeTableEntries TableEntries;
-  typedef QuotaDatabase::LastAccessTimeTableCallback TableCallback;
+  typedef QuotaManager::DumpOriginInfoTableTask self_type;
+  typedef QuotaManager::DumpOriginInfoTableCallback Callback;
+  typedef QuotaManager::OriginInfoTableEntry TableEntry;
+  typedef QuotaManager::OriginInfoTableEntries TableEntries;
+  typedef QuotaDatabase::OriginInfoTableCallback TableCallback;
 
  public:
-  DumpLastAccessTimeTableTask(
+  DumpOriginInfoTableTask(
       QuotaManager* manager,
       Callback* callback)
       : DatabaseTaskBase(manager),
         callback_(callback) {
   }
  protected:
   virtual void RunOnTargetThread() OVERRIDE {
-    if (!database()->DumpLastAccessTimeTable(
+    if (!database()->DumpOriginInfoTable(
             new TableCallback(
                 base::Bind(&self_type::AppendEntry, this))))
       set_db_disabled(true);
   }
 
   virtual void Aborted() OVERRIDE {
-    callback_->Run(entries_);
+    callback_->Run(TableEntries());
   }
 
   virtual void DatabaseTaskCompleted() OVERRIDE {
     callback_->Run(entries_);
   }
 
  private:
   bool AppendEntry(const TableEntry& entry) {
     entries_.push_back(entry);
     return true;
@@ skipping 163 matching lines @@
   if (temporary_storage_evictor_.get()) {
     std::map<std::string, int64> stats;
     temporary_storage_evictor_->GetStatistics(&stats);
     for (std::map<std::string, int64>::iterator p = stats.begin();
          p != stats.end();
          ++p)
       (*statistics)[p->first] = base::Int64ToString(p->second);
   }
 }
 
+void QuotaManager::GetOriginsModifiedSince(
+    StorageType type,
+    base::Time modified_since,
+    GetOriginsCallback* callback) {
+  LazyInitialize();
+  make_scoped_refptr(new OriginsModifiedSinceRetrieveTask(
+      this, type, modified_since, callback))->Start();
+}
+
 void QuotaManager::LazyInitialize() {
   DCHECK(io_thread_->BelongsToCurrentThread());
   if (database_.get()) {
     // Initialization seems to be done already.
     return;
   }
 
   // Use an empty path to open an in-memory only databse for incognito.
   database_.reset(new QuotaDatabase(is_incognito_ ? FilePath() :
       profile_path_.AppendASCII(kDatabaseName)));
@@ skipping 18 matching lines @@
 
 void QuotaManager::NotifyStorageAccessed(
     QuotaClient::ID client_id,
     const GURL& origin, StorageType type) {
   NotifyStorageAccessedInternal(client_id, origin, type, base::Time::Now());
 }
 
 void QuotaManager::NotifyStorageModified(
     QuotaClient::ID client_id,
     const GURL& origin, StorageType type, int64 delta) {
-  LazyInitialize();
-  GetUsageTracker(type)->UpdateUsageCache(client_id, origin, delta);
+  NotifyStorageModifiedInternal(client_id, origin, type, delta,
+                                base::Time::Now());
 }
 
 void QuotaManager::NotifyOriginInUse(const GURL& origin) {
   DCHECK(io_thread_->BelongsToCurrentThread());
   origins_in_use_[origin]++;
 }
 
 void QuotaManager::NotifyOriginNoLongerInUse(const GURL& origin) {
   DCHECK(io_thread_->BelongsToCurrentThread());
   DCHECK(IsOriginInUse(origin));
@@ skipping 38 matching lines @@
     base::Time accessed_time) {
   LazyInitialize();
   if (type == kStorageTypeTemporary && lru_origin_callback_.get()) {
     // Record the accessed origins while GetLRUOrigin task is runing
     // to filter out them from eviction.
     access_notified_origins_.insert(origin);
   }
 
   if (db_disabled_)
     return;
-  scoped_refptr<OriginAccessRecordDatabaseTask> task(
-      new OriginAccessRecordDatabaseTask(this, origin, type, accessed_time));
-  task->Start();
+  make_scoped_refptr(new OriginAccessRecordDatabaseTask(
+      this, origin, type, accessed_time))->Start();
+}
+
+void QuotaManager::NotifyStorageModifiedInternal(
+    QuotaClient::ID client_id,
+    const GURL& origin,
+    StorageType type,
+    int64 delta,
+    base::Time modified_time) {
+  LazyInitialize();
+  GetUsageTracker(type)->UpdateUsageCache(client_id, origin, delta);
+  make_scoped_refptr(new OriginModifyRecordDatabaseTask(
+      this, origin, type, modified_time))->Start();
 }
 
 void QuotaManager::DumpQuotaTable(DumpQuotaTableCallback* callback) {
   make_scoped_refptr(new DumpQuotaTableTask(this, callback))->Start();
 }
 
-void QuotaManager::DumpLastAccessTimeTable(
-    DumpLastAccessTimeTableCallback* callback) {
-  make_scoped_refptr(new DumpLastAccessTimeTableTask(this, callback))->Start();
+void QuotaManager::DumpOriginInfoTable(
+    DumpOriginInfoTableCallback* callback) {
+  make_scoped_refptr(new DumpOriginInfoTableTask(this, callback))->Start();
 }
 
 
 void QuotaManager::DeleteOriginFromDatabase(
     const GURL& origin, StorageType type) {
   LazyInitialize();
   if (db_disabled_)
     return;
   scoped_refptr<OriginDeletionDatabaseTask> task =
       new OriginDeletionDatabaseTask(this, origin, type);
@@ skipping 260 matching lines @@
 
 QuotaManagerProxy::QuotaManagerProxy(
     QuotaManager* manager, base::MessageLoopProxy* io_thread)
     : manager_(manager), io_thread_(io_thread) {
 }
 
 QuotaManagerProxy::~QuotaManagerProxy() {
 }
 
 }  // namespace quota