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

Commit 357d280a authored by Ben Murdoch's avatar Ben Murdoch
Browse files

Merge WebKit at r63859 : Implement layoutTestController.dumpAsText(boolean) in DumpRenderTree. 

See http://trac.webkit.org/changeset/63730

Change-Id: Iced14a89a2a71557529a7a5e32c9eab04b370742
parent a7137538

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

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



        case LAYOUT_DUMP_TEXT:

            mLayoutTestController.dumpAsText();

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

            break;



        case LAYOUT_DUMP_CHILD_FRAMES_TEXT:
@@ -387,7 +387,11 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon 
    }



    public void dumpAsText() {

        obtainMessage(LAYOUT_DUMP_TEXT).sendToTarget();

        obtainMessage(LAYOUT_DUMP_TEXT, 0).sendToTarget();

    }



    public void dumpAsText(boolean enablePixelTests) {

        obtainMessage(LAYOUT_DUMP_TEXT, enablePixelTests ? 1 : 0).sendToTarget();

    }



    public void dumpChildFramesAsText() {

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

+24 −24
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.dumprendertree; 


public interface LayoutTestController {



	public void dumpAsText();

    public void dumpAsText(boolean enablePixelTests);

    public void dumpChildFramesAsText();

    public void waitUntilDone();

    public void notifyDone();

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

+6 −1
Original line number Diff line number Diff line
@@ -342,7 +342,12 @@ public class TestShellActivity extends Activity implements LayoutTestController 


    // .......................................

    // LayoutTestController Functions

    public void dumpAsText() {

    public void dumpAsText(boolean enablePixelTests) {

        // Added after webkit update to r63859. See trac.webkit.org/changeset/63730.

        if (enablePixelTests) {

            Log.v(LOGTAG, "dumpAsText(enablePixelTests == true) not implemented on Android!");

        }



        mDumpDataType = DumpDataType.DUMP_AS_TEXT;

        mDumpTopFrameAsText = true;

        if (mWebView != null) {