summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-01-25 10:01:16 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-25 10:01:16 -0800
commit7f532976baa54d2935a8ba42cc2c529b7460e57a (patch)
treeee41581ad24b3a1baf63b1a658266b5f1adb48f6 /core
parent3a92c5fd3262236e0c6969591da7f6cb50dbddfc (diff)
parent9b2a59bdd27cfa45c7bb3b58eb705b35589b7050 (diff)
downloadframeworks_base-7f532976baa54d2935a8ba42cc2c529b7460e57a.zip
frameworks_base-7f532976baa54d2935a8ba42cc2c529b7460e57a.tar.gz
frameworks_base-7f532976baa54d2935a8ba42cc2c529b7460e57a.tar.bz2
Merge "Docs for Origin" into honeycomb
Diffstat (limited to 'core')
-rw-r--r--core/java/android/webkit/WebStorage.java22
1 files changed, 21 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebStorage.java b/core/java/android/webkit/WebStorage.java
index 257ed2a..8eb1524 100644
--- a/core/java/android/webkit/WebStorage.java
+++ b/core/java/android/webkit/WebStorage.java
@@ -75,6 +75,9 @@ public final class WebStorage {
private Handler mHandler = null;
private Handler mUIHandler = null;
+ /**
+ * Class containing the HTML5 database quota and usage for an origin.
+ */
public static class Origin {
private String mOrigin = null;
private long mQuota = 0;
@@ -95,14 +98,30 @@ public final class WebStorage {
mOrigin = origin;
}
+ /**
+ * An origin string is created using WebCore::SecurityOrigin::toString().
+ * Note that WebCore::SecurityOrigin uses 0 (which is not printed) for
+ * the port if the port is the default for the protocol. Eg
+ * http://www.google.com and http://www.google.com:80 both record a port
+ * of 0 and hence toString() == 'http://www.google.com' for both.
+ * @return The origin string.
+ */
public String getOrigin() {
return mOrigin;
}
+ /**
+ * Returns the quota for this origin's HTML5 database.
+ * @return The quota in bytes.
+ */
public long getQuota() {
return mQuota;
}
+ /**
+ * Returns the usage for this origin's HTML5 database.
+ * @return The usage in bytes.
+ */
public long getUsage() {
return mUsage;
}
@@ -229,7 +248,8 @@ public final class WebStorage {
*/
/**
- * Returns a list of origins having a database
+ * Returns a list of origins having a database. The Map is of type
+ * Map<String, Origin>.
*/
public void getOrigins(ValueCallback<Map> callback) {
if (callback != null) {