Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(231)

Unified Diff: Source/WebKit/chromium/src/StorageInfoChromium.cpp

Issue 7054073: Merge 87772 - 2011-05-31 Kinuko Yasuda <kinuko@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/StorageInfoChromium.cpp
===================================================================
--- Source/WebKit/chromium/src/StorageInfoChromium.cpp (revision 88168)
+++ Source/WebKit/chromium/src/StorageInfoChromium.cpp (working copy)
@@ -52,7 +52,8 @@
namespace {
void fireStorageInfoErrorCallback(PassRefPtr<StorageInfoErrorCallback> errorCallback, ExceptionCode ec)
{
- ASSERT(errorCallback);
+ if (!errorCallback)
+ return;
ExceptionCodeDescription description;
getExceptionCodeDescription(ec, description);
errorCallback->handleEvent(DOMCoreException::create(description).get());
@@ -71,7 +72,7 @@
Document* document = static_cast<Document*>(context);
WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame());
webFrame->client()->queryStorageUsageAndQuota(webFrame, static_cast<WebStorageQuotaType>(storageType), new WebStorageQuotaCallbacksImpl(successCallback, errorCallback));
- } else if (errorCallback) {
+ } else {
// FIXME: calling this on worker is not yet supported.
fireStorageInfoErrorCallback(errorCallback, NOT_SUPPORTED_ERR);
}
@@ -89,7 +90,7 @@
Document* document = static_cast<Document*>(context);
WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame());
webFrame->client()->requestStorageQuota(webFrame, static_cast<WebStorageQuotaType>(storageType), newQuotaInBytes, new WebStorageQuotaCallbacksImpl(successCallback, errorCallback));
- } else if (errorCallback) {
+ } else {
// FIXME: calling this on worker is not yet supported.
fireStorageInfoErrorCallback(errorCallback, NOT_SUPPORTED_ERR);
}
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698