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

Commit 286fbce5 authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

Merge "Merge webkit.org at r55033 : Update the WebKit UA string and LayoutTest ignore list"

parents 8c2d5cf8 79a81c2d

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1615,7 +1615,7 @@ 


    <!-- Do not translate.  WebView User Agent string -->

    <string name="web_user_agent" translatable="false"><xliff:g id="x">Mozilla/5.0 (Linux; U; Android %s)

        AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</xliff:g></string>

        AppleWebKit/533.6 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.6</xliff:g></string>



    <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->

    <string name="js_dialog_title">The page at \'<xliff:g id="title">%s</xliff:g>\' says:</string>

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

+4 −2
Original line number Diff line number Diff line
@@ -82,8 +82,10 @@ public class FileFilter { 
        // This first block of tests are for features for which Android

        // should pass all tests. They are skipped only temporarily.

        // TODO: Fix these failing tests and remove them from this list.

        ignoreResultList.add("fast/events/touch/basic-touch-events.html"); // Requires multi-touch

        ignoreResultList.add("fast/events/touch/send-oncancel-event.html"); // Expected output is incorrect upstream. See WebKit bug 37830.

        ignoreResultList.add("fast/events/touch/basic-multi-touch-events.html"); // Requires multi-touch

        ignoreResultList.add("fast/events/touch/basic-single-touch-events.html"); // Delta of touch move is not great enough for Android. Fixed upstream in WebKit change 58208.

        ignoreResultList.add("fast/events/touch/send-oncancel-event.html"); // Expected output is incorrect. Fixed upstream in WebKit change 58058.

        ignoreResultList.add("fast/events/touch/touch-target.html"); // Requires multi-touch

        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/manifest-with-empty-file.html"); // flaky