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

Commit 52ab0b39 authored by Steve Block's avatar Steve Block
Browse files

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

Change-Id: I620e6da3f7318f329f3401075799e5659cacda82
parent 31ac8e9d

core/res/res/values/strings.xml

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

+5 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ public class FileFilter { 
        ignoreResultList.add("http/tests/appcache/manifest-with-empty-file.html"); // flaky

        ignoreResultList.add("storage/database-lock-after-reload.html"); // Succeeds but DumpRenderTree does not read result correctly

        ignoreResultList.add("storage/hash-change-with-xhr.html"); // Succeeds but DumpRenderTree does not read result correctly

        ignoreResultList.add("storage/open-database-creation-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()

        ignoreResultList.add("storage/statement-error-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()

        ignoreResultList.add("storage/statement-success-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()

        ignoreResultList.add("storage/transaction-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()

        ignoreResultList.add("storage/transaction-error-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()



        // Expected failures due to unsupported features.

        ignoreResultList.add("fast/events/touch/touch-coords-in-zoom-and-scroll.html"); // Requires eventSender.zoomPageIn(),zoomPageOut()