diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-23 16:18:58 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-26 17:54:03 +0100 |
| commit | 357d280a25a978a2ea0c1b89f6a7c7f385630b98 (patch) | |
| tree | 4d68a2eab4447adb157e254f06a0bcc45956f998 /tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | |
| parent | a7137538c2b3f7e933f9a808158ff63238172c22 (diff) | |
Merge WebKit at r63859 : Implement layoutTestController.dumpAsText(boolean) in DumpRenderTree.
See http://trac.webkit.org/changeset/63730
Change-Id: Iced14a89a2a71557529a7a5e32c9eab04b370742
Diffstat (limited to 'tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java')
| -rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index bf66faef98e7..ef96813c5c87 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -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) { |