Index: components/test_runner/layout_dump_flags.h |
diff --git a/components/test_runner/layout_dump_flags.h b/components/test_runner/layout_dump_flags.h |
index 06855eeb38897eb3983a57d3941194998e0c51a7..0c5fd3f042b7d94f154db83a8ad5dfa441a96193 100644 |
--- a/components/test_runner/layout_dump_flags.h |
+++ b/components/test_runner/layout_dump_flags.h |
@@ -7,46 +7,34 @@ |
namespace test_runner { |
+// A POD-only struct with layout test runtime flags that have to be shared |
+// across all renderers (testRunner javascript bindings that interact with these |
+// flags are injected into all frames). |
+// TODO(lukasza): Rename this to LayoutTestRuntimeFlags. |
struct LayoutDumpFlags { |
- LayoutDumpFlags(bool dump_as_text, |
- bool dump_child_frames_as_text, |
- bool dump_as_markup, |
- bool dump_child_frames_as_markup, |
- bool dump_child_frame_scroll_positions, |
- bool is_printing) |
- : dump_as_text(dump_as_text), |
- dump_child_frames_as_text(dump_child_frames_as_text), |
- dump_as_markup(dump_as_text), |
- dump_child_frames_as_markup(dump_child_frames_as_markup), |
- dump_child_frame_scroll_positions(dump_child_frame_scroll_positions), |
- is_printing(is_printing) {} |
- |
- // Default constructor needed for IPC. |
- // |
- // Default constructor is |= default| to make sure LayoutDumpFlags is a POD |
- // (required until we can remove content/shell/browser dependency on it). |
- LayoutDumpFlags() = default; |
+ // If true, the test_shell will generate pixel results in DumpAsText mode. |
+ volatile bool generate_pixel_results; |
// If true, the test_shell will produce a plain text dump rather than a |
// text representation of the renderer. |
- bool dump_as_text; |
+ volatile bool dump_as_text; |
// If true and if dump_as_text_ is true, the test_shell will recursively |
// dump all frames as plain text. |
- bool dump_child_frames_as_text; |
+ volatile bool dump_child_frames_as_text; |
// If true, the test_shell will produce a dump of the DOM rather than a text |
// representation of the layout objects. |
- bool dump_as_markup; |
+ volatile bool dump_as_markup; |
// If true and if dump_as_markup_ is true, the test_shell will recursively |
// produce a dump of the DOM rather than a text representation of the |
// layout objects. |
- bool dump_child_frames_as_markup; |
+ volatile bool dump_child_frames_as_markup; |
// If true, the test_shell will print out the child frame scroll offsets as |
// well. |
- bool dump_child_frame_scroll_positions; |
+ volatile bool dump_child_frame_scroll_positions; |
// Reports whether recursing over child frames is necessary. |
bool dump_child_frames() const { |
@@ -59,7 +47,10 @@ struct LayoutDumpFlags { |
} |
// If true, layout is to target printed pages. |
- bool is_printing; |
+ volatile bool is_printing; |
+ |
+ // If true, don't dump output until notifyDone is called. |
+ volatile bool wait_until_done; |
}; |
} // namespace test_runner |