Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Unified Diff: Source/core/dom/Text.cpp

Issue 1338853002: Revert 202146 "Don't allow whitespace between elements with disp..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2454/
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/platform/linux/tables/mozilla/bugs/bug2479-1-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Text.cpp
===================================================================
--- Source/core/dom/Text.cpp (revision 202157)
+++ Source/core/dom/Text.cpp (working copy)
@@ -251,20 +251,17 @@
return false;
}
-static inline bool nodeAllowsAdjacentWhitespace(Node* node)
+static inline bool canHaveWhitespaceChildren(const LayoutObject& parent)
{
- if (!node)
- return true;
- const ComputedStyle* style = node->ensureComputedStyle();
- return style && style->originalDisplay() != TABLE_CELL && !isHTMLTableCellElement(node);
-}
-
-static inline bool canHaveWhitespaceChildren(const LayoutObject& parent, Text* text)
-{
// <button> should allow whitespace even though LayoutFlexibleBox doesn't.
if (parent.isLayoutButton())
return true;
+ // Allow whitespace when the text is inside a table, section or row element that
+ // has generated anonymous table cells to hold its contents.
+ if (hasGeneratedAnonymousTableCells(parent))
+ return true;
+
if (parent.isTable() || parent.isTableRow() || parent.isTableSection()
|| parent.isLayoutTableCol() || parent.isFrameSet()
|| parent.isFlexibleBox() || parent.isLayoutGrid()
@@ -271,13 +268,8 @@
|| parent.isSVGRoot()
|| parent.isSVGContainer()
|| parent.isSVGImage()
- || parent.isSVGShape()) {
- // Allow whitespace when the text is inside a table, section or row element that
- // has generated anonymous table cells to hold its contents.
- if (hasGeneratedAnonymousTableCells(parent))
- return nodeAllowsAdjacentWhitespace(text->previousSibling()) && nodeAllowsAdjacentWhitespace(text->nextSibling());
+ || parent.isSVGShape())
return false;
- }
return true;
}
@@ -298,7 +290,7 @@
if (!containsOnlyWhitespace())
return true;
- if (!canHaveWhitespaceChildren(parent, this))
+ if (!canHaveWhitespaceChildren(parent))
return false;
// pre-wrap in SVG never makes layoutObject.
« no previous file with comments | « LayoutTests/platform/linux/tables/mozilla/bugs/bug2479-1-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698