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

Commit da91bf5c authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang Committed by Android (Google) Code Review
Browse files

Merge "Tweak fix for setXSSAuditorEnabled in LayoutTestController."

parents 4ecdad30 be1304f0

core/java/android/webkit/WebSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -1237,6 +1237,7 @@ public class WebSettings { 
    /**

     * Sets whether XSS Auditor is enabled.

     * @param flag Whether XSS Auditor should be enabled.

     * @hide Only used by LayoutTestController.

     */

    public synchronized void setXSSAuditorEnabled(boolean flag) {

        if (mXSSAuditorEnabled != flag) {

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

+1 −2
Original line number Diff line number Diff line
@@ -281,8 +281,7 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon 
            break;



        case SET_XSS_AUDITOR_ENABLED:

            mLayoutTestController.setXSSAuditorEnabled(

                msg.arg1 == 1 ? true : false);

            mLayoutTestController.setXSSAuditorEnabled(msg.arg1 == 1);

            break;

        }

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -838,6 +838,7 @@ public class TestShellActivity extends Activity implements LayoutTestController 
        settings.setDatabasePath(getDir("databases",0).getAbsolutePath());

        settings.setDomStorageEnabled(true);

        settings.setWorkersEnabled(false);

        settings.setXSSAuditorEnabled(false);

    }



    private WebView mWebView;