Revert of Don't allow whitespace between elements with display:table-cell

Source/core/dom/Text.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 227 matching lines @@
     return cloneWithData(data());
 }
 
 static inline bool hasGeneratedAnonymousTableCells(const LayoutObject& parent)
 {
     // We're checking whether the table part has generated anonymous table
     // part wrappers to hold its contents, so inspecting its first child will suffice.
     LayoutObject* child = parent.slowFirstChild();
     if (!child || !child->isAnonymous())
         return false;
-    if (child->isTableCell())
-        return true;
+    if (child->isTableCell()) {
+        LayoutObject* firstChild = child->slowFirstChild();
+        // Ignore the anonymous table cell if it is wrapping a table cell element (e.g. because of <td style="display:block;">).
+        return !firstChild || !firstChild->node() || !isHTMLTableCellElement(firstChild->node());
+    }
     if (child->isTableSection() || child->isTableRow())
         return hasGeneratedAnonymousTableCells(*child);
     return false;
 }
 
-static inline bool nodeAllowsAdjacentWhitespace(Node* node)
-{
-    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)
+static inline bool canHaveWhitespaceChildren(const LayoutObject& parent)
 {
     // <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()
         || 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;
 }
 
 bool Text::textLayoutObjectIsNeeded(const ComputedStyle& style, const LayoutObject& parent)
 {
     if (!parent.canHaveChildren())
         return false;
 
     if (isEditingText())
         return true;
 
     if (!length())
         return false;
 
     if (style.display() == NONE)
         return false;
 
     if (!containsOnlyWhitespace())
         return true;
 
-    if (!canHaveWhitespaceChildren(parent, this))
+    if (!canHaveWhitespaceChildren(parent))
         return false;
 
     // pre-wrap in SVG never makes layoutObject.
     if (style.whiteSpace() == PRE_WRAP && parent.isSVG())
         return false;
 
     // pre/pre-wrap/pre-line always make layoutObjects.
     if (style.preserveNewline())
         return true;
 
@@ skipping 148 matching lines @@
             result.appendLiteral("; ");
         result.appendLiteral("value=");
         result.append(s);
     }
 
     strncpy(buffer, result.toString().utf8().data(), length - 1);
 }
 #endif
 
 } // namespace blink