Implement EvictOriginData in QuotaManager.

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>
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
 #include "base/stl_util-inl.h"
 #include "base/sys_info.h"
 #include "net/base/net_util.h"
+#include "webkit/quota/quota_client.h"

[kinuko, 2011/05/18 05:48:35]

nit: this is already included in quota_manager.h

[Dai Mikurube (NOT FULLTIME), 2011/05/18 06:04:57]

Done.

 #include "webkit/quota/quota_database.h"
 #include "webkit/quota/quota_types.h"
 #include "webkit/quota/usage_tracker.h"
 
 using base::ScopedCallbackFactory;
 
 namespace quota {
 
 namespace {
 // Returns the initial size of the temporary storage quota.
@@ skipping 489 matching lines @@
                            const FilePath& profile_path,
                            base::MessageLoopProxy* io_thread,
                            base::MessageLoopProxy* db_thread)
   : is_incognito_(is_incognito),
     profile_path_(profile_path),
     proxy_(new QuotaManagerProxy(
         ALLOW_THIS_IN_INITIALIZER_LIST(this), io_thread)),
     db_disabled_(false),
     io_thread_(io_thread),
     db_thread_(db_thread),
-    temporary_global_quota_(-1) {
+    num_eviction_requested_clients_(0),
+    num_evicted_clients_(0),
+    temporary_global_quota_(-1),
+    callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 QuotaManager::~QuotaManager() {
   DCHECK(io_thread_->BelongsToCurrentThread());
   proxy_->manager_ = NULL;
   std::for_each(clients_.begin(), clients_.end(),
                 std::mem_fun(&QuotaClient::OnQuotaManagerDestroyed));
   if (database_.get())
     db_thread_->DeleteSoon(FROM_HERE, database_.release());
 }
@@ skipping 228 matching lines @@
   if (db_disabled_) {
     callback->Run(GURL());
     delete callback;
     return;
   }
   scoped_refptr<GetLRUOriginTask> task(new GetLRUOriginTask(
       this, database_.get(), db_thread_, type, origins_in_use_, callback));
   task->Start();
 }
 
+void QuotaManager::OnOriginDataEvicted(
+    QuotaStatusCode status) {
+  DCHECK(io_thread_->BelongsToCurrentThread());
+
+  if (status != kQuotaStatusOk) {
+    // TODO(dmikurube): Handle error.
+  }
+
+  ++num_evicted_clients_;
+  DCHECK(num_evicted_clients_ <= num_eviction_requested_clients_);
+  if (num_evicted_clients_ == num_eviction_requested_clients_) {
+    num_eviction_requested_clients_ = 0;
+    num_evicted_clients_ = 0;
+

[kinuko, 2011/05/18 05:48:35]

Here can we call DeleteOriginFromDatabase (if there were no errors)?

[Dai Mikurube (NOT FULLTIME), 2011/05/18 06:04:57]

How about add it later?  (Since it looks like not tested, and it requires some
parameters from EvictOriginData.  Extracting them into a class looks better to
do that.)

+    evict_origin_data_callback_->Run(kQuotaStatusOk);
+    evict_origin_data_callback_.reset(NULL);

[kinuko, 2011/05/18 05:48:35]

reset() will do (no need to specify NULL)

[Dai Mikurube (NOT FULLTIME), 2011/05/18 06:04:57]

Done.

+  }
+}
+
 void QuotaManager::EvictOriginData(
     const GURL& origin,
     StorageType type,
     EvictOriginDataCallback* callback) {
-  // TODO(dmikurube): Implement it.
+  DCHECK(io_thread_->BelongsToCurrentThread());
+  DCHECK(database_.get());
+  DCHECK(num_eviction_requested_clients_ == 0);
+

[kinuko, 2011/05/18 05:48:35]

DCHECK(type == kStorageTypeTemporary) ?

[Dai Mikurube (NOT FULLTIME), 2011/05/18 06:04:57]

Done.

+  int num_clients = clients_.size();
+
+  if (origin.is_empty() || num_clients == 0) {
+    callback->Run(kQuotaStatusOk);
+    delete callback;
+    return;
+  }
+
+  num_eviction_requested_clients_ = num_clients;
+  num_evicted_clients_ = 0;
+
+  evict_origin_data_callback_.reset(callback);
+  for (QuotaClientList::iterator p = clients_.begin();
+       p != clients_.end();
+       ++p) {
+    (*p)->DeleteOriginData(origin, kStorageTypeTemporary, callback_factory_.

[kinuko, 2011/05/18 05:48:35]

s/kStorageTypeTemporary/type/ ?

[Dai Mikurube (NOT FULLTIME), 2011/05/18 06:04:57]

Done.

+        NewCallback(&QuotaManager::OnOriginDataEvicted));
+  }
 }
 
 void QuotaManager::GetUsageAndQuotaForEviction(
     GetUsageAndQuotaForEvictionCallback* callback) {
   // TODO(dmikurube): Implement it.
 }
 
 void QuotaManager::DeleteOnCorrectThread() const {
   if (!io_thread_->BelongsToCurrentThread()) {
     io_thread_->DeleteSoon(FROM_HERE, this);
@@ skipping 87 matching lines @@
 
 QuotaManagerProxy::QuotaManagerProxy(
     QuotaManager* manager, base::MessageLoopProxy* io_thread)
     : manager_(manager), io_thread_(io_thread) {
 }
 
 QuotaManagerProxy::~QuotaManagerProxy() {
 }
 
 }  // namespace quota