diff options
| author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 23:29:33 +0000 |
|---|---|---|
| committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 23:29:33 +0000 |
| commit | 982325f6712e7c3249f252779e4d289d514f3168 (patch) | |
| tree | 2c17693e7d353bf2ea917577605aafc3143ab0cc /webkit/browser/fileapi | |
| parent | 879b1800d2708a7fc68c112f5e5ca096d42d466d (diff) | |
| download | chromium_src-982325f6712e7c3249f252779e4d289d514f3168.zip chromium_src-982325f6712e7c3249f252779e4d289d514f3168.tar.gz chromium_src-982325f6712e7c3249f252779e4d289d514f3168.tar.bz2 | |
[Pepper] Use platform path for QuotaReservation::GetOpenFileHandle
* Pass platform file path instead of virtual path to fileapis::QuotaReservation.
* This should fix the quota leak regression.
BUG=333150
Review URL: https://codereview.chromium.org/131043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser/fileapi')
| -rw-r--r-- | webkit/browser/fileapi/quota/quota_reservation_buffer.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/webkit/browser/fileapi/quota/quota_reservation_buffer.cc b/webkit/browser/fileapi/quota/quota_reservation_buffer.cc index 80d3699..14ea0d0 100644 --- a/webkit/browser/fileapi/quota/quota_reservation_buffer.cc +++ b/webkit/browser/fileapi/quota/quota_reservation_buffer.cc @@ -46,8 +46,13 @@ void QuotaReservationBuffer::CommitFileGrowth(int64 quota_consumption, return; reservation_manager_->CommitQuotaUsage(origin_, type_, usage_delta); - DCHECK_LE(quota_consumption, reserved_quota_); if (quota_consumption > 0) { + if (quota_consumption > reserved_quota_) { + LOG(ERROR) << "Detected over consumption of the storage quota beyond its" + << " reservation"; + quota_consumption = reserved_quota_; + } + reserved_quota_ -= quota_consumption; reservation_manager_->ReleaseReservedQuota( origin_, type_, quota_consumption); |