Remove duplication between TestRunner's fields and LayoutDumpFlags struct.

components/test_runner/layout_dump_flags.h

 // 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.
 
 #ifndef COMPONENTS_TEST_RUNNER_LAYOUT_DUMP_FLAGS_H_
 #define COMPONENTS_TEST_RUNNER_LAYOUT_DUMP_FLAGS_H_
 
 namespace test_runner {
 
-enum class LayoutDumpMode {
-  DUMP_AS_TEXT,
-  DUMP_AS_MARKUP,
-  DUMP_SCROLL_POSITIONS
-};
+struct LayoutDumpFlags {
+  // If true, the test_shell will produce a plain text dump rather than a
+  // text representation of the renderer.
+  bool dump_as_text;
 
-struct LayoutDumpFlags {
-  LayoutDumpMode main_dump_mode;
+  // If true and if dump_as_text_ is true, the test_shell will recursively
+  // dump all frames as plain text.

[dcheng, 2016/02/23 18:26:35]

Hmm, so this implies that if I call dumpChildFramesAsText() but forget to call
dumpAsText(), the child frames just won't get dumped?

[Łukasz Anforowicz, 2016/02/23 18:45:26]

Correct :-(.

There are tests that do something like:
- dumpChildFramesScrollPositions()
- dumpAsText()
and expect to dump only "text" of the main frame.

And there are tests that call
- dumpChildFramesScrollPositions() from one place
- and rely on dumpAsText being called from a totally separate place.

Still - this CL tries to prepare a way for having all the flags in a single
place (for replication purposes).  Once the flags are divorced from unrelated
code in TestRunner, maybe we can attempt once again to consolidate them...

[Łukasz Anforowicz, 2016/02/23 18:50:40]

Correction - this was supposed to say:

And there are tests that call
- dumpChildFramesAsText() from one place
- and rely on dumpAsText() being called from a totally separate place (i.e. all
tests under http/tests/xmlhttprequest/origin-exact-matching).

+  bool dump_child_frames_as_text;
 
-  bool dump_as_printed;
-  bool dump_child_frames;
+  // If true, the test_shell will produce a dump of the DOM rather than a text
+  // representation of the renderer.

[dcheng, 2016/02/23 18:26:35]

s/renderer/layout objects/ might be more accurate

[Łukasz Anforowicz, 2016/02/23 18:45:26]

Done.

+  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
+  // renderer.
+  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;
+
+  // Reports whether recursing over child frames is necessary.
+  bool dump_child_frames() const {
+    if (dump_as_text)
+      return dump_child_frames_as_text;
+    else if (dump_as_markup)
+      return dump_child_frames_as_markup;
+    else
+      return dump_child_frame_scroll_positions;
+  }
+
+  // If true, layout is to target printed pages.
+  bool is_printing;
+
+  // Extra flags for debugging layout tests.
   bool dump_line_box_trees;
   bool debug_render_tree;
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_LAYOUT_DUMP_FLAGS_H_