OOPIF support for testRunner.dumpAsText and similar layout dumps.

components/test_runner/layout_dump.cc

Index: components/test_runner/layout_dump.cc
diff --git a/components/test_runner/layout_dump.cc b/components/test_runner/layout_dump.cc
new file mode 100644
index 0000000000000000000000000000000000000000..cb37830f77a9dc7e706575e1cf16b8fc25e2cddb
--- /dev/null
+++ b/components/test_runner/layout_dump.cc
@@ -0,0 +1,99 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/test_runner/layout_dump.h"
+
+#include "base/logging.h"
+#include "base/strings/stringprintf.h"
+#include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/web/WebDocument.h"
+#include "third_party/WebKit/public/web/WebElement.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
+
+namespace test_runner {
+
+using blink::WebFrame;
+using blink::WebLocalFrame;
+using blink::WebSize;
+
+namespace {
+
+std::string DumpFrameHeaderIfNeeded(WebFrame* frame) {

[Łukasz Anforowicz, 2016/01/21 00:27:08]

Copy&pasted from components/test_runner/web_test_proxy.cc.

+  std::string result;
+
+  // Add header for all but the main frame. Skip empty frames.
+  if (frame->parent() && !frame->document().documentElement().isNull()) {
+    result.append("\n--------\nFrame: '");
+    result.append(frame->uniqueName().utf8());
+    result.append("'\n--------\n");
+  }
+
+  return result;
+}
+
+std::string DumpFrameScrollPosition(WebFrame* frame) {

[Łukasz Anforowicz, 2016/01/21 00:27:08]

Copy&pasted from components/test_runner/web_test_proxy.cc + recursion removed.

+  std::string result;
+  WebSize offset = frame->scrollOffset();
+  if (offset.width > 0 || offset.height > 0) {
+    if (frame->parent()) {
+      result =
+          std::string("frame '") + frame->uniqueName().utf8().data() + "' ";
+    }
+    base::StringAppendF(&result, "scrolled to %d,%d\n", offset.width,
+                        offset.height);
+  }
+
+  return result;
+}
+
+}  // namespace
+
+std::string DumpLayout(WebLocalFrame* frame, const LayoutDumpFlags& flags) {

[Łukasz Anforowicz, 2016/01/21 00:27:08]

DumpLayout is a rough equivalent of WebTestProxyBase::CaptureTree from
components/test_runner/web_test_proxy.cc, except that:

- DumpLayout handles single frame only
  (i.e. doesn't recurse over child frames)

- DumpLayout doesn't handle the following dump modes:
  custom text, back-forward lists.

DumpLayout is called from

1) the old code (from WebTestProxyBase::CaptureTree)
2) the new code in
content/shell/renderer/layout_test/layout_test_render_frame_observer.cc

+  DCHECK(frame);
+  std::string result;
+
+  if (flags.dump_as_text) {
+    DCHECK(!flags.dump_as_markup);
+    DCHECK(!flags.dump_scroll_positions);
+
+    result = DumpFrameHeaderIfNeeded(frame);
+    if (flags.dump_as_printed && frame->document().isHTMLDocument()) {
+      result += frame->layoutTreeAsText(WebFrame::LayoutAsTextPrinting).utf8();
+    } else {
+      result += frame->document().contentAsTextForTesting().utf8();
+    }
+    result += "\n";
+  } else if (flags.dump_as_markup) {
+    DCHECK(!flags.dump_as_text);
+    DCHECK(!flags.dump_scroll_positions);
+    DCHECK(!flags.dump_as_printed);
+
+    result = DumpFrameHeaderIfNeeded(frame);
+    result += frame->contentAsMarkup().utf8();
+    result += "\n";
+  } else if (flags.dump_scroll_positions) {
+    DCHECK(!flags.dump_as_text);
+    DCHECK(!flags.dump_as_markup);
+
+    if (frame->parent() == nullptr) {
+      WebFrame::LayoutAsTextControls layout_text_behavior =
+          WebFrame::LayoutAsTextNormal;
+      if (flags.dump_as_printed)
+        layout_text_behavior |= WebFrame::LayoutAsTextPrinting;
+      if (flags.debug_render_tree)
+        layout_text_behavior |= WebFrame::LayoutAsTextDebug;
+      if (flags.dump_line_box_trees)
+        layout_text_behavior |= WebFrame::LayoutAsTextWithLineTrees;
+      result = frame->layoutTreeAsText(layout_text_behavior).utf8();
+    }
+
+    result += DumpFrameScrollPosition(frame);
+  }
+
+  return result;
+}
+
+}  // namespace test_runner