OOPIF support for testRunner.dumpAsText and similar layout dumps.

content/shell/common/shell_messages.h

Index: content/shell/common/shell_messages.h
diff --git a/content/shell/common/shell_messages.h b/content/shell/common/shell_messages.h
index ebdecb80d8c4b7e747c24bfb19a9726016c27bc8..3771322b0ffe226a12c603f7ee24edea775fb428 100644
--- a/content/shell/common/shell_messages.h
+++ b/content/shell/common/shell_messages.h
@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 
+#include "components/test_runner/layout_dump_flags.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/page_state.h"
 #include "content/shell/common/leak_detection_result.h"
@@ -27,6 +28,16 @@ IPC_STRUCT_TRAITS_MEMBER(expected_pixel_hash)
 IPC_STRUCT_TRAITS_MEMBER(initial_size)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(test_runner::LayoutDumpFlags)
+  IPC_STRUCT_TRAITS_MEMBER(dump_as_text)
+  IPC_STRUCT_TRAITS_MEMBER(dump_as_markup)
+  IPC_STRUCT_TRAITS_MEMBER(dump_scroll_positions)
+  IPC_STRUCT_TRAITS_MEMBER(dump_as_printed)
+  IPC_STRUCT_TRAITS_MEMBER(dump_child_frames)
+  IPC_STRUCT_TRAITS_MEMBER(dump_line_box_trees)
+  IPC_STRUCT_TRAITS_MEMBER(debug_render_tree)
+IPC_STRUCT_TRAITS_END()
+
 // Tells the renderer to reset all test runners.
 IPC_MESSAGE_ROUTED0(ShellViewMsg_Reset)
 
@@ -54,10 +65,29 @@ IPC_MESSAGE_ROUTED3(
 
 IPC_MESSAGE_ROUTED0(ShellViewMsg_TryLeakDetection)
 
+// Asks a frame to dump its contents into a string and send them back over IPC.
+IPC_MESSAGE_ROUTED1(ShellViewMsg_LayoutDumpRequest,
+                    test_runner::LayoutDumpFlags)
+
+// Notifies BlinkTestRunner that the layout dump has completed
+// (and that it can proceed with finishing up the test).
+IPC_MESSAGE_ROUTED1(ShellViewMsg_LayoutDumpCompleted,
+                    std::string /* completed/stitched layout dump */)
+
 // Send a text dump of the WebContents to the render host.
 IPC_MESSAGE_ROUTED1(ShellViewHostMsg_TextDump,
                     std::string /* dump */)
 
+// Asks the browser process to perform a layout dump (potentially spanning
+// multiple cross-process frames) using the given flags.  This triggers
+// multiple ShellViewMsg_LayoutDumpRequest / ShellViewHostMsg_LayoutDumpResponse
+// messages and ends with sending of ShellViewMsg_LayoutDumpCompleted.
+IPC_MESSAGE_ROUTED1(ShellViewHostMsg_InitiateLayoutDump,
+                    test_runner::LayoutDumpFlags)
+
+// Sends a layout dump of a frame (response to ShellViewMsg_LayoutDumpRequest).
+IPC_MESSAGE_ROUTED1(ShellViewHostMsg_LayoutDumpResponse, std::string /* dump */)
+
 // Send an image dump of the WebContents to the render host.
 IPC_MESSAGE_ROUTED2(ShellViewHostMsg_ImageDump,
                     std::string /* actual pixel hash */,