Skip to content

GitLab

T
tangled
Commit 02c619dc authored by Mason Freed's avatar Mason Freed Committed by Commit Bot
Browse files
Options

Make the view-source table width:max-content, plus some cleanup 

This CL adds "width: max-content" to the view-source <table> element, so
that long lines never get broken.

Also, the CL at [1] made better changes to the view-source CSS document
which made the ones here obsolete. So this CL cleans up the inline
styles on the <table> element.

Bug: 920571
Change-Id: I06d0509b71470cdb1baff8e8ada82b4cd366bbd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2435807
Auto-Submit: Mason Freed <masonfreed@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811620}
parent 57a41a1c
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 26 deletions
third_party/blink/renderer/core/css/view-source.css
View file @ 02c619dc
...@@ -27,7 +27,7 @@ body { ...@@ -27,7 +27,7 @@ body {
} }
table { table {
width: 100%; width: max-content;
border-spacing: 0; border-spacing: 0;
white-space: pre; white-space: pre;
margin: 0; margin: 0;
......
third_party/blink/renderer/core/html/html_view_source_document.cc
View file @ 02c619dc
...@@ -70,7 +70,6 @@ void HTMLViewSourceDocument::CreateContainingTable() { ...@@ -70,7 +70,6 @@ void HTMLViewSourceDocument::CreateContainingTable() {
body->ParserAppendChild(div); body->ParserAppendChild(div);
auto* table = MakeGarbageCollected<HTMLTableElement>(*this); auto* table = MakeGarbageCollected<HTMLTableElement>(*this);
table->SetInlineStyleProperty(CSSPropertyID::kWhiteSpace, CSSValueID::kPre);
body->ParserAppendChild(table); body->ParserAppendChild(table);
tbody_ = MakeGarbageCollected<HTMLTableSectionElement>(html_names::kTbodyTag, tbody_ = MakeGarbageCollected<HTMLTableSectionElement>(html_names::kTbodyTag,
*this); *this);
......
third_party/blink/renderer/core/html/html_view_source_document_test.cc
View file @ 02c619dc
...@@ -38,8 +38,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource1) { ...@@ -38,8 +38,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource1) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td " "class=\"line-number\" value=\"1\"></td><td "
"class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" " "class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" "
"value=\"2\"></td><td class=\"line-content\"> <span " "value=\"2\"></td><td class=\"line-content\"> <span "
...@@ -92,8 +91,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource2) { ...@@ -92,8 +91,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource2) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td " "class=\"line-number\" value=\"1\"></td><td "
"class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" " "class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" "
"value=\"2\"></td><td class=\"line-content\"> <span " "value=\"2\"></td><td class=\"line-content\"> <span "
...@@ -145,8 +143,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource3) { ...@@ -145,8 +143,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource3) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td " "class=\"line-number\" value=\"1\"></td><td "
"class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" " "class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" "
"value=\"2\"></td><td class=\"line-content\"> <span " "value=\"2\"></td><td class=\"line-content\"> <span "
...@@ -211,8 +208,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource4) { ...@@ -211,8 +208,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource4) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td " "class=\"line-number\" value=\"1\"></td><td "
"class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" " "class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" "
"value=\"2\"></td><td class=\"line-content\"> <span " "value=\"2\"></td><td class=\"line-content\"> <span "
...@@ -280,8 +276,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource5) { ...@@ -280,8 +276,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource5) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td " "class=\"line-number\" value=\"1\"></td><td "
"class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" " "class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" "
"value=\"2\"></td><td class=\"line-content\"><br></td></tr><tr><td " "value=\"2\"></td><td class=\"line-content\"><br></td></tr><tr><td "
...@@ -313,8 +308,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource6) { ...@@ -313,8 +308,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource6) {
LoadMainResource((many_spaces + std::string(" <b>A</b> ")).c_str()); LoadMainResource((many_spaces + std::string(" <b>A</b> ")).c_str());
std::string expected_beginning( std::string expected_beginning(
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td class=\"line-content\"> " "class=\"line-number\" value=\"1\"></td><td class=\"line-content\"> "
" "); " ");
std::string expected_ending( std::string expected_ending(
...@@ -330,8 +324,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource7) { ...@@ -330,8 +324,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource7) {
LoadMainResource("1234567"); LoadMainResource("1234567");
EXPECT_EQ(GetDocument().documentElement()->outerHTML(), EXPECT_EQ(GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td " "class=\"line-number\" value=\"1\"></td><td "
"class=\"line-content\">1234567<span " "class=\"line-content\">1234567<span "
"class=\"html-end-of-file\"></span></td></tr></tbody></table></" "class=\"html-end-of-file\"></span></td></tr></tbody></table></"
...@@ -353,8 +346,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource8) { ...@@ -353,8 +346,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource8) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td " "class=\"line-number\" value=\"1\"></td><td "
"class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" " "class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" "
"value=\"2\"></td><td class=\"line-content\"> <span " "value=\"2\"></td><td class=\"line-content\"> <span "
...@@ -421,8 +413,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource9) { ...@@ -421,8 +413,7 @@ TEST_F(HTMLViewSourceDocumentTest, ViewSource9) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td " "class=\"line-number\" value=\"1\"></td><td "
"class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" " "class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" "
"value=\"2\"></td><td class=\"line-content\"> <span " "value=\"2\"></td><td class=\"line-content\"> <span "
...@@ -453,8 +444,7 @@ TEST_F(HTMLViewSourceDocumentTest, IncompleteToken) { ...@@ -453,8 +444,7 @@ TEST_F(HTMLViewSourceDocumentTest, IncompleteToken) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td " "class=\"line-number\" value=\"1\"></td><td "
"class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" " "class=\"line-content\"><br></td></tr><tr><td class=\"line-number\" "
"value=\"2\"></td><td class=\"line-content\"> Incomplete token " "value=\"2\"></td><td class=\"line-content\"> Incomplete token "
...@@ -476,8 +466,7 @@ TEST_F(HTMLViewSourceDocumentTest, UnfinishedTextarea) { ...@@ -476,8 +466,7 @@ TEST_F(HTMLViewSourceDocumentTest, UnfinishedTextarea) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td class=\"line-content\"><span " "class=\"line-number\" value=\"1\"></td><td class=\"line-content\"><span "
"class=\"html-tag\">&lt;textarea&gt;</span>foobar in " "class=\"html-tag\">&lt;textarea&gt;</span>foobar in "
"textarea</td></tr><tr><td class=\"line-number\" value=\"2\"></td><td " "textarea</td></tr><tr><td class=\"line-number\" value=\"2\"></td><td "
...@@ -492,8 +481,7 @@ TEST_F(HTMLViewSourceDocumentTest, UnfinishedScript) { ...@@ -492,8 +481,7 @@ TEST_F(HTMLViewSourceDocumentTest, UnfinishedScript) {
EXPECT_EQ( EXPECT_EQ(
GetDocument().documentElement()->outerHTML(), GetDocument().documentElement()->outerHTML(),
"<html><head></head><body><div " "<html><head></head><body><div "
"class=\"line-gutter-backdrop\"></div><table style=\"white-space: " "class=\"line-gutter-backdrop\"></div><table><tbody><tr><td "
"pre;\"><tbody><tr><td "
"class=\"line-number\" value=\"1\"></td><td class=\"line-content\"><span " "class=\"line-number\" value=\"1\"></td><td class=\"line-content\"><span "
"class=\"html-tag\">&lt;script&gt;</span>foobar in " "class=\"html-tag\">&lt;script&gt;</span>foobar in "
"script</td></tr><tr><td class=\"line-number\" value=\"2\"></td><td " "script</td></tr><tr><td class=\"line-number\" value=\"2\"></td><td "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment