Quota: Return a pair of usage and granted_quota on requesting quota.

Quota: Return a pair of usage and granted_quota on requesting quota.

This adds "usage" param into the reply message of the request quota operation.
That is necessary to implement new Quota Management API [1] behind a flag.

[1] http://www.w3.org/TR/2013/WD-quota-api-20131105/


BUG=332325
TEST=browser_tests

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=245969

[nhiroki, 2014-01-20 08:09:29]

Hi, can you take a look? Thanks!

[tzik, 2014-01-20 08:24:10]

lgtm

[kinuko, 2014-01-20 08:46:42]

lgtm


On Mon, Jan 20, 2014 at 5:09 PM, <nhiroki@chromium.org> wrote:

> Reviewers: kinuko, tzik,
>
> Message:
> Hi, can you take a look? Thanks!
>
> Description:
> Quota: Return a pair of usage and granted_quota on requesting quota.
>
> This adds "usage" param into the reply message of the request quota
> operation.
> That is necessary to implement new Quota Management API [1].
>
> [1] http://www.w3.org/TR/2013/WD-quota-api-20131105/
>
>
> BUG=332325
> TEST=browser_tests
>
> Please review this at https://codereview.chromium.org/142903002/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files (+37, -36 lines):
>   M content/browser/quota_dispatcher_host.cc
>   M content/child/quota_dispatcher.h
>   M content/child/quota_dispatcher.cc
>   M content/common/quota_messages.h
>
>
> Index: content/browser/quota_dispatcher_host.cc
> diff --git a/content/browser/quota_dispatcher_host.cc
> b/content/browser/quota_dispatcher_host.cc
> index f83ee3f7be987f2e9d085ba2a2615185ce35e9f8..
> 283d55088e64a8a52cb7afc926cf3a5d6c6f9386 100644
> --- a/content/browser/quota_dispatcher_host.cc
> +++ b/content/browser/quota_dispatcher_host.cc
> @@ -106,8 +106,8 @@ class QuotaDispatcherHost::RequestQuotaDispatcher
>                           int render_view_id)
>        : RequestDispatcher(dispatcher_host, request_id),
>          origin_(origin),
> -        host_(net::GetHostOrSpecFromURL(origin)),
>          type_(type),
> +        current_usage_(0),
>          current_quota_(0),
>          requested_quota_(requested_quota),
>          render_view_id_(render_view_id),
> @@ -116,14 +116,19 @@ class QuotaDispatcherHost::RequestQuotaDispatcher
>
>    void Start() {
>      DCHECK(dispatcher_host());
> +    if (requested_quota_ < 0) {
> +      DidFinish(quota::kQuotaErrorInvalidModification, 0, 0);
> +      return;
> +    }
> +
>      DCHECK(type_ == quota::kStorageTypeTemporary ||
>             type_ == quota::kStorageTypePersistent ||
>             type_ == quota::kStorageTypeSyncable);
>      if (type_ == quota::kStorageTypePersistent) {
> -      quota_manager()->GetPersistentHostQuota(
> -          host_,
> -          base::Bind(&self_type::DidGetHostQuota,
> -                     weak_factory_.GetWeakPtr(), host_, type_));
> +      quota_manager()->GetUsageAndQuotaForWebApps(
> +          origin_, type_,
> +          base::Bind(&self_type::DidGetPersistentUsageAndQuota,
> +                     weak_factory_.GetWeakPtr()));
>      } else {
>        quota_manager()->GetUsageAndQuotaForWebApps(
>            origin_, type_,
> @@ -133,28 +138,25 @@ class QuotaDispatcherHost::RequestQuotaDispatcher
>    }
>
>   private:
> -  void DidGetHostQuota(const std::string& host,
> -                       StorageType type,
> -                       QuotaStatusCode status,
> -                       int64 quota) {
> +  void DidGetPersistentUsageAndQuota(QuotaStatusCode status,
> +                                     int64 usage,
> +                                     int64 quota) {
>      if (!dispatcher_host())
>        return;
> -    DCHECK_EQ(type_, type);
> -    DCHECK_EQ(host_, host);
>      if (status != quota::kQuotaStatusOk) {
> -      DidFinish(status, 0);
> +      DidFinish(status, 0, 0);
>        return;
>      }
> -    if (requested_quota_ < 0) {
> -      DidFinish(quota::kQuotaErrorInvalidModification, 0);
> -      return;
> -    }
> -    if (requested_quota_ <= quota) {
> +
> +    if (quota_manager()->IsStorageUnlimited(origin_, type_) ||
> +        requested_quota_ <= quota) {
>        // Seems like we can just let it go.
> -      DidFinish(quota::kQuotaStatusOk, requested_quota_);
> +      DidFinish(quota::kQuotaStatusOk, usage, requested_quota_);
>        return;
>      }
> +    current_usage_ = usage;
>      current_quota_ = quota;
> +
>      // Otherwise we need to consult with the permission context and
>      // possibly show an infobar.
>      DCHECK(permission_context());
> @@ -165,9 +167,9 @@ class QuotaDispatcherHost::RequestQuotaDispatcher
>    }
>
>    void DidGetTemporaryUsageAndQuota(QuotaStatusCode status,
> -                                    int64 usage_unused,
> +                                    int64 usage,
>                                      int64 quota) {
> -    DidFinish(status, std::min(requested_quota_, quota));
> +    DidFinish(status, usage, std::min(requested_quota_, quota));
>    }
>
>    void DidGetPermissionResponse(
> @@ -176,20 +178,22 @@ class QuotaDispatcherHost::RequestQuotaDispatcher
>        return;
>      if (response != QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_ALLOW)
> {
>        // User didn't allow the new quota.  Just returning the current
> quota.
> -      DidFinish(quota::kQuotaStatusOk, current_quota_);
> +      DidFinish(quota::kQuotaStatusOk, current_usage_, current_quota_);
>        return;
>      }
>      // Now we're allowed to set the new quota.
>      quota_manager()->SetPersistentHostQuota(
> -        host_, requested_quota_,
> +        net::GetHostOrSpecFromURL(origin_), requested_quota_,
>          base::Bind(&self_type::DidSetHostQuota,
> weak_factory_.GetWeakPtr()));
>    }
>
>    void DidSetHostQuota(QuotaStatusCode status, int64 new_quota) {
> -    DidFinish(status, new_quota);
> +    DidFinish(status, current_usage_, new_quota);
>    }
>
> -  void DidFinish(QuotaStatusCode status, int64 granted_quota) {
> +  void DidFinish(QuotaStatusCode status,
> +                 int64 usage,
> +                 int64 granted_quota) {
>      if (!dispatcher_host())
>        return;
>      DCHECK(dispatcher_host());
> @@ -197,14 +201,14 @@ class QuotaDispatcherHost::RequestQuotaDispatcher
>        dispatcher_host()->Send(new QuotaMsg_DidFail(request_id(), status));
>      } else {
>        dispatcher_host()->Send(new QuotaMsg_DidGrantStorageQuota(
> -          request_id(), granted_quota));
> +          request_id(), usage, granted_quota));
>      }
>      Completed();
>    }
>
>    const GURL origin_;
> -  const std::string host_;
>    const StorageType type_;
> +  int64 current_usage_;
>    int64 current_quota_;
>    const int64 requested_quota_;
>    const int render_view_id_;
> @@ -252,12 +256,6 @@ void QuotaDispatcherHost::OnRequestStorageQuota(
>      const GURL& origin,
>      StorageType type,
>      int64 requested_size) {
> -  if (quota_manager_->IsStorageUnlimited(origin, type)) {
> -    // If the origin is marked 'unlimited' we always just return ok.
> -    Send(new QuotaMsg_DidGrantStorageQuota(request_id, requested_size));
> -    return;
> -  }
> -
>    if (type != quota::kStorageTypeTemporary &&
>        type != quota::kStorageTypePersistent) {
>      // Unsupported storage types.
> Index: content/child/quota_dispatcher.cc
> diff --git a/content/child/quota_dispatcher.cc b/content/child/quota_
> dispatcher.cc
> index e6b7114500221f8f4b3de18c07cb9893394b4f82..
> 85004a9c2de6cd4a448a0946cd5f5ad5af3df929 100644
> --- a/content/child/quota_dispatcher.cc
> +++ b/content/child/quota_dispatcher.cc
> @@ -42,7 +42,7 @@ class WebStorageQuotaDispatcherCallback : public
> QuotaDispatcher::Callback {
>    virtual void DidQueryStorageUsageAndQuota(int64 usage, int64 quota)
> OVERRIDE {
>      callbacks_->didQueryStorageUsageAndQuota(usage, quota);
>    }
> -  virtual void DidGrantStorageQuota(int64 granted_quota) OVERRIDE {
> +  virtual void DidGrantStorageQuota(int64 usage, int64 granted_quota)
> OVERRIDE {
>      callbacks_->didGrantStorageQuota(granted_quota);
>    }
>    virtual void DidFail(quota::QuotaStatusCode error) OVERRIDE {
> @@ -141,10 +141,11 @@ QuotaDispatcher::CreateWebStorageQuotaCallbacks
> Wrapper(
>
>  void QuotaDispatcher::DidGrantStorageQuota(
>      int request_id,
> +    int64 current_usage,
>      int64 granted_quota) {
>    Callback* callback = pending_quota_callbacks_.Lookup(request_id);
>    DCHECK(callback);
> -  callback->DidGrantStorageQuota(granted_quota);
> +  callback->DidGrantStorageQuota(current_usage, granted_quota);
>    pending_quota_callbacks_.Remove(request_id);
>  }
>
> Index: content/child/quota_dispatcher.h
> diff --git a/content/child/quota_dispatcher.h b/content/child/quota_
> dispatcher.h
> index d42d02d8d91845ed40e1b08000af646d9c7fa26c..
> 818ffefcfa714c97477eec52af9dc121e6cd3182 100644
> --- a/content/child/quota_dispatcher.h
> +++ b/content/child/quota_dispatcher.h
> @@ -39,7 +39,7 @@ class QuotaDispatcher : public
> webkit_glue::WorkerTaskRunner::Observer {
>     public:
>      virtual ~Callback() {}
>      virtual void DidQueryStorageUsageAndQuota(int64 usage, int64 quota)
> = 0;
> -    virtual void DidGrantStorageQuota(int64 granted_quota) = 0;
> +    virtual void DidGrantStorageQuota(int64 usage, int64 granted_quota) =
> 0;
>      virtual void DidFail(quota::QuotaStatusCode status) = 0;
>    };
>
> @@ -77,6 +77,7 @@ class QuotaDispatcher : public
> webkit_glue::WorkerTaskRunner::Observer {
>                                      int64 current_usage,
>                                      int64 current_quota);
>    void DidGrantStorageQuota(int request_id,
> +                            int64 current_usage,
>                              int64 granted_quota);
>    void DidFail(int request_id,
>                 quota::QuotaStatusCode error);
> Index: content/common/quota_messages.h
> diff --git a/content/common/quota_messages.h b/content/common/quota_
> messages.h
> index b7b45b85e0b6bd9920cec459885b5d53d8c40511..
> fe35a34634e2a9ff8dec78a61616b57867c6b307 100644
> --- a/content/common/quota_messages.h
> +++ b/content/common/quota_messages.h
> @@ -16,8 +16,9 @@ IPC_ENUM_TRAITS(quota::QuotaStatusCode)
>
>  // Quota messages sent from the browser to the child process.
>
> -IPC_MESSAGE_CONTROL2(QuotaMsg_DidGrantStorageQuota,
> +IPC_MESSAGE_CONTROL3(QuotaMsg_DidGrantStorageQuota,
>                       int /* request_id */,
> +                     int64 /* current_usage */,
>                       int64 /* granted_quota */)
>
>  IPC_MESSAGE_CONTROL3(QuotaMsg_DidQueryStorageUsageAndQuota,
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[commit-bot: I haz the power, 2014-01-20 09:29:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nhiroki@chromium.org/142903002/90001

[commit-bot: I haz the power, 2014-01-20 09:45:24]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[nhiroki, 2014-01-20 11:44:03]

+jochen@, tsepez@

Hi, can you review these files as an owner?

jochen@ for content/*
tsepez@ for content/common/quota_messages.h

Thanks!

[jochen (gone - plz use gerrit), 2014-01-20 19:24:13]

lgtm

[Tom Sepez, 2014-01-20 19:43:27]

Messages LGTM.

[commit-bot: I haz the power, 2014-01-20 23:54:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nhiroki@chromium.org/142903002/90001

[commit-bot: I haz the power, 2014-01-21 01:45:44]

Change committed as 245969