| Index: content/shell/renderer/test_runner/web_test_proxy.cc
|
| diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc
|
| index ee2ba353e6cdbccb1d58ee7c9a1df413fd0a638a..c5eb35b4a8b2e246c159a01a7b37d16a62169b56 100644
|
| --- a/content/shell/renderer/test_runner/web_test_proxy.cc
|
| +++ b/content/shell/renderer/test_runner/web_test_proxy.cc
|
| @@ -295,7 +295,7 @@ std::string DumpFramesAsPrintedText(blink::WebFrame* frame, bool recursive) {
|
|
|
| std::string result = DumpFrameHeaderIfNeeded(frame);
|
| result.append(
|
| - frame->renderTreeAsText(blink::WebFrame::RenderAsTextPrinting).utf8());
|
| + frame->layoutTreeAsText(blink::WebFrame::LayoutAsTextPrinting).utf8());
|
| result.append("\n");
|
|
|
| if (recursive) {
|
| @@ -438,13 +438,13 @@ std::string WebTestProxyBase::CaptureTree(bool debug_render_tree) {
|
| } else {
|
| bool recursive = test_interfaces_->GetTestRunner()
|
| ->shouldDumpChildFrameScrollPositions();
|
| - blink::WebFrame::RenderAsTextControls render_text_behavior =
|
| - blink::WebFrame::RenderAsTextNormal;
|
| + blink::WebFrame::LayoutAsTextControls layout_text_behavior =
|
| + blink::WebFrame::LayoutAsTextNormal;
|
| if (should_dump_as_printed)
|
| - render_text_behavior |= blink::WebFrame::RenderAsTextPrinting;
|
| + layout_text_behavior |= blink::WebFrame::LayoutAsTextPrinting;
|
| if (debug_render_tree)
|
| - render_text_behavior |= blink::WebFrame::RenderAsTextDebug;
|
| - data_utf8 = frame->renderTreeAsText(render_text_behavior).utf8();
|
| + layout_text_behavior |= blink::WebFrame::LayoutAsTextDebug;
|
| + data_utf8 = frame->layoutTreeAsText(layout_text_behavior).utf8();
|
| data_utf8 += DumpFrameScrollPosition(frame, recursive);
|
| }
|
|
|
|
|