Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 427efcca authored by Steve Block's avatar Steve Block
Browse files

Implements layoutTestController.setAppCacheMaximumSize 

Change-Id: Ib64123738bc384213ef80e2e60e4a0d9407c09d8
parent f19f9f55

core/java/android/webkit/WebStorage.java

+10 −0
Original line number Diff line number Diff line
@@ -339,6 +339,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

     */
@@ -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);

}

tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java

+4 −0
Original line number Diff line number Diff line
@@ -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();

    }

tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java

+0 −1
Original line number Diff line number Diff line
@@ -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