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

Commit 8083419c authored by Guang Zhu's avatar Guang Zhu Committed by Android (Google) Code Review
Browse files

Merge "change how test sets timeout for webkit dump"

parents 056054f7 97499df8

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -101,6 +101,7 @@ public class TestShellActivity extends Activity implements LayoutTestController 
    }

    }





    public void requestWebKitData() {

    public void requestWebKitData() {

        setDumpTimeout(DUMP_TIMEOUT_MS);

        Message callback = mHandler.obtainMessage(MSG_WEBKIT_DATA);

        Message callback = mHandler.obtainMessage(MSG_WEBKIT_DATA);





        if (mRequestedWebKitData)

        if (mRequestedWebKitData)
@@ -112,12 +113,10 @@ public class TestShellActivity extends Activity implements LayoutTestController 
            case DUMP_AS_TEXT:

            case DUMP_AS_TEXT:

                callback.arg1 = mDumpTopFrameAsText ? 1 : 0;

                callback.arg1 = mDumpTopFrameAsText ? 1 : 0;

                callback.arg2 = mDumpChildFramesAsText ? 1 : 0;

                callback.arg2 = mDumpChildFramesAsText ? 1 : 0;

                setDumpTimeout(DUMP_TIMEOUT_MS);

                mWebView.documentAsText(callback);

                mWebView.documentAsText(callback);

                break;

                break;

            case EXT_REPR:

            case EXT_REPR:

                mWebView.externalRepresentation(callback);

                mWebView.externalRepresentation(callback);

                setDumpTimeout(DUMP_TIMEOUT_MS);

                break;

                break;

            default:

            default:

                finished();

                finished();