summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 12:29:05 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 12:29:05 +0000
commit67a63c3de2929e6c7ea740b4d00588c8dac7cc7f (patch)
treeeb46513750b08b028dbfa4c5285f370727694825 /webkit
parentd690584aa062a812742a3487127b167028de84a7 (diff)
downloadchromium_src-67a63c3de2929e6c7ea740b4d00588c8dac7cc7f.zip
chromium_src-67a63c3de2929e6c7ea740b4d00588c8dac7cc7f.tar.gz
chromium_src-67a63c3de2929e6c7ea740b4d00588c8dac7cc7f.tar.bz2
Build fix attempt for 84776; QuotaManager should not crash when it gets unknown storage type
TBR=dmikurube BUG=none TEST=green bots Review URL: http://codereview.chromium.org/6994007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/quota/quota_manager.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc
index bd00f60..16b44ef 100644
--- a/webkit/quota/quota_manager.cc
+++ b/webkit/quota/quota_manager.cc
@@ -377,6 +377,12 @@ void QuotaManager::GetUsageAndQuota(
return;
}
+ if (type == kStorageTypeUnknown) {
+ // Quota only supports temporary/persistent types.
+ callback->Run(kQuotaErrorNotSupported, 0, 0);
+ return;
+ }
+
std::string host = net::GetHostOrSpecFromURL(origin);
UsageAndQuotaDispatcherTaskMap::iterator found =
usage_and_quota_dispatchers_.find(std::make_pair(host, type));