summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authorlukasza <lukasza@chromium.org>2016-03-04 10:59:02 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-04 19:00:33 +0000
commitc76d857e4749bb13f8eeaf0a77d57e69338dc7f5 (patch)
tree8ec9add6d04870898ebdd0794596e1f3aff1f3f7 /content/shell
parent70810e15c6c90b1e2ff5700d7dc265f6dd276f9b (diff)
downloadchromium_src-c76d857e4749bb13f8eeaf0a77d57e69338dc7f5.zip
chromium_src-c76d857e4749bb13f8eeaf0a77d57e69338dc7f5.tar.gz
chromium_src-c76d857e4749bb13f8eeaf0a77d57e69338dc7f5.tar.bz2
Remove dump_line_box_trees and debug_render_tree from LayoutDumpFlags.
LayoutDumpFlags::debug_render_tree was always set to false. LayoutDumpFlags::dump_line_box_trees was controlled by --dump-line-box-trees switch. I have not found any usage of this switch (searching chromium repo via web/codesearch [1] and manually searching the build repo [2] that contains trybot and fyibot scripts). Removing these flags is desirable because: - Replication of LayoutDumpFlags across OOPIFs [3] gets sligthly and unnecessarily more complicated when it has to take into account values coming from command-line switches. - Code removal is desirable in general (reduces maintenance burden). BUG=587175 [1] https://code.google.com/p/chromium/codesearch#chromium/src/content/shell/common/shell_switches.cc&q=%22dump-line-box-trees%22&sq=package:chromium&type=cs&l=33 [2] https://chromium.googlesource.com/chromium/tools/build.git [3] work-in-progress, 2 approaches being considered at crrev.com/1715573002 and crrev.com/1736353002. Review URL: https://codereview.chromium.org/1755123004 Cr-Commit-Position: refs/heads/master@{#379322}
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/browser/shell_content_browser_client.cc4
-rw-r--r--content/shell/common/shell_messages.h2
-rw-r--r--content/shell/common/shell_switches.cc4
-rw-r--r--content/shell/common/shell_switches.h1
-rw-r--r--content/shell/renderer/layout_test/blink_test_runner.cc6
5 files changed, 1 insertions, 16 deletions
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 2731368..39eb87e 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -234,10 +234,6 @@ void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
base::CommandLine* command_line,
int child_process_id) {
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDumpLineBoxTrees)) {
- command_line->AppendSwitch(switches::kDumpLineBoxTrees);
- }
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableFontAntialiasing)) {
command_line->AppendSwitch(switches::kEnableFontAntialiasing);
}
diff --git a/content/shell/common/shell_messages.h b/content/shell/common/shell_messages.h
index acbbfb0..7a0b1f9 100644
--- a/content/shell/common/shell_messages.h
+++ b/content/shell/common/shell_messages.h
@@ -35,8 +35,6 @@ IPC_STRUCT_TRAITS_BEGIN(test_runner::LayoutDumpFlags)
IPC_STRUCT_TRAITS_MEMBER(dump_child_frames_as_markup)
IPC_STRUCT_TRAITS_MEMBER(dump_child_frame_scroll_positions)
IPC_STRUCT_TRAITS_MEMBER(is_printing)
- 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.
diff --git a/content/shell/common/shell_switches.cc b/content/shell/common/shell_switches.cc
index 25c1070..a125244 100644
--- a/content/shell/common/shell_switches.cc
+++ b/content/shell/common/shell_switches.cc
@@ -28,10 +28,6 @@ const char kCrashDumpsDir[] = "crash-dumps-dir";
// causes the leak detector to cause immediate crash when found leak.
const char kCrashOnFailure[] = "crash-on-failure";
-// When run-layout-test is enabled, this causes the line box tree for
-// each LayoutBlockFlow to be dumped as well.
-const char kDumpLineBoxTrees[] = "dump-line-box-trees";
-
// Enable accelerated 2D canvas.
const char kEnableAccelerated2DCanvas[] = "enable-accelerated-2d-canvas";
diff --git a/content/shell/common/shell_switches.h b/content/shell/common/shell_switches.h
index db78614..4c61a11 100644
--- a/content/shell/common/shell_switches.h
+++ b/content/shell/common/shell_switches.h
@@ -18,7 +18,6 @@ extern const char kContentBrowserTest[];
extern const char kContentShellDataPath[];
extern const char kCrashDumpsDir[];
extern const char kCrashOnFailure[];
-extern const char kDumpLineBoxTrees[];
extern const char kEnableAccelerated2DCanvas[];
extern const char kEnableFontAntialiasing[];
extern const char kAlwaysUseComplexText[];
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 6bc6ad4..6337578 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -889,12 +889,8 @@ void BlinkTestRunner::CaptureDump() {
return;
}
- test_runner::LayoutDumpFlags layout_dump_flags =
+ const test_runner::LayoutDumpFlags& layout_dump_flags =
interfaces->TestRunner()->GetLayoutDumpFlags();
- layout_dump_flags.dump_line_box_trees =
- base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDumpLineBoxTrees);
-
if (!layout_dump_flags.dump_child_frames()) {
std::string layout_dump = DumpLayout(
render_view()->GetMainRenderFrame()->GetWebFrame(), layout_dump_flags);