Changeset 83258 in webkit

Timestamp:

Apr 7, 2011 11:34:46 PM (13 years ago)

Author:

kinuko@chromium.org

Message:

2011-04-07 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Add WebKit API to query and request unified offline-storage quota
​https://bugs.webkit.org/show_bug.cgi?id=57849
Just adding the API, this does not do anything yet.

The API is based on the public discussion for unified quota API:
​http://lists.w3.org/Archives/Public/public-webapps/2011JanMar/0346.html
(The detail is not yet fully specified and might be subject to change.)

• public/WebFrameClient.h: (WebKit::WebFrameClient::queryStorageUsageAndQuota): Added. (WebKit::WebFrameClient::requestStorageQuota): Added.
• public/WebStorageQuotaCallbacks.h: Added. (WebKit::WebStorageQuotaCallbacks::~WebStorageQuotaCallbacks):
• public/WebStorageQuotaType.h: Added.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (1 diff)
• public/WebFrameClient.h (modified) (4 diffs)
• public/WebStorageQuotaCallbacks.h (added)
• public/WebStorageQuotaError.h (added)
• public/WebStorageQuotaType.h (added)
• src/AssertMatchingEnums.cpp (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-07  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Add WebKit API to query and request unified offline-storage quota
+        https://bugs.webkit.org/show_bug.cgi?id=57849
+        Just adding the API, this does not do anything yet.
+
+        The API is based on the public discussion for unified quota API:
+        http://lists.w3.org/Archives/Public/public-webapps/2011JanMar/0346.html
+        (The detail is not yet fully specified and might be subject to change.)
+
+        * public/WebFrameClient.h:
+        (WebKit::WebFrameClient::queryStorageUsageAndQuota): Added.
+        (WebKit::WebFrameClient::requestStorageQuota): Added.
+        * public/WebStorageQuotaCallbacks.h: Added.
+        (WebKit::WebStorageQuotaCallbacks::~WebStorageQuotaCallbacks):
+        * public/WebStorageQuotaType.h: Added.
+
 2011-04-07  Dominic Cooney  <dominicc@google.com>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -267 +267 @@
                 'public/WebStorageArea.h',
                 'public/WebStorageEventDispatcher.h',
+                'public/WebStorageQuotaCallbacks.h',
+                'public/WebStorageQuotaType.h',
                 'public/WebStorageNamespace.h',
                 'public/WebString.h',

trunk/Source/WebKit/chromium/public/WebFrameClient.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36 +36 @@
 #include "WebNavigationPolicy.h"
 #include "WebNavigationType.h"
+#include "WebStorageQuotaType.h"
 #include "WebURLError.h"
 
@@ -52 +53 @@
 class WebSecurityOrigin;
 class WebSharedWorker;
+class WebStorageQuotaCallbacks;
 class WebString;
 class WebURL;
@@ -363 +365 @@
         bool create, WebFileSystemCallbacks*) { }
 
+    // Quota ---------------------------------------------------------
+
+    // Queries the origin's storage usage and quota information.
+    // WebStorageQuotaCallbacks::didQueryStorageUsageAndQuota will be called
+    // with the current usage and quota information for the origin. When
+    // an error occurs WebStorageQuotaCallbacks::didFail is called with an
+    // error code.
+    // The callbacks object is deleted when the callback method is called
+    // and does not need to be (and should not be) deleted manually.
+    virtual void queryStorageUsageAndQuota(
+        WebFrame*, WebStorageQuotaType, WebStorageQuotaCallbacks*) { }
+
+    // Requests a new quota size for the origin's storage.
+    // |newQuotaInBytes| indicates how much storage space (in bytes) the
+    // caller expects to need.
+    // WebStorageQuotaCallbacks::didGrantStorageQuota will be called when
+    // a new quota is granted. WebStorageQuotaCallbacks::didFail
+    // is called with an error code otherwise.
+    // Note that the requesting quota size may not always be granted and
+    // a smaller amount of quota than requested might be returned.
+    // The callbacks object is deleted when the callback method is called
+    // and does not need to be (and should not be) deleted manually.
+    virtual void requestStorageQuota(
+        WebFrame*, WebStorageQuotaType,
+        unsigned long long newQuotaInBytes,
+        WebStorageQuotaCallbacks*) { }
+
 protected:
     ~WebFrameClient() { }

trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

@@ -39 +39 @@
 #include "DocumentMarker.h"
 #include "EditorInsertAction.h"
+#include "ExceptionCode.h"
 #include "FileError.h"
 #include "FileMetadata.h"
@@ -76 +77 @@
 #include "WebScrollbar.h"
 #include "WebSettings.h"
+#include "WebStorageQuotaError.h"
 #include "WebTextAffinity.h"
 #include "WebTextCaseSensitivity.h"
@@ -415 +417 @@
 COMPILE_ASSERT_MATCHING_ENUM(WebTextCheckingResult::ErrorGrammar, DocumentMarker::Grammar);
 
+#if ENABLE(QUOTA)
+COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaErrorNotSupported, NOT_SUPPORTED_ERR);
+COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaErrorAbort, ABORT_ERR);
+#endif
+
 #if OS(DARWIN)
 COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateDisabled, PlatformBridge::StateDisabled);