diff options
| author | Steve Block <steveblock@google.com> | 2010-03-22 03:44:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-22 03:44:09 -0700 |
| commit | 547b83328e5a3abc882059d2de6e2edc42c2fe83 (patch) | |
| tree | 171358c179582d54a4ee8c88201889eaa0882c9d | |
| parent | 90f8680f41525e5e5d9b811af60793a0396a32e3 (diff) | |
| parent | 427efcca1988e3f424e363808e8fd0978f4e78d1 (diff) | |
| download | frameworks_base-547b83328e5a3abc882059d2de6e2edc42c2fe83.zip frameworks_base-547b83328e5a3abc882059d2de6e2edc42c2fe83.tar.gz frameworks_base-547b83328e5a3abc882059d2de6e2edc42c2fe83.tar.bz2 | |
Merge "Implements layoutTestController.setAppCacheMaximumSize"
3 files changed, 14 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebStorage.java b/core/java/android/webkit/WebStorage.java index 9314d7b..5345879 100644 --- a/core/java/android/webkit/WebStorage.java +++ b/core/java/android/webkit/WebStorage.java @@ -340,6 +340,15 @@ public final class WebStorage { } /** + * Sets the maximum size of the ApplicationCache. + * This should only ever be called on the WebKit thread. + * @hide Pending API council approval + */ + public void setAppCacheMaximumSize(long size) { + nativeSetAppCacheMaximumSize(size); + } + + /** * Utility function to send a message to our handler */ private synchronized void postMessage(Message msg) { @@ -402,4 +411,5 @@ public final class WebStorage { private static native void nativeSetQuotaForOrigin(String origin, long quota); private static native void nativeDeleteOrigin(String origin); private static native void nativeDeleteAllData(); + private static native void nativeSetAppCacheMaximumSize(long size); } diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java b/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java index ce1bf8d..9a6fc27 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java @@ -461,6 +461,10 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon WebStorage.getInstance().setQuotaForOrigin("file://", quota); } + public void setAppCacheMaximumSize(long size) { + WebStorage.getInstance().setAppCacheMaximumSize(size); + } + public void setCanOpenWindows() { obtainMessage(LAYOUT_SET_CAN_OPEN_WINDOWS).sendToTarget(); } diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java index d51d17a..1796d18 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java @@ -91,7 +91,6 @@ public class FileFilter { ignoreResultList.add("http/tests/appcache/disabled.html"); // not found ignoreResultList.add("http/tests/appcache/empty-manifest.html"); // flaky ignoreResultList.add("http/tests/appcache/foreign-iframe-main.html"); // flaky - skips states - ignoreResultList.add("http/tests/appcache/max-size.html"); // no layoutTestController.setAppCacheMaximumSize ignoreResultList.add("http/tests/appcache/manifest-with-empty-file.html"); // flaky ignoreResultList.add("http/tests/appcache/whitelist-wildcard.html"); // file not found ignoreResultList.add("storage/database-lock-after-reload.html"); // Succeeds but DumpRenderTree does not read result correctly |